diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2017-11-21 14:55:12 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2017-12-20 17:08:43 +0100 |
| commit | 3b9027d4f0fcc07200d31fe8f53c0a38d8f24f0d (patch) | |
| tree | 4327ff44365f156064f661bc99e3a5b14d132cd1 /jetson-tk1/recipes-graphics/xorg-xserver/xserver-xorg | |
| parent | 5afad2df8e72c1075c2fedd49fd95a904ec27fd4 (diff) | |
xerver-xorg: update to 1.17.4
Based on 1.17.2 from meta-jetson-tk1. Dropped patch no longer applicable.
Also make sure that 1.17.2 is not choosen for any machine due to the
higher layer priority of meta-jetson-tk1.
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'jetson-tk1/recipes-graphics/xorg-xserver/xserver-xorg')
| -rwxr-xr-x | jetson-tk1/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/jetson-tk1/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch b/jetson-tk1/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch new file mode 100755 index 0000000..ec0eea6 --- /dev/null +++ b/jetson-tk1/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> + +diff --git a/xorg-server.m4 b/xorg-server.m4 +index bdecf62..040fdb8 100644 +--- a/xorg-server.m4 ++++ b/xorg-server.m4 +@@ -28,10 +28,12 @@ dnl + # Checks for the $1 define in xorg-server.h (from the sdk). If it + # is defined, then add $1 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 |