Wayland updates

deleted file mode 100644
index b88bc42..0000000
@@ -1,13 +0,0 @@
-SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
-           file://0002-cross-compile.patch \
-           file://cross-glsl.patch \
-           file://dont-fail-if-libX11-isnt-installed.patch \
-           file://fix-egl-compilation-without-x11-headers.patch \
-           "
-
-SRC_URI[md5sum] = "dc45d1192203e418163e0017640e1cfc"
-SRC_URI[sha256sum] = "75bf31f26c6e7b5515e610c1005fd1be1f7eeb2c9e6859848dab879c355ad64e"
-
-LIC_FILES_CHKSUM = "file://docs/license.html;md5=012f69938d81b766472fd0d240df38a4"
-
-S = "${WORKDIR}/Mesa-${PV}"

94 lines not on this page · raw message

358 lines not on this page · raw message

632 lines not on this page · raw message

deleted file mode 100644
index 80735a6..0000000
@@ -1,36 +0,0 @@
-Upstream-Status: Backport
-
-From d6b06474f69129eb41ecd85d6b3bb0eb7b9dccb3 Mon Sep 17 00:00:00 2001
-From: Daniel Stone <[email protected]>
-Date: Tue, 9 Oct 2012 14:27:06 +1100
-Subject: [PATCH] build: Don't fail if libX11 isn't installed
-
-configure.ac would previously refuse to complete if libX11 wasn't
-installed, even if we'd disabled GLX and weren't building an X11 EGL
-platform.  Make the check simply set the no_x variable that's used (but
-never set) immediately below for what looks like this very case.
-
-Signed-off-by: Daniel Stone <[email protected]>
-Reviewed-by: Matt Turner <[email protected]>
-Reviewed-by: Dan Nicholson <[email protected]>
-(cherry picked from commit 4004620d34a580c8fdb965d9b640e97453fc8b28)
----
- configure.ac |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index eb273b9..b384b44 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -836,7 +836,7 @@ if test "x$enable_dri" = xyes; then
- fi
- 
- dnl Find out if X is available.
--PKG_CHECK_MODULES([X11], [x11])
-+PKG_CHECK_MODULES([X11], [x11], [no_x=no], [no_x=yes])
- 
- dnl Try to tell the user that the --x-* options are only used when
- dnl pkg-config is not available. This must be right after AC_PATH_XTRA.
--- 
-1.7.10.4
-

deleted file mode 100644
index 6436b59..0000000
@@ -1,32 +0,0 @@
-Upstream-Status: Submitted
-
-Picked from mesa-dev mailing list: http://marc.info/?l=mesa3d-dev&m=133053004130468
-
-From: Benjamin Franzke <[email protected]>
-Date: Wed, 29 Feb 2012 15:36:23 +0100
-Subject: [PATCH] configure: Fix egl compilation without x11 headers
-
-We dont want eglplatform.h to typedef egl native types
-to x11 types, when x11 headers are not available.
----
- configure.ac |    4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index b384b44..8eb8459 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1262,6 +1262,10 @@ if test "x$enable_egl" = xyes; then
- 
-     AC_CHECK_FUNC(mincore, [DEFINES="$DEFINES -DHAVE_MINCORE"])
- 
-+    if test "$have_x" != yes; then
-+        DEFINES="$DEFINES -DMESA_EGL_NO_X11_HEADERS"
-+    fi
-+
-     if test "$enable_static" != yes; then
-         # build egl_glx when libGL is built
-         if test "x$enable_glx" = xyes; then
--- 
-1.7.10.4
-

43 lines not on this page · raw message

deleted file mode 100644
index 6671f99..0000000
@@ -1,4 +0,0 @@
-require mesa-common.inc
-require mesa-${PV}.inc
-require mesa.inc
-PR = "${INC_PR}.1"

new file mode 100644
index 0000000..60a90a3
@@ -0,0 +1,14 @@
+SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
+           file://EGL-Mutate-NativeDisplayType-depending-on-config.patch \
+           file://fix-glsl-cross.patch \
+           "
+
+SRC_URI[md5sum] = "952ccd03547ed72333b64e1746cf8ada"
+SRC_URI[sha256sum] = "8d5dac2202d0355bff5cfd183582ec8167d1d1227b7bb7a669acecbeaa52d766"
+
+LIC_FILES_CHKSUM = "file://docs/license.html;md5=42d77d95cba529a3637129be87d6555d"
+
+S = "${WORKDIR}/Mesa-${PV}"
+
+require mesa-common.inc
+require mesa.inc

index ee9a552..c5507ce 100644
@@ -1,11 +1,12 @@
-# Current pre-9.1 commit
-SRCREV = "1665af3066f3d58c42e9d5b13098f13615a7672c"
-PV = "9.1~git${SRCPV}"
+# 9.1.3 commit
+SRCREV = "f32ec82a8cfcabc5b7596796f36afe7986651f02"
+PV = "9.1.3+git${SRCPV}"
 
 LIC_FILES_CHKSUM = "file://docs/license.html;md5=42d77d95cba529a3637129be87d6555d"
 
 SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git \
-           file://0002-cross-compile.patch \
+           file://EGL-Mutate-NativeDisplayType-depending-on-config.patch \
+           file://fix-glsl-cross.patch \
            "
 
 S = "${WORKDIR}/git"

similarity index 91%
rename from meta/recipes-graphics/wayland/wayland_1.0.6.bb
rename to meta/recipes-graphics/wayland/wayland_1.1.0.bb
index 7c18979..a71402e 100644
@@ -10,11 +10,9 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=1d4476a7d98dd5691c53d4d43a510c72 \
                     file://src/wayland-server.c;endline=21;md5=079ae21dbf98ada52ec23744851b0a5c"
 
-PR = "r1"
-
 SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
-SRC_URI[md5sum] = "936a2590aea69fa3c0cf234d54b9137c"
-SRC_URI[sha256sum] = "f52a012df699eff434b0f49e56000d6978b5f781048402ca8e0232242970fc49"
+SRC_URI[md5sum] = "d2dc9398a83692cafc16eba6e45f85d8"
+SRC_URI[sha256sum] = "2ef587cf1a0e52b6dee44eeb9c288110e8180819abf4e419d247dfe234867a5c"
 
 SRC_URI_append_class-native = " file://just-scanner.patch"
 

new file mode 100644
index 0000000..3e2852c
@@ -0,0 +1,18 @@
+Install the examples so we can package them.
+
+Upstream-Status: Pending
+Signed-off-by: Ross Burton <[email protected]>
+
+diff --git a/clients/Makefile.am b/clients/Makefile.am
+index 621c7c3..749ef20 100644
+--- a/clients/Makefile.am
++++ b/clients/Makefile.am
+@@ -2,7 +2,7 @@ bin_PROGRAMS =					\
+ 	weston-info				\
+ 	$(terminal)
+ 
+-noinst_PROGRAMS =				\
++bin_PROGRAMS +=				\
+ 	$(clients_programs)			\
+ 	$(poppler_programs)			\
+ 	$(simple_clients_programs)		\

index cb41e05..dd17c03 100644
@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=275efac2559a224527bd4fd593d38466 \
                     file://src/compositor.c;endline=23;md5=aa98a8db03480fe7d500d0b1f4b8850c"
 
 SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
+           file://install-examples.patch \
            file://weston.png \
            file://weston.desktop"
 SRC_URI[md5sum] = "63202129d66d5514e572814da5dfa1f7"

@@ -49,7 +50,10 @@ do_install_append() {
 	done
 }
 
-FILES_${PN} += "${datadir}/applications ${datadir}/icons"
+PACKAGES += "${PN}-examples"
+
+FILES_${PN} = "${bindir}/weston* ${bindir}/wcap-decode ${libexecdir} ${datadir}"
+FILES_${PN}-examples = "${bindir}/*"
 
 RDEPENDS_${PN} += "xkeyboard-config"
 RRECOMMENDS_${PN} = "liberation-fonts"

index dd17c03..07811f2 100644
@@ -12,7 +12,7 @@ SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
 SRC_URI[md5sum] = "63202129d66d5514e572814da5dfa1f7"
 SRC_URI[sha256sum] = "c833bc4dc8667561d2639b57220541531c039aa9332ce2a7022a3c466eb894f1"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig useradd
 
 DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 mtdev jpeg"
 DEPENDS += "wayland mesa virtual/egl"

@@ -57,3 +57,6 @@ FILES_${PN}-examples = "${bindir}/*"
 
 RDEPENDS_${PN} += "xkeyboard-config"
 RRECOMMENDS_${PN} = "liberation-fonts"
+
+USERADD_PACKAGES = "${PN}"
+GROUPADD_PARAM_${PN} = "--system weston-launch"

index 07811f2..9d5d626 100644
@@ -17,14 +17,21 @@ inherit autotools pkgconfig useradd
 DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 mtdev jpeg"
 DEPENDS += "wayland mesa virtual/egl"
 
-EXTRA_OECONF  = "--disable-android-compositor --enable-setuid-install"
-EXTRA_OECONF += "--disable-tablet-shell --disable-xwayland"
-EXTRA_OECONF += "--enable-simple-clients --enable-clients --disable-simple-egl-clients"
+EXTRA_OECONF = "--disable-android-compositor \
+                --enable-setuid-install \
+                --disable-tablet-shell \
+                --disable-xwayland \
+                --enable-simple-clients \
+                --enable-clients \
+                --disable-simple-egl-clients"
 
 PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms wayland', '', d)} \
                    ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
                    ${@base_contains('DISTRO_FEATURES', 'opengles2', 'gles', '', d)} \
                   "
+#
+# Compositor choices
+#
 # Weston on KMS
 PACKAGECONFIG[kms] = "--enable-drm-compositor --enable-weston-launch,--disable-drm-compositor --disable-weston-launch,drm udev mesa libpam"
 # Weston on Wayland (nested Weston)

@@ -32,6 +39,7 @@ PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-wayland-composit
 # Weston on X11
 PACKAGECONFIG[x11] = "--enable-x11-compositor,--disable-x11-compositor,virtual/libx11 libxcb libxcb libxcursor cairo"
 
+# Use cairo-gl or cairo-glesv2
 PACKAGECONFIG[gles] = "--with-cairo-glesv2,,virtual/libgles2"
 
 do_install_append() {

similarity index 82%
rename from meta/recipes-graphics/wayland/weston_1.0.6.bb
rename to meta/recipes-graphics/wayland/weston_1.1.0.bb
index 9d5d626..026f136 100644
@@ -9,8 +9,9 @@ SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
            file://install-examples.patch \
            file://weston.png \
            file://weston.desktop"
-SRC_URI[md5sum] = "63202129d66d5514e572814da5dfa1f7"
-SRC_URI[sha256sum] = "c833bc4dc8667561d2639b57220541531c039aa9332ce2a7022a3c466eb894f1"
+SRC_URI[md5sum] = "dd9f3043fc5228c6bc4e99873fae2254"
+SRC_URI[sha256sum] = "e7715d2c731f77a729c994a599ffdaebac1307b2dd9336136706869fa53618b4"
+
 
 inherit autotools pkgconfig useradd
 

@@ -23,7 +24,11 @@ EXTRA_OECONF = "--disable-android-compositor \
                 --disable-xwayland \
                 --enable-simple-clients \
                 --enable-clients \
-                --disable-simple-egl-clients"
+                --disable-simple-egl-clients \
+                --disable-libunwind \
+                --disable-rpi-compositor \
+                --disable-rdp-compositor"
+
 
 PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms wayland', '', d)} \
                    ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \

@@ -38,6 +43,10 @@ PACKAGECONFIG[kms] = "--enable-drm-compositor --enable-weston-launch,--disable-d
 PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-wayland-compositor,mesa"
 # Weston on X11
 PACKAGECONFIG[x11] = "--enable-x11-compositor,--disable-x11-compositor,virtual/libx11 libxcb libxcb libxcursor cairo"
+# Headless Weston
+PACKAGECONFIG[headless] = "--enable-headless-compositor,--disable-headless-compositor"
+# Weston on framebuffer
+PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor,--disable-fbdev-compositor,udev mtdev"
 
 # Use cairo-gl or cairo-glesv2
 PACKAGECONFIG[gles] = "--with-cairo-glesv2,,virtual/libgles2"