mirror of
https://git.yoctoproject.org/poky
synced 2026-05-09 05:29:32 +00:00
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>
This commit is contained in:
Denys Dmytriyenko
committed by
Richard Purdie
Richard Purdie
parent
03dae8e8b3
commit
1bc0c89595
@@ -1,105 +0,0 @@
|
||||
build: always build wayland-scanner
|
||||
|
||||
The previous idiom for building a cross-compiled Wayland is to build once for
|
||||
the build host (with --enable-scanner --disable-libraries) to get a
|
||||
wayland-scanner binary that can then be used in a cross-compile (with
|
||||
--disable-scanner). The problem with this is that the cross wayland is missing
|
||||
a wayland-scanner binary, which means you then can't do any Wayland development
|
||||
on the target.
|
||||
|
||||
Instead, always build wayland-scanner for the target and change
|
||||
--enable/disable-scanner to --with/without-host-scanner. Normal builds use the
|
||||
default of --without-host-scanner and run the wayland-scanner it just built, and
|
||||
cross-compiled builds pass --with-host-scanner to use a previously built host
|
||||
scanner but still get a wayland-scanner to install.
|
||||
|
||||
(a theoretically neater solution would be to build two scanners if required (one
|
||||
to run and one to install), but automake makes this overly complicated)
|
||||
|
||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||
Upstream-Status: Submitted
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index c19494f..c2d929b 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -64,16 +64,17 @@ nodist_libwayland_client_la_SOURCES = \
|
||||
|
||||
pkgconfig_DATA += src/wayland-client.pc src/wayland-server.pc
|
||||
|
||||
-if ENABLE_SCANNER
|
||||
-wayland_scanner = $(top_builddir)/wayland-scanner
|
||||
bin_PROGRAMS = wayland-scanner
|
||||
wayland_scanner_SOURCES = src/scanner.c
|
||||
wayland_scanner_CFLAGS = $(EXPAT_CFLAGS) $(AM_CFLAGS)
|
||||
wayland_scanner_LDADD = $(EXPAT_LIBS) libwayland-util.la
|
||||
-$(BUILT_SOURCES) : wayland-scanner
|
||||
pkgconfig_DATA += src/wayland-scanner.pc
|
||||
-else
|
||||
+
|
||||
+if HOST_SCANNER
|
||||
wayland_scanner = wayland-scanner
|
||||
+else
|
||||
+$(BUILT_SOURCES) : wayland-scanner
|
||||
+wayland_scanner = $(top_builddir)/wayland-scanner
|
||||
endif
|
||||
|
||||
protocol/%-protocol.c : $(top_srcdir)/protocol/%.xml
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index c2a804e..de0b02f 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -65,11 +65,11 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[],
|
||||
[[#include <time.h>]])
|
||||
AC_CHECK_HEADERS([execinfo.h])
|
||||
|
||||
-AC_ARG_ENABLE([scanner],
|
||||
- [AC_HELP_STRING([--disable-scanner],
|
||||
- [Disable compilation of wayland-scanner])],
|
||||
- [],
|
||||
- [enable_scanner=yes])
|
||||
+AC_ARG_WITH([host-scanner],
|
||||
+ [AC_HELP_STRING([--with-host-scanner],
|
||||
+ [Use a host wayland-scanner])],
|
||||
+ [],
|
||||
+ [with_host_scanner=no])
|
||||
|
||||
AC_ARG_ENABLE([documentation],
|
||||
[AC_HELP_STRING([--disable-documentation],
|
||||
@@ -77,25 +77,23 @@ AC_ARG_ENABLE([documentation],
|
||||
[],
|
||||
[enable_documentation=yes])
|
||||
|
||||
-AM_CONDITIONAL(ENABLE_SCANNER, test "x$enable_scanner" = xyes)
|
||||
+AM_CONDITIONAL(HOST_SCANNER, test "x$with_host_scanner" = xyes)
|
||||
|
||||
AC_ARG_WITH(icondir, [ --with-icondir=<dir> Look for cursor icons here],
|
||||
[ ICONDIR=$withval],
|
||||
[ ICONDIR=${datadir}/icons])
|
||||
AC_SUBST([ICONDIR])
|
||||
|
||||
-if test "x$enable_scanner" = "xyes"; then
|
||||
- PKG_CHECK_MODULES(EXPAT, [expat], [],
|
||||
- [AC_CHECK_HEADERS(expat.h, [],
|
||||
- [AC_MSG_ERROR([Can't find expat.h. Please install expat.])])
|
||||
- SAVE_LIBS="$LIBS"
|
||||
- AC_SEARCH_LIBS(XML_ParserCreate, expat, [],
|
||||
- [AC_MSG_ERROR([Can't find expat library. Please install expat.])])
|
||||
- EXPAT_LIBS="$LIBS"
|
||||
- LIBS="$SAVE_LIBS"
|
||||
- AC_SUBST(EXPAT_LIBS)
|
||||
- ])
|
||||
-fi
|
||||
+PKG_CHECK_MODULES(EXPAT, [expat], [],
|
||||
+ [AC_CHECK_HEADERS(expat.h, [],
|
||||
+ [AC_MSG_ERROR([Can't find expat.h. Please install expat.])])
|
||||
+ SAVE_LIBS="$LIBS"
|
||||
+ AC_SEARCH_LIBS(XML_ParserCreate, expat, [],
|
||||
+ [AC_MSG_ERROR([Can't find expat library. Please install expat.])])
|
||||
+ EXPAT_LIBS="$LIBS"
|
||||
+ LIBS="$SAVE_LIBS"
|
||||
+ AC_SUBST(EXPAT_LIBS)
|
||||
+ ])
|
||||
|
||||
AC_PATH_PROG(XSLTPROC, xsltproc)
|
||||
AM_CONDITIONAL([HAVE_XSLTPROC], [test "x$XSLTPROC" != "x"])
|
||||
@@ -1,50 +0,0 @@
|
||||
disable macro checks not used for scanner
|
||||
|
||||
We only build wayland-native for the scanner, so disable the bits we don't
|
||||
actually need. This avoid build issue on older distro such as Centos 5.x:
|
||||
| error: 'O_CLOEXEC' undeclared (first use in this function)
|
||||
| error: sys/timerfd.h: No such file or directory
|
||||
| error: 'CLOCK_MONOTONIC' undeclared (first use in this function)
|
||||
| error: 'TFD_CLOEXEC' undeclared (first use in this function)
|
||||
| error: 'SFD_CLOEXEC' undeclared (first use in this function)
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Ting Liu <b28495@freescale.com>
|
||||
---
|
||||
configure.ac | 20 ++++++++++----------
|
||||
1 file changed, 10 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -41,16 +41,16 @@ AC_SUBST(GCC_CFLAGS)
|
||||
|
||||
AC_CHECK_FUNCS([accept4 mkostemp posix_fallocate])
|
||||
|
||||
-AC_CHECK_DECL(SFD_CLOEXEC,[],
|
||||
- [AC_MSG_ERROR("SFD_CLOEXEC is needed to compile wayland")],
|
||||
- [[#include <sys/signalfd.h>]])
|
||||
-AC_CHECK_DECL(TFD_CLOEXEC,[],
|
||||
- [AC_MSG_ERROR("TFD_CLOEXEC is needed to compile wayland")],
|
||||
- [[#include <sys/timerfd.h>]])
|
||||
-AC_CHECK_DECL(CLOCK_MONOTONIC,[],
|
||||
- [AC_MSG_ERROR("CLOCK_MONOTONIC is needed to compile wayland")],
|
||||
- [[#include <time.h>]])
|
||||
-AC_CHECK_HEADERS([execinfo.h])
|
||||
+##AC_CHECK_DECL(SFD_CLOEXEC,[],
|
||||
+# [AC_MSG_ERROR("SFD_CLOEXEC is needed to compile wayland")],
|
||||
+# [[#include <sys/signalfd.h>]])
|
||||
+#AC_CHECK_DECL(TFD_CLOEXEC,[],
|
||||
+# [AC_MSG_ERROR("TFD_CLOEXEC is needed to compile wayland")],
|
||||
+# [[#include <sys/timerfd.h>]])
|
||||
+#AC_CHECK_DECL(CLOCK_MONOTONIC,[],
|
||||
+# [AC_MSG_ERROR("CLOCK_MONOTONIC is needed to compile wayland")],
|
||||
+# [[#include <time.h>]])
|
||||
+#AC_CHECK_HEADERS([execinfo.h])
|
||||
|
||||
AC_ARG_ENABLE([scanner],
|
||||
[AC_HELP_STRING([--disable-scanner],
|
||||
--
|
||||
1.8.3.2
|
||||
|
||||
+6
-10
@@ -7,18 +7,14 @@ 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"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \
|
||||
file://src/wayland-server.c;endline=24;md5=b8e046164a766bb1ede8ba38e9dcd7ce"
|
||||
|
||||
SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
|
||||
file://always-build-scanner.patch"
|
||||
SRC_URI[md5sum] = "6e877877c3e04cfb865cfcd0733c9ab1"
|
||||
SRC_URI[sha256sum] = "f17c938d1c24fd0a10f650a623a2775d329db3168b5732e498b08388ec776fc8"
|
||||
SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
|
||||
SRC_URI[md5sum] = "5e141b3f2a7005d6c89d6f233c87c317"
|
||||
SRC_URI[sha256sum] = "9c8770720aa0034479735f58a4dc4ca9b172ecfede28f5134312e135b7301efa"
|
||||
|
||||
SRC_URI_append_class-native = " \
|
||||
file://disable-macro-checks-not-used-for-scanner.patch \
|
||||
"
|
||||
EXTRA_OECONF_class-native = "--disable-documentation"
|
||||
EXTRA_OECONF_class-native = "--disable-documentation --disable-libraries"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
|
||||
Reference in New Issue
Block a user