weston: update to 1.3.1.
This commit is contained in:
parent
f5fb087590
commit
d62efc3b5f
|
@ -1,44 +0,0 @@
|
|||
From 0b12db5f519a347ce0e1d5262e0cb2e9e2cc6990 Mon Sep 17 00:00:00 2001
|
||||
From: Tomeu Vizoso <tomeu@tomeuvizoso.net>
|
||||
Date: Wed, 09 Oct 2013 09:30:57 +0000
|
||||
Subject: launcher: Wrap drmGetMagic and drmAuthMagic so we can build without libdrm
|
||||
|
||||
---
|
||||
diff --git a/src/launcher-util.c b/src/launcher-util.c
|
||||
index 6b6a5f3..35a5698 100644
|
||||
--- src/launcher-util.c
|
||||
+++ src/launcher-util.c
|
||||
@@ -80,9 +80,19 @@ drm_set_master(int drm_fd)
|
||||
return drmSetMaster(drm_fd);
|
||||
return -EBADF;
|
||||
}
|
||||
+static int
|
||||
+drm_check_master(int drm_fd)
|
||||
+{
|
||||
+ drm_magic_t magic;
|
||||
+ if (drm_fd != -1)
|
||||
+ return drmGetMagic(drm_fd, &magic) != 0 ||
|
||||
+ drmAuthMagic(drm_fd, magic) != 0;
|
||||
+ return 0;
|
||||
+}
|
||||
#else
|
||||
static int drm_drop_master(int drm_fd) {return 0;}
|
||||
static int drm_set_master(int drm_fd) {return 0;}
|
||||
+static int drm_check_master(int drm_fd) {return 1;}
|
||||
#endif
|
||||
|
||||
int
|
||||
@@ -110,10 +120,8 @@ weston_launcher_open(struct weston_launcher *launcher,
|
||||
}
|
||||
|
||||
if (major(s.st_rdev) == DRM_MAJOR) {
|
||||
- drm_magic_t magic;
|
||||
launcher->drm_fd = fd;
|
||||
- if (drmGetMagic(fd, &magic) != 0 ||
|
||||
- drmAuthMagic(fd, magic) != 0) {
|
||||
+ if (!drm_check_master(fd)) {
|
||||
weston_log("drm fd not master\n");
|
||||
close(fd);
|
||||
return -1;
|
||||
--
|
||||
cgit v0.9.0.2-2-gbebe
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'weston'.
|
||||
pkgname=weston
|
||||
version=1.3.0
|
||||
version=1.3.1
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
short_desc="Reference implementation of a Wayland compositor"
|
||||
|
@ -8,9 +8,9 @@ maintainer="Juan RP <xtraeme@gmail.com>"
|
|||
homepage="http://wayland.freedesktop.org/"
|
||||
license="MIT"
|
||||
distfiles="http://wayland.freedesktop.org/releases/${pkgname}-${version}.tar.xz"
|
||||
checksum=8e4f5b4736358b63d83c3252567ba7aa49cc0da9e2e2c30f59ddf635159702a0
|
||||
checksum=f7141334b141ae1a6435bd03bfdb01b7fb628f39259164f201e7e71c8d815bc7
|
||||
|
||||
hostmakedepends="pkg-config"
|
||||
hostmakedepends="pkg-config wayland-devel"
|
||||
makedepends="libpng-devel>=1.6 wayland-devel>=${version} libxkbcommon-devel
|
||||
libxcb-devel>=1.9.1 xcb-util-keysyms-devel pixman-devel pango-devel
|
||||
cairo-devel>=1.12.14_5 mtdev-devel libwebp-devel poppler-glib-devel pam-devel
|
||||
|
@ -34,11 +34,6 @@ x86_64|i686)
|
|||
;;
|
||||
esac
|
||||
|
||||
if [ "$CROSS_BUILD" ]; then
|
||||
hostmakedepends+=" wayland-devel"
|
||||
fi
|
||||
|
||||
|
||||
post_install() {
|
||||
vinstall COPYING 644 usr/share/license/$pkgname
|
||||
# Remove development files.
|
||||
|
@ -48,7 +43,7 @@ post_install() {
|
|||
|
||||
weston_package() {
|
||||
# cairo built with gles2 option.
|
||||
depends="wayland>=${version} cairo>=1.12.14_5"
|
||||
depends="cairo>=1.12.14_5"
|
||||
pkg_install() {
|
||||
vmove all
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue