summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorTim Orling <TicoTimo@gmail.com>2014-05-22 09:02:19 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-27 16:11:54 +0100
commit87e2ce604e6fbe2814a923e5077ad4d0a562e790 (patch)
treec0a9e30da624e8b44869a7c3bd9389894481d54a /meta
parent2f4f644e3983c57c4d910cd93a7725186cbf8dcf (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-graphics/wayland/wayland/disable-macro-checks-not-used-for-scanner.patch2
-rw-r--r--meta/recipes-graphics/wayland/wayland/just-scanner.patch49
-rw-r--r--meta/recipes-graphics/wayland/wayland_1.5.0.bb (renamed from meta/recipes-graphics/wayland/wayland_1.4.0.bb)7
3 files changed, 4 insertions, 54 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 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
20+++ b/configure.ac 20+++ b/configure.ac
21@@ -41,16 +41,16 @@ AC_SUBST(GCC_CFLAGS) 21@@ -41,16 +41,16 @@ AC_SUBST(GCC_CFLAGS)
22 22
23 AC_CHECK_FUNCS([accept4 mkostemp]) 23 AC_CHECK_FUNCS([accept4 mkostemp posix_fallocate])
24 24
25-AC_CHECK_DECL(SFD_CLOEXEC,[], 25-AC_CHECK_DECL(SFD_CLOEXEC,[],
26- [AC_MSG_ERROR("SFD_CLOEXEC is needed to compile wayland")], 26- [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 @@
1From f674544d4f6f5f763e449207da77a561b22eff97 Mon Sep 17 00:00:00 2001
2From: Valentin Popa <valentin.popa@intel.com>
3Date: Fri, 7 Feb 2014 16:36:47 +0200
4Subject: [PATCH] just scanner
5
6We only build wayland-native for the scanner, so disable the bits we don't
7actually need. This gives us a small speed up but importantly should allow
8wayland-native to compile on older hosts such as CentOS 5 which currently fails:
9
10| wayland-1.0.6/src/wayland-server.c:1245: error: 'O_CLOEXEC' undeclared (first use in this function)
11| wayland-1.0.6/src/event-loop.c:34:25: error: sys/timerfd.h: No such file or directory
12| wayland-1.0.6/src/event-loop.c:199: error: 'CLOCK_MONOTONIC' undeclared (first use in this function)
13| wayland-1.0.6/src/event-loop.c:199: error: 'TFD_CLOEXEC' undeclared (first use in this function)
14| wayland-1.0.6/src/event-loop.c:268: error: 'SFD_CLOEXEC' undeclared (first use in this function)
15
16Upstream-Status: Inappropriate
17Signed-off-by: Ross Burton <ross.burton@intel.com>
18Signed-off-by: Valentin Popa <valentin.popa@intel.com>
19---
20 Makefile.am | 2 +-
21 src/Makefile.am | 2 +-
22 2 files changed, 2 insertions(+), 2 deletions(-)
23
24diff --git a/Makefile.am b/Makefile.am
25index 99607b0..ecce1f1 100644
26--- a/Makefile.am
27+++ b/Makefile.am
28@@ -2,7 +2,7 @@ if BUILD_DOCS
29 doc_subdir = doc
30 endif
31
32-SUBDIRS = protocol src $(doc_subdir) tests cursor
33+SUBDIRS = protocol src $(doc_subdir)
34
35 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
36
37diff --git a/src/Makefile.am b/src/Makefile.am
38index 15f44a5..b938d17 100644
39--- a/src/Makefile.am
40+++ b/src/Makefile.am
41@@ -1,4 +1,4 @@
42-lib_LTLIBRARIES = libwayland-server.la libwayland-client.la
43+#lib_LTLIBRARIES = libwayland-server.la libwayland-client.la
44 noinst_LTLIBRARIES = libwayland-util.la
45
46 include_HEADERS = \
47--
481.8.3.2
49
diff --git a/meta/recipes-graphics/wayland/wayland_1.4.0.bb b/meta/recipes-graphics/wayland/wayland_1.5.0.bb
index 9f6419d5fd..b1ae59ef13 100644
--- a/meta/recipes-graphics/wayland/wayland_1.4.0.bb
+++ b/meta/recipes-graphics/wayland/wayland_1.5.0.bb
@@ -11,10 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1d4476a7d98dd5691c53d4d43a510c72 \
11 file://src/wayland-server.c;endline=21;md5=079ae21dbf98ada52ec23744851b0a5c" 11 file://src/wayland-server.c;endline=21;md5=079ae21dbf98ada52ec23744851b0a5c"
12 12
13SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz" 13SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
14SRC_URI[md5sum] = "332cf9191837be12638a29265ed7cf46" 14SRC_URI[md5sum] = "1d882776b27329b91d2d500b6d66dd1d"
15SRC_URI[sha256sum] = "18f33b9f15b4c8b662fb1968e7636e7926b419dfc48de8a164b3a3d7095c5a58" 15SRC_URI[sha256sum] = "0069e1e9af888b3e05384380ad8cc6c976ea3e81d08ba19b7675ce1d693a41b5"
16 16SRC_URI_append_class-native = " \
17SRC_URI_append_class-native = " file://just-scanner.patch \
18 file://disable-macro-checks-not-used-for-scanner.patch \ 17 file://disable-macro-checks-not-used-for-scanner.patch \
19 " 18 "
20EXTRA_OECONF_class-native = "--disable-documentation --enable-scanner" 19EXTRA_OECONF_class-native = "--disable-documentation --enable-scanner"