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 | |
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')
2 files changed, 99 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch new file mode 100644 index 0000000000..16ec3edb3b --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch | |||
@@ -0,0 +1,61 @@ | |||
1 | Discover monotonic clock using compile-time check | ||
2 | |||
3 | monotonic clock check does not work when cross-compiling. | ||
4 | |||
5 | Upstream-Status: Denied [Does not work on OpenBSD] | ||
6 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
7 | |||
8 | |||
9 | |||
10 | Original patch follows: | ||
11 | |||
12 | When xorg-xserver is being cross-compiled, there is currently no way | ||
13 | for us to detect whether the monotonic clock is available on the | ||
14 | target system, because we aren't able to run a test program on the host | ||
15 | system. Currently, in this situation, we default to not use the | ||
16 | monotonic clock. One problem with this situation is that the user will | ||
17 | be treated as idle when the date is updated. | ||
18 | |||
19 | To fix this situation, we now use a compile-time check to detect whether the | ||
20 | monotonic clock is available. This check can run just fine when we are | ||
21 | cross-compiling. | ||
22 | |||
23 | Signed-off-by: David James <davidjames at google.com> | ||
24 | --- | ||
25 | configure.ac | 17 +++++++---------- | ||
26 | 1 file changed, 7 insertions(+), 10 deletions(-) | ||
27 | |||
28 | diff --git a/configure.ac b/configure.ac | ||
29 | index f7ab48c..26e85cd 100644 | ||
30 | --- a/configure.ac | ||
31 | +++ b/configure.ac | ||
32 | @@ -1048,19 +1048,16 @@ if ! test "x$have_clock_gettime" = xno; then | ||
33 | CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200112L" | ||
34 | fi | ||
35 | |||
36 | - AC_RUN_IFELSE([AC_LANG_SOURCE([ | ||
37 | + AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ | ||
38 | #include <time.h> | ||
39 | - | ||
40 | -int main(int argc, char *argv[[]]) { | ||
41 | - struct timespec tp; | ||
42 | - | ||
43 | - if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0) | ||
44 | +#include <unistd.h> | ||
45 | +int main() { | ||
46 | +#if !(defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 && defined(CLOCK_MONOTONIC)) | ||
47 | + #error No monotonic clock | ||
48 | +#endif | ||
49 | return 0; | ||
50 | - else | ||
51 | - return 1; | ||
52 | } | ||
53 | - ])], [MONOTONIC_CLOCK=yes], [MONOTONIC_CLOCK=no], | ||
54 | - [MONOTONIC_CLOCK="cross compiling"]) | ||
55 | +]])],[MONOTONIC_CLOCK=yes], [MONOTONIC_CLOCK=no]) | ||
56 | |||
57 | LIBS="$LIBS_SAVE" | ||
58 | CPPFLAGS="$CPPFLAGS_SAVE" | ||
59 | -- | ||
60 | 2.1.4 | ||
61 | |||
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 | |||