diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2016-12-12 12:11:39 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-13 22:55:21 +0000 |
commit | 1207d6d32e94d2c702b2f470d7e2dcf680e5db68 (patch) | |
tree | b2431dde75e6e858393390cea32a906fe442b441 /meta/recipes-graphics/xorg-xserver/xserver-xorg/0002-configure.ac-Fix-wayland-scanner-and-protocols-locat.patch | |
parent | 14d5f46095b134e56bd785a018c77b28a579d7be (diff) | |
download | poky-1207d6d32e94d2c702b2f470d7e2dcf680e5db68.tar.gz |
xserver-xorg: Upgrade 1.18.4 -> 1.19.0
* xserver depends on xfont2 now.
* xwayland support requires wayland-scanner: Add patch to find
wayland-scanner and protocol files while cross-compiling.
* patch MONOTONIC_CLOCK check so it works when cross-compiling
(otherwise we always end with no monotonic clock and xwayland
compile fails)
* Add vardepsexclude for MACHINE to ensure consistent hashes (RB)
(From OE-Core rev: f9c2b4284fafaa8998bbd2a6f443b0b7b98dafaa)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg/0002-configure.ac-Fix-wayland-scanner-and-protocols-locat.patch')
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg/0002-configure.ac-Fix-wayland-scanner-and-protocols-locat.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0002-configure.ac-Fix-wayland-scanner-and-protocols-locat.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0002-configure.ac-Fix-wayland-scanner-and-protocols-locat.patch new file mode 100644 index 0000000000..eafd07a5f1 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0002-configure.ac-Fix-wayland-scanner-and-protocols-locat.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | From 963428f914c42270d3312d4f0c0840565521534e Mon Sep 17 00:00:00 2001 | ||
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
3 | Date: Wed, 16 Nov 2016 00:41:51 +0200 | ||
4 | Subject: [PATCH 2/2] configure.ac: Fix wayland-scanner and protocols locations | ||
5 | |||
6 | We want to use the wayland-scanner in path (native sysroot) | ||
7 | instead of using pkg-config which gives us target paths. | ||
8 | |||
9 | The protocols paths on the other hand need to be prefixed with the | ||
10 | (allarch) sysroot because, again, pkg-config gives us target paths. | ||
11 | |||
12 | Upstream-Status: Inappropriate [embedded specific] | ||
13 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
14 | --- | ||
15 | configure.ac | 6 ++---- | ||
16 | 1 file changed, 2 insertions(+), 4 deletions(-) | ||
17 | |||
18 | diff --git a/configure.ac b/configure.ac | ||
19 | index 58f1567..383a7df 100644 | ||
20 | --- a/configure.ac | ||
21 | +++ b/configure.ac | ||
22 | @@ -2525,11 +2525,9 @@ if test "x$XWAYLAND" = xyes; then | ||
23 | AC_MSG_ERROR([Xwayland requires CLOCK_MONOTONIC support.]) | ||
24 | fi | ||
25 | |||
26 | - WAYLAND_PREFIX=`$PKG_CONFIG --variable=prefix wayland-client` | ||
27 | - AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner],, | ||
28 | - [${WAYLAND_PREFIX}/bin$PATH_SEPARATOR$PATH]) | ||
29 | + AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner]) | ||
30 | |||
31 | - AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, `$PKG_CONFIG --variable=pkgdatadir wayland-protocols`) | ||
32 | + AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, ${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`) | ||
33 | fi | ||
34 | |||
35 | |||
36 | -- | ||
37 | 2.1.4 | ||
38 | |||