diff options
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg')
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch | 25 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch | 34 |
2 files changed, 34 insertions, 25 deletions
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 @@ | |||
1 | This is the revised version of files/macro_tweak.patch for | ||
2 | xorg-server 1.8.99.904 and newer. | ||
3 | |||
4 | Upstream-Status: Pending | ||
5 | |||
6 | Signed-off-by: Yu Ke <ke.yu@intel.com> | ||
7 | |||
8 | Index: 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 @@ | |||
1 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/xorg/xserver/merge_requests/22] | ||
2 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
3 | |||
4 | From 5f65a6246fe752764045dd1e38912f1dccec71e4 Mon Sep 17 00:00:00 2001 | ||
5 | From: Ross Burton <ross.burton@intel.com> | ||
6 | Date: Thu, 20 Sep 2018 20:12:24 +0100 | ||
7 | Subject: [PATCH] xorg-server.m4: just all cflags instead of just sdkdir | ||
8 | |||
9 | Instead of fetching just the sdkdir variable of xorg-server using pkg-config, | ||
10 | simply get all of the CFLAGS. Aside from completeness, this helps builds in | ||
11 | sysroots as pkg-config knows what to do with --cflags but doesn't remap | ||
12 | arbitrary variables. | ||
13 | |||
14 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
15 | --- | ||
16 | xorg-server.m4 | 2 +- | ||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/xorg-server.m4 b/xorg-server.m4 | ||
20 | index 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 | -- | ||
33 | 2.11.0 | ||
34 | |||