From 1b82befddc200055ae574985e9a79925987e8b0e Mon Sep 17 00:00:00 2001 From: Tim Orling Date: Thu, 22 May 2014 08:31:26 -0700 Subject: wayland: upgrade to 1.5.0 * update disable-macro-checks-not-used-for-scanner.patch = trivial change to non-patched text (+ posix_fallocate) * drop just-scanner.patch, no longer needed --- ...disable-macro-checks-not-used-for-scanner.patch | 2 +- .../wayland/wayland/just-scanner.patch | 49 ---------------------- meta/recipes-graphics/wayland/wayland_1.4.0.bb | 42 ------------------- meta/recipes-graphics/wayland/wayland_1.5.0.bb | 41 ++++++++++++++++++ 4 files changed, 42 insertions(+), 92 deletions(-) delete mode 100644 meta/recipes-graphics/wayland/wayland/just-scanner.patch delete mode 100644 meta/recipes-graphics/wayland/wayland_1.4.0.bb create mode 100644 meta/recipes-graphics/wayland/wayland_1.5.0.bb diff --git a/meta/recipes-graphics/wayland/wayland/disable-macro-checks-not-used-for-scanner.patch b/meta/recipes-graphics/wayland/wayland/disable-macro-checks-not-used-for-scanner.patch index bf499bb238..cd8bc55842 100644 --- a/meta/recipes-graphics/wayland/wayland/disable-macro-checks-not-used-for-scanner.patch +++ b/meta/recipes-graphics/wayland/wayland/disable-macro-checks-not-used-for-scanner.patch @@ -20,7 +20,7 @@ diff --git a/configure.ac b/configure.ac +++ b/configure.ac @@ -41,16 +41,16 @@ AC_SUBST(GCC_CFLAGS) - AC_CHECK_FUNCS([accept4 mkostemp]) + AC_CHECK_FUNCS([accept4 mkostemp posix_fallocate]) -AC_CHECK_DECL(SFD_CLOEXEC,[], - [AC_MSG_ERROR("SFD_CLOEXEC is needed to compile wayland")], diff --git a/meta/recipes-graphics/wayland/wayland/just-scanner.patch b/meta/recipes-graphics/wayland/wayland/just-scanner.patch deleted file mode 100644 index ae9935e089..0000000000 --- a/meta/recipes-graphics/wayland/wayland/just-scanner.patch +++ /dev/null @@ -1,49 +0,0 @@ -From f674544d4f6f5f763e449207da77a561b22eff97 Mon Sep 17 00:00:00 2001 -From: Valentin Popa -Date: Fri, 7 Feb 2014 16:36:47 +0200 -Subject: [PATCH] just scanner - -We only build wayland-native for the scanner, so disable the bits we don't -actually need. This gives us a small speed up but importantly should allow -wayland-native to compile on older hosts such as CentOS 5 which currently fails: - -| wayland-1.0.6/src/wayland-server.c:1245: error: 'O_CLOEXEC' undeclared (first use in this function) -| wayland-1.0.6/src/event-loop.c:34:25: error: sys/timerfd.h: No such file or directory -| wayland-1.0.6/src/event-loop.c:199: error: 'CLOCK_MONOTONIC' undeclared (first use in this function) -| wayland-1.0.6/src/event-loop.c:199: error: 'TFD_CLOEXEC' undeclared (first use in this function) -| wayland-1.0.6/src/event-loop.c:268: error: 'SFD_CLOEXEC' undeclared (first use in this function) - -Upstream-Status: Inappropriate -Signed-off-by: Ross Burton -Signed-off-by: Valentin Popa ---- - Makefile.am | 2 +- - src/Makefile.am | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 99607b0..ecce1f1 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -2,7 +2,7 @@ if BUILD_DOCS - doc_subdir = doc - endif - --SUBDIRS = protocol src $(doc_subdir) tests cursor -+SUBDIRS = protocol src $(doc_subdir) - - ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - -diff --git a/src/Makefile.am b/src/Makefile.am -index 15f44a5..b938d17 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -1,4 +1,4 @@ --lib_LTLIBRARIES = libwayland-server.la libwayland-client.la -+#lib_LTLIBRARIES = libwayland-server.la libwayland-client.la - noinst_LTLIBRARIES = libwayland-util.la - - include_HEADERS = \ --- -1.8.3.2 - diff --git a/meta/recipes-graphics/wayland/wayland_1.4.0.bb b/meta/recipes-graphics/wayland/wayland_1.4.0.bb deleted file mode 100644 index 9f6419d5fd..0000000000 --- a/meta/recipes-graphics/wayland/wayland_1.4.0.bb +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY = "Wayland, a protocol between a compositor and clients" -DESCRIPTION = "Wayland is a protocol for a compositor to talk to its clients \ -as well as a C library implementation of that protocol. The compositor can be \ -a standalone display server running on Linux kernel modesetting and evdev \ -input devices, an X application, or a wayland client itself. The clients can \ -be traditional applications, X servers (rootless or fullscreen) or other \ -display servers." -HOMEPAGE = "http://wayland.freedesktop.org" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=1d4476a7d98dd5691c53d4d43a510c72 \ - file://src/wayland-server.c;endline=21;md5=079ae21dbf98ada52ec23744851b0a5c" - -SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "332cf9191837be12638a29265ed7cf46" -SRC_URI[sha256sum] = "18f33b9f15b4c8b662fb1968e7636e7926b419dfc48de8a164b3a3d7095c5a58" - -SRC_URI_append_class-native = " file://just-scanner.patch \ - file://disable-macro-checks-not-used-for-scanner.patch \ - " -EXTRA_OECONF_class-native = "--disable-documentation --enable-scanner" - -inherit autotools pkgconfig - -# We need wayland-native for the wayland-scanner utility -BBCLASSEXTEND = "native" - -DEPENDS_class-native = "expat-native libffi-native" -DEPENDS = "expat libffi wayland-native" - -EXTRA_OECONF = "--disable-documentation --disable-scanner" - -# Wayland installs a M4 macro for other projects to use, which uses the target -# pkg-config to find files. Replace pkg-config with pkg-config-native. -do_install_append_class-native() { - sed -e 's,PKG_CHECK_MODULES(.*),,g' \ - -e 's,$PKG_CONFIG,pkg-config-native,g' \ - -i ${D}/${datadir}/aclocal/wayland-scanner.m4 -} - -sysroot_stage_all_append_class-target () { - cp ${STAGING_DATADIR_NATIVE}/aclocal/wayland-scanner.m4 ${SYSROOT_DESTDIR}/${datadir}/aclocal/ -} diff --git a/meta/recipes-graphics/wayland/wayland_1.5.0.bb b/meta/recipes-graphics/wayland/wayland_1.5.0.bb new file mode 100644 index 0000000000..b1ae59ef13 --- /dev/null +++ b/meta/recipes-graphics/wayland/wayland_1.5.0.bb @@ -0,0 +1,41 @@ +SUMMARY = "Wayland, a protocol between a compositor and clients" +DESCRIPTION = "Wayland is a protocol for a compositor to talk to its clients \ +as well as a C library implementation of that protocol. The compositor can be \ +a standalone display server running on Linux kernel modesetting and evdev \ +input devices, an X application, or a wayland client itself. The clients can \ +be traditional applications, X servers (rootless or fullscreen) or other \ +display servers." +HOMEPAGE = "http://wayland.freedesktop.org" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=1d4476a7d98dd5691c53d4d43a510c72 \ + file://src/wayland-server.c;endline=21;md5=079ae21dbf98ada52ec23744851b0a5c" + +SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz" +SRC_URI[md5sum] = "1d882776b27329b91d2d500b6d66dd1d" +SRC_URI[sha256sum] = "0069e1e9af888b3e05384380ad8cc6c976ea3e81d08ba19b7675ce1d693a41b5" +SRC_URI_append_class-native = " \ + file://disable-macro-checks-not-used-for-scanner.patch \ + " +EXTRA_OECONF_class-native = "--disable-documentation --enable-scanner" + +inherit autotools pkgconfig + +# We need wayland-native for the wayland-scanner utility +BBCLASSEXTEND = "native" + +DEPENDS_class-native = "expat-native libffi-native" +DEPENDS = "expat libffi wayland-native" + +EXTRA_OECONF = "--disable-documentation --disable-scanner" + +# Wayland installs a M4 macro for other projects to use, which uses the target +# pkg-config to find files. Replace pkg-config with pkg-config-native. +do_install_append_class-native() { + sed -e 's,PKG_CHECK_MODULES(.*),,g' \ + -e 's,$PKG_CONFIG,pkg-config-native,g' \ + -i ${D}/${datadir}/aclocal/wayland-scanner.m4 +} + +sysroot_stage_all_append_class-target () { + cp ${STAGING_DATADIR_NATIVE}/aclocal/wayland-scanner.m4 ${SYSROOT_DESTDIR}/${datadir}/aclocal/ +} -- cgit 1.2.3-korg