summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-12-05 13:27:32 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-12-18 18:03:56 +0000
commit77b66630fa162f4ba3b586c5bcce92e138c3075c (patch)
tree76745d2342aa3eda24099d39dd8eb80ec0510b1a
parent2775d1b625352e3ae6d12980b95e0ab4a1ca5c5f (diff)
downloadpoky-77b66630fa162f4ba3b586c5bcce92e138c3075c.tar.gz
xserver-xorg: remove redundant Wayland patch
The installation path and wayland-scanner location problems in Wayland were resolved in "wayland: Fix installation patch issue" (oe-core 14c0d99) which made the WAYLAND_PROTOCOLS_SYSROOT_DIR workaround redundant. (From OE-Core rev: 2dffd043c7f9bb71356a0d0b86b5b0a19fdf7343) 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/0002-configure.ac-Fix-wayland-scanner-and-protocols-locat.patch38
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.5.bb1
2 files changed, 0 insertions, 39 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
deleted file mode 100644
index eafd07a5f1..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0002-configure.ac-Fix-wayland-scanner-and-protocols-locat.patch
+++ /dev/null
@@ -1,38 +0,0 @@
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.19.5.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.5.bb
index c953031517..398eb817db 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.5.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.5.bb
@@ -2,7 +2,6 @@ require xserver-xorg.inc
2 2
3SRC_URI += "file://musl-arm-inb-outb.patch \ 3SRC_URI += "file://musl-arm-inb-outb.patch \
4 file://0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch \ 4 file://0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch \
5 file://0002-configure.ac-Fix-wayland-scanner-and-protocols-locat.patch \
6 file://0003-modesetting-Fix-16-bit-depth-bpp-mode.patch \ 5 file://0003-modesetting-Fix-16-bit-depth-bpp-mode.patch \
7 file://0003-Remove-check-for-useSIGIO-option.patch \ 6 file://0003-Remove-check-for-useSIGIO-option.patch \
8 " 7 "