aboutsummaryrefslogtreecommitdiffstats
path: root/meta-rcar-gen3/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
diff options
context:
space:
mode:
authorKhang Nguyen <khang.nguyen.xw@renesas.com>2019-06-20 09:50:47 +0700
committerKhang Nguyen <khang.nguyen.xw@renesas.com>2019-09-24 08:16:26 +0700
commit4ae7143849d1efcfcf21608a8bc41c4c78de7a48 (patch)
tree774eb058818564d280f152094d179333856d0451 /meta-rcar-gen3/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
parent2e5e8e8cb0d1b8429e18f484f18c48d9598eb7c2 (diff)
rcar-gen3: xserver-xorg: Downgrade to use 1.19.6 version
In YP2.8, xserver-xorg was upgraded to 1.20.4. This breaks xserver-xorg congigures: | configure: error: Package requirements (libdrm >= 2.4.89) were not met: | Requested 'libdrm >= 2.4.89' but version of libdrm is 2.4.85 However, Renesas BSP uses libdrm version is 2.4.85. Therefore, let downgrade this version to use 1.19.6. Signed-off-by: Khang Nguyen <khang.nguyen.xw@renesas.com> Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com> Change-Id: I2fbf888cf9acb88943d676506e95f63ad8ac4a50
Diffstat (limited to 'meta-rcar-gen3/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch')
-rw-r--r--meta-rcar-gen3/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/meta-rcar-gen3/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch b/meta-rcar-gen3/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
new file mode 100644
index 0000000..c36e4e7
--- /dev/null
+++ b/meta-rcar-gen3/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
@@ -0,0 +1,25 @@
+This is the revised version of files/macro_tweak.patch for
+xorg-server 1.8.99.904 and newer.
+
+Upstream-Status: Pending
+
+Signed-off-by: Yu Ke <ke.yu@intel.com>
+
+Index: xorg-server-1.19.6/xorg-server.m4
+===================================================================
+--- xorg-server-1.19.6.orig/xorg-server.m4
++++ xorg-server-1.19.6/xorg-server.m4
+@@ -28,10 +28,12 @@ dnl
+ # Checks for the MACRO define in xorg-server.h (from the sdk). If it
+ # is defined, then add the given PROTO to $REQUIRED_MODULES.
+
++m4_pattern_allow(PKG_CONFIG_SYSROOT_DIR)
++
+ AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
+ AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+ SAVE_CFLAGS="$CFLAGS"
+- CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
++ CFLAGS="$CFLAGS -I$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=sdkdir xorg-server`"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include "xorg-server.h"
+ #if !defined $1