From 2dffd043c7f9bb71356a0d0b86b5b0a19fdf7343 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 5 Dec 2017 13:27:32 +0000 Subject: 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. Signed-off-by: Ross Burton --- ...c-Fix-wayland-scanner-and-protocols-locat.patch | 38 ---------------------- .../xorg-xserver/xserver-xorg_1.19.5.bb | 1 - 2 files changed, 39 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/0002-configure.ac-Fix-wayland-scanner-and-protocols-locat.patch 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 @@ -From 963428f914c42270d3312d4f0c0840565521534e Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen -Date: Wed, 16 Nov 2016 00:41:51 +0200 -Subject: [PATCH 2/2] configure.ac: Fix wayland-scanner and protocols locations - -We want to use the wayland-scanner in path (native sysroot) -instead of using pkg-config which gives us target paths. - -The protocols paths on the other hand need to be prefixed with the -(allarch) sysroot because, again, pkg-config gives us target paths. - -Upstream-Status: Inappropriate [embedded specific] -Signed-off-by: Jussi Kukkonen ---- - configure.ac | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 58f1567..383a7df 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2525,11 +2525,9 @@ if test "x$XWAYLAND" = xyes; then - AC_MSG_ERROR([Xwayland requires CLOCK_MONOTONIC support.]) - fi - -- WAYLAND_PREFIX=`$PKG_CONFIG --variable=prefix wayland-client` -- AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner],, -- [${WAYLAND_PREFIX}/bin$PATH_SEPARATOR$PATH]) -+ AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner]) - -- AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, `$PKG_CONFIG --variable=pkgdatadir wayland-protocols`) -+ AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, ${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`) - fi - - --- -2.1.4 - 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 SRC_URI += "file://musl-arm-inb-outb.patch \ file://0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch \ - file://0002-configure.ac-Fix-wayland-scanner-and-protocols-locat.patch \ file://0003-modesetting-Fix-16-bit-depth-bpp-mode.patch \ file://0003-Remove-check-for-useSIGIO-option.patch \ " -- cgit 1.2.3-korg