summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@ti.com>2016-01-19 21:49:05 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-24 09:40:22 +0000
commit1bc0c89595f1914c6f9e73a183f3115d7d793017 (patch)
tree06bcf5b46bc59f76e55add4f1c0791195b8a3301
parent03dae8e8b3df5d1d2c98f756285ab8e7009dacf5 (diff)
downloadpoky-1bc0c89595f1914c6f9e73a183f3115d7d793017.tar.gz
wayland: upgrade 1.8.1 -> 1.9.0
* The license was updated from MIT X11 to MIT Expat. * always-build-scanner.patch was accepted upstream. * disable-macro-checks-not-used-for-scanner.patch is no longer needed with the new --disable-libraries flag. (From OE-Core rev: 696895e39715e9e9da70a85d16fec3b385eec549) Signed-off-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/wayland/wayland/always-build-scanner.patch105
-rw-r--r--meta/recipes-graphics/wayland/wayland/disable-macro-checks-not-used-for-scanner.patch50
-rw-r--r--meta/recipes-graphics/wayland/wayland_1.9.0.bb (renamed from meta/recipes-graphics/wayland/wayland_1.8.1.bb)20
3 files changed, 8 insertions, 167 deletions
diff --git a/meta/recipes-graphics/wayland/wayland/always-build-scanner.patch b/meta/recipes-graphics/wayland/wayland/always-build-scanner.patch
deleted file mode 100644
index 5e0e6bf12a..0000000000
--- a/meta/recipes-graphics/wayland/wayland/always-build-scanner.patch
+++ /dev/null
@@ -1,105 +0,0 @@
1build: always build wayland-scanner
2
3The previous idiom for building a cross-compiled Wayland is to build once for
4the build host (with --enable-scanner --disable-libraries) to get a
5wayland-scanner binary that can then be used in a cross-compile (with
6--disable-scanner). The problem with this is that the cross wayland is missing
7a wayland-scanner binary, which means you then can't do any Wayland development
8on the target.
9
10Instead, always build wayland-scanner for the target and change
11--enable/disable-scanner to --with/without-host-scanner. Normal builds use the
12default of --without-host-scanner and run the wayland-scanner it just built, and
13cross-compiled builds pass --with-host-scanner to use a previously built host
14scanner but still get a wayland-scanner to install.
15
16(a theoretically neater solution would be to build two scanners if required (one
17to run and one to install), but automake makes this overly complicated)
18
19Signed-off-by: Ross Burton <ross.burton@intel.com>
20Upstream-Status: Submitted
21
22diff --git a/Makefile.am b/Makefile.am
23index c19494f..c2d929b 100644
24--- a/Makefile.am
25+++ b/Makefile.am
26@@ -64,16 +64,17 @@ nodist_libwayland_client_la_SOURCES = \
27
28 pkgconfig_DATA += src/wayland-client.pc src/wayland-server.pc
29
30-if ENABLE_SCANNER
31-wayland_scanner = $(top_builddir)/wayland-scanner
32 bin_PROGRAMS = wayland-scanner
33 wayland_scanner_SOURCES = src/scanner.c
34 wayland_scanner_CFLAGS = $(EXPAT_CFLAGS) $(AM_CFLAGS)
35 wayland_scanner_LDADD = $(EXPAT_LIBS) libwayland-util.la
36-$(BUILT_SOURCES) : wayland-scanner
37 pkgconfig_DATA += src/wayland-scanner.pc
38-else
39+
40+if HOST_SCANNER
41 wayland_scanner = wayland-scanner
42+else
43+$(BUILT_SOURCES) : wayland-scanner
44+wayland_scanner = $(top_builddir)/wayland-scanner
45 endif
46
47 protocol/%-protocol.c : $(top_srcdir)/protocol/%.xml
48diff --git a/configure.ac b/configure.ac
49index c2a804e..de0b02f 100644
50--- a/configure.ac
51+++ b/configure.ac
52@@ -65,11 +65,11 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[],
53 [[#include <time.h>]])
54 AC_CHECK_HEADERS([execinfo.h])
55
56-AC_ARG_ENABLE([scanner],
57- [AC_HELP_STRING([--disable-scanner],
58- [Disable compilation of wayland-scanner])],
59- [],
60- [enable_scanner=yes])
61+AC_ARG_WITH([host-scanner],
62+ [AC_HELP_STRING([--with-host-scanner],
63+ [Use a host wayland-scanner])],
64+ [],
65+ [with_host_scanner=no])
66
67 AC_ARG_ENABLE([documentation],
68 [AC_HELP_STRING([--disable-documentation],
69@@ -77,25 +77,23 @@ AC_ARG_ENABLE([documentation],
70 [],
71 [enable_documentation=yes])
72
73-AM_CONDITIONAL(ENABLE_SCANNER, test "x$enable_scanner" = xyes)
74+AM_CONDITIONAL(HOST_SCANNER, test "x$with_host_scanner" = xyes)
75
76 AC_ARG_WITH(icondir, [ --with-icondir=<dir> Look for cursor icons here],
77 [ ICONDIR=$withval],
78 [ ICONDIR=${datadir}/icons])
79 AC_SUBST([ICONDIR])
80
81-if test "x$enable_scanner" = "xyes"; then
82- PKG_CHECK_MODULES(EXPAT, [expat], [],
83- [AC_CHECK_HEADERS(expat.h, [],
84- [AC_MSG_ERROR([Can't find expat.h. Please install expat.])])
85- SAVE_LIBS="$LIBS"
86- AC_SEARCH_LIBS(XML_ParserCreate, expat, [],
87- [AC_MSG_ERROR([Can't find expat library. Please install expat.])])
88- EXPAT_LIBS="$LIBS"
89- LIBS="$SAVE_LIBS"
90- AC_SUBST(EXPAT_LIBS)
91- ])
92-fi
93+PKG_CHECK_MODULES(EXPAT, [expat], [],
94+ [AC_CHECK_HEADERS(expat.h, [],
95+ [AC_MSG_ERROR([Can't find expat.h. Please install expat.])])
96+ SAVE_LIBS="$LIBS"
97+ AC_SEARCH_LIBS(XML_ParserCreate, expat, [],
98+ [AC_MSG_ERROR([Can't find expat library. Please install expat.])])
99+ EXPAT_LIBS="$LIBS"
100+ LIBS="$SAVE_LIBS"
101+ AC_SUBST(EXPAT_LIBS)
102+ ])
103
104 AC_PATH_PROG(XSLTPROC, xsltproc)
105 AM_CONDITIONAL([HAVE_XSLTPROC], [test "x$XSLTPROC" != "x"])
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
deleted file mode 100644
index cd8bc55842..0000000000
--- a/meta/recipes-graphics/wayland/wayland/disable-macro-checks-not-used-for-scanner.patch
+++ /dev/null
@@ -1,50 +0,0 @@
1disable macro checks not used for scanner
2
3We only build wayland-native for the scanner, so disable the bits we don't
4actually need. This avoid build issue on older distro such as Centos 5.x:
5| error: 'O_CLOEXEC' undeclared (first use in this function)
6| error: sys/timerfd.h: No such file or directory
7| error: 'CLOCK_MONOTONIC' undeclared (first use in this function)
8| error: 'TFD_CLOEXEC' undeclared (first use in this function)
9| error: 'SFD_CLOEXEC' undeclared (first use in this function)
10
11Upstream-Status: Pending
12
13Signed-off-by: Ting Liu <b28495@freescale.com>
14---
15 configure.ac | 20 ++++++++++----------
16 1 file changed, 10 insertions(+), 10 deletions(-)
17
18diff --git a/configure.ac b/configure.ac
19--- a/configure.ac
20+++ b/configure.ac
21@@ -41,16 +41,16 @@ AC_SUBST(GCC_CFLAGS)
22
23 AC_CHECK_FUNCS([accept4 mkostemp posix_fallocate])
24
25-AC_CHECK_DECL(SFD_CLOEXEC,[],
26- [AC_MSG_ERROR("SFD_CLOEXEC is needed to compile wayland")],
27- [[#include <sys/signalfd.h>]])
28-AC_CHECK_DECL(TFD_CLOEXEC,[],
29- [AC_MSG_ERROR("TFD_CLOEXEC is needed to compile wayland")],
30- [[#include <sys/timerfd.h>]])
31-AC_CHECK_DECL(CLOCK_MONOTONIC,[],
32- [AC_MSG_ERROR("CLOCK_MONOTONIC is needed to compile wayland")],
33- [[#include <time.h>]])
34-AC_CHECK_HEADERS([execinfo.h])
35+##AC_CHECK_DECL(SFD_CLOEXEC,[],
36+# [AC_MSG_ERROR("SFD_CLOEXEC is needed to compile wayland")],
37+# [[#include <sys/signalfd.h>]])
38+#AC_CHECK_DECL(TFD_CLOEXEC,[],
39+# [AC_MSG_ERROR("TFD_CLOEXEC is needed to compile wayland")],
40+# [[#include <sys/timerfd.h>]])
41+#AC_CHECK_DECL(CLOCK_MONOTONIC,[],
42+# [AC_MSG_ERROR("CLOCK_MONOTONIC is needed to compile wayland")],
43+# [[#include <time.h>]])
44+#AC_CHECK_HEADERS([execinfo.h])
45
46 AC_ARG_ENABLE([scanner],
47 [AC_HELP_STRING([--disable-scanner],
48--
491.8.3.2
50
diff --git a/meta/recipes-graphics/wayland/wayland_1.8.1.bb b/meta/recipes-graphics/wayland/wayland_1.9.0.bb
index 0f9a0aa02e..d12ac186cd 100644
--- a/meta/recipes-graphics/wayland/wayland_1.8.1.bb
+++ b/meta/recipes-graphics/wayland/wayland_1.9.0.bb
@@ -7,18 +7,14 @@ be traditional applications, X servers (rootless or fullscreen) or other \
7display servers." 7display servers."
8HOMEPAGE = "http://wayland.freedesktop.org" 8HOMEPAGE = "http://wayland.freedesktop.org"
9LICENSE = "MIT" 9LICENSE = "MIT"
10LIC_FILES_CHKSUM = "file://COPYING;md5=1d4476a7d98dd5691c53d4d43a510c72 \ 10LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \
11 file://src/wayland-server.c;endline=21;md5=079ae21dbf98ada52ec23744851b0a5c" 11 file://src/wayland-server.c;endline=24;md5=b8e046164a766bb1ede8ba38e9dcd7ce"
12 12
13SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ 13SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
14 file://always-build-scanner.patch" 14SRC_URI[md5sum] = "5e141b3f2a7005d6c89d6f233c87c317"
15SRC_URI[md5sum] = "6e877877c3e04cfb865cfcd0733c9ab1" 15SRC_URI[sha256sum] = "9c8770720aa0034479735f58a4dc4ca9b172ecfede28f5134312e135b7301efa"
16SRC_URI[sha256sum] = "f17c938d1c24fd0a10f650a623a2775d329db3168b5732e498b08388ec776fc8" 16
17 17EXTRA_OECONF_class-native = "--disable-documentation --disable-libraries"
18SRC_URI_append_class-native = " \
19 file://disable-macro-checks-not-used-for-scanner.patch \
20 "
21EXTRA_OECONF_class-native = "--disable-documentation"
22 18
23inherit autotools pkgconfig 19inherit autotools pkgconfig
24 20