summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-xserver
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-09-20 20:19:05 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-21 18:45:47 -0700
commit4cd0d52e5f99a86c570ce68652f1cc61461303c8 (patch)
treea28d639c59969310ba72aba7b9cedf1ecc65cb3b /meta/recipes-graphics/xorg-xserver
parent9d2cbf041403f5012b251de6c2dc0683755398ed (diff)
downloadpoky-4cd0d52e5f99a86c570ce68652f1cc61461303c8.tar.gz
xserver-xorg: rewrite xorg-server.m4 patch
Instead of having a patch that upstream won't accept, rewrite it in a upstreamable way and <gasp> submit it upstream. The fundamental problem is that pkg-config --variable=sdkdir will return the value of sdkdir literally, whereas --cflags will return -I${sdkdir} *but* will do sysroot relocation magic on the path so it is usable. (From OE-Core rev: 4af34cb1193fe86b862566becfb560b3d19155f4) 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')
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg.inc1
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch25
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch34
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.1.bb1
4 files changed, 35 insertions, 26 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 89318e53c5..489a428500 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -17,7 +17,6 @@ INC_PR = "r8"
17 17
18XORG_PN = "xorg-server" 18XORG_PN = "xorg-server"
19SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2" 19SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2"
20SRC_URI += "file://macro_tweak.patch"
21 20
22S = "${WORKDIR}/${XORG_PN}-${PV}" 21S = "${WORKDIR}/${XORG_PN}-${PV}"
23 22
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
deleted file mode 100644
index c36e4e7301..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1This is the revised version of files/macro_tweak.patch for
2xorg-server 1.8.99.904 and newer.
3
4Upstream-Status: Pending
5
6Signed-off-by: Yu Ke <ke.yu@intel.com>
7
8Index: xorg-server-1.19.6/xorg-server.m4
9===================================================================
10--- xorg-server-1.19.6.orig/xorg-server.m4
11+++ xorg-server-1.19.6/xorg-server.m4
12@@ -28,10 +28,12 @@ dnl
13 # Checks for the MACRO define in xorg-server.h (from the sdk). If it
14 # is defined, then add the given PROTO to $REQUIRED_MODULES.
15
16+m4_pattern_allow(PKG_CONFIG_SYSROOT_DIR)
17+
18 AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
19 AC_REQUIRE([PKG_PROG_PKG_CONFIG])
20 SAVE_CFLAGS="$CFLAGS"
21- CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
22+ CFLAGS="$CFLAGS -I$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=sdkdir xorg-server`"
23 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
24 #include "xorg-server.h"
25 #if !defined $1
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch
new file mode 100644
index 0000000000..2ef9fa9fe4
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch
@@ -0,0 +1,34 @@
1Upstream-Status: Submitted [https://gitlab.freedesktop.org/xorg/xserver/merge_requests/22]
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From 5f65a6246fe752764045dd1e38912f1dccec71e4 Mon Sep 17 00:00:00 2001
5From: Ross Burton <ross.burton@intel.com>
6Date: Thu, 20 Sep 2018 20:12:24 +0100
7Subject: [PATCH] xorg-server.m4: just all cflags instead of just sdkdir
8
9Instead of fetching just the sdkdir variable of xorg-server using pkg-config,
10simply get all of the CFLAGS. Aside from completeness, this helps builds in
11sysroots as pkg-config knows what to do with --cflags but doesn't remap
12arbitrary variables.
13
14Signed-off-by: Ross Burton <ross.burton@intel.com>
15---
16 xorg-server.m4 | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/xorg-server.m4 b/xorg-server.m4
20index 18255b91a..195bda5d8 100644
21--- a/xorg-server.m4
22+++ b/xorg-server.m4
23@@ -31,7 +31,7 @@ dnl
24 AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
25 AC_REQUIRE([PKG_PROG_PKG_CONFIG])
26 SAVE_CFLAGS="$CFLAGS"
27- CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
28+ CFLAGS="$CFLAGS `$PKG_CONFIG --cflags xorg-server`"
29 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
30 #include "xorg-server.h"
31 #if !defined $1
32--
332.11.0
34
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.1.bb
index 05e909febd..cfdaf73175 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.1.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.1.bb
@@ -2,6 +2,7 @@ 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-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \ 4 file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \
5 file://pkgconfig.patch \
5 " 6 "
6SRC_URI[md5sum] = "e525846d1d0af5732ba835f2e2ec066d" 7SRC_URI[md5sum] = "e525846d1d0af5732ba835f2e2ec066d"
7SRC_URI[sha256sum] = "59c99fe86fe75b8164c6567bfc6e982aecc2e4a51e6fbac1b842d5d00549e918" 8SRC_URI[sha256sum] = "59c99fe86fe75b8164c6567bfc6e982aecc2e4a51e6fbac1b842d5d00549e918"