diff options
| author | Tim Orling <TicoTimo@gmail.com> | 2014-05-22 09:02:19 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-27 16:11:54 +0100 |
| commit | 87e2ce604e6fbe2814a923e5077ad4d0a562e790 (patch) | |
| tree | c0a9e30da624e8b44869a7c3bd9389894481d54a /meta/recipes-graphics/wayland/wayland | |
| parent | 2f4f644e3983c57c4d910cd93a7725186cbf8dcf (diff) | |
| download | ast2050-yocto-poky-87e2ce604e6fbe2814a923e5077ad4d0a562e790.zip ast2050-yocto-poky-87e2ce604e6fbe2814a923e5077ad4d0a562e790.tar.gz | |
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
(From OE-Core rev: f453259c6710a6b3fb3c542b3921426baf160347)
Signed-off-by: Tim Orling <TicoTimo@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/wayland/wayland')
| -rw-r--r-- | meta/recipes-graphics/wayland/wayland/disable-macro-checks-not-used-for-scanner.patch | 2 | ||||
| -rw-r--r-- | meta/recipes-graphics/wayland/wayland/just-scanner.patch | 49 |
2 files changed, 1 insertions, 50 deletions
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 bf499bb..cd8bc55 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 ae9935e..0000000 --- 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 <valentin.popa@intel.com> -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 <ross.burton@intel.com> -Signed-off-by: Valentin Popa <valentin.popa@intel.com> ---- - 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 - |
