summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-12-12 12:11:39 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-12-13 22:55:21 +0000
commit1207d6d32e94d2c702b2f470d7e2dcf680e5db68 (patch)
treeb2431dde75e6e858393390cea32a906fe442b441
parent14d5f46095b134e56bd785a018c77b28a579d7be (diff)
downloadpoky-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>
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg.inc6
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch61
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg/0002-configure.ac-Fix-wayland-scanner-and-protocols-locat.patch38
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.0.bb (renamed from meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.4.bb)9
4 files changed, 109 insertions, 5 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 269fa63048..4a5f9a6a1e 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -27,7 +27,7 @@ inherit distro_features_check
27REQUIRED_DISTRO_FEATURES = "x11" 27REQUIRED_DISTRO_FEATURES = "x11"
28 28
29PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86vidmodeproto compositeproto recordproto resourceproto videoproto scrnsaverproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto presentproto" 29PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86vidmodeproto compositeproto recordproto resourceproto videoproto scrnsaverproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto presentproto"
30LIB_DEPS = "pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess" 30LIB_DEPS = "pixman libxfont2 xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess"
31DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} font-util" 31DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} font-util"
32 32
33# Split out some modules and extensions from the main package 33# Split out some modules and extensions from the main package
@@ -117,7 +117,9 @@ EXTRA_OECONF += "--with-fop=no \
117 --sysconfdir=/etc/X11 \ 117 --sysconfdir=/etc/X11 \
118 --localstatedir=/var \ 118 --localstatedir=/var \
119 --with-xkb-output=/var/lib/xkb \ 119 --with-xkb-output=/var/lib/xkb \
120 WAYLAND_PROTOCOLS_SYSROOT_DIR=${STAGING_DIR}/${MACHINE} \
120" 121"
122EXTRA_OECONF[vardepsexclude] = "MACHINE"
121 123
122PACKAGECONFIG ??= "dri2 udev ${XORG_CRYPTO} \ 124PACKAGECONFIG ??= "dri2 udev ${XORG_CRYPTO} \
123 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri glx', '', d)} \ 125 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri glx', '', d)} \
@@ -138,7 +140,7 @@ PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-
138PACKAGECONFIG[systemd-logind] = "--enable-systemd-logind=yes,--enable-systemd-logind=no,dbus," 140PACKAGECONFIG[systemd-logind] = "--enable-systemd-logind=yes,--enable-systemd-logind=no,dbus,"
139PACKAGECONFIG[systemd] = "--with-systemd-daemon,--without-systemd-daemon,systemd" 141PACKAGECONFIG[systemd] = "--with-systemd-daemon,--without-systemd-daemon,systemd"
140PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,xineramaproto" 142PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,xineramaproto"
141PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland,wayland libepoxy" 143PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland,wayland wayland-native wayland-protocols libepoxy"
142 144
143# Xorg requires a SHA1 implementation, pick one 145# Xorg requires a SHA1 implementation, pick one
144XORG_CRYPTO ??= "openssl" 146XORG_CRYPTO ??= "openssl"
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 @@
1Discover monotonic clock using compile-time check
2
3monotonic clock check does not work when cross-compiling.
4
5Upstream-Status: Denied [Does not work on OpenBSD]
6Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
7
8
9
10Original patch follows:
11
12When xorg-xserver is being cross-compiled, there is currently no way
13for us to detect whether the monotonic clock is available on the
14target system, because we aren't able to run a test program on the host
15system. Currently, in this situation, we default to not use the
16monotonic clock. One problem with this situation is that the user will
17be treated as idle when the date is updated.
18
19To fix this situation, we now use a compile-time check to detect whether the
20monotonic clock is available. This check can run just fine when we are
21cross-compiling.
22
23Signed-off-by: David James <davidjames at google.com>
24---
25 configure.ac | 17 +++++++----------
26 1 file changed, 7 insertions(+), 10 deletions(-)
27
28diff --git a/configure.ac b/configure.ac
29index 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--
602.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 @@
1From 963428f914c42270d3312d4f0c0840565521534e Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Wed, 16 Nov 2016 00:41:51 +0200
4Subject: [PATCH 2/2] configure.ac: Fix wayland-scanner and protocols locations
5
6We want to use the wayland-scanner in path (native sysroot)
7instead of using pkg-config which gives us target paths.
8
9The protocols paths on the other hand need to be prefixed with the
10(allarch) sysroot because, again, pkg-config gives us target paths.
11
12Upstream-Status: Inappropriate [embedded specific]
13Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
14---
15 configure.ac | 6 ++----
16 1 file changed, 2 insertions(+), 4 deletions(-)
17
18diff --git a/configure.ac b/configure.ac
19index 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--
372.1.4
38
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.4.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.0.bb
index 6700565790..8725382cc6 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.4.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.0.bb
@@ -1,8 +1,11 @@
1require xserver-xorg.inc 1require xserver-xorg.inc
2 2
3SRC_URI += "file://musl-arm-inb-outb.patch" 3SRC_URI += "file://musl-arm-inb-outb.patch \
4SRC_URI[md5sum] = "d4842dfe3bd9a9d062f2fa1df9104a46" 4 file://0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch \
5SRC_URI[sha256sum] = "278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8" 5 file://0002-configure.ac-Fix-wayland-scanner-and-protocols-locat.patch \
6 "
7SRC_URI[md5sum] = "6a4d01e4e5047ab8f556960424ba1fa9"
8SRC_URI[sha256sum] = "149a708b50befc2d5a40b98d45ddd2ebe0beec018e6d0c663c43bad6210e4da3"
6 9
7# These extensions are now integrated into the server, so declare the migration 10# These extensions are now integrated into the server, so declare the migration
8# path for in-place upgrades. 11# path for in-place upgrades.