diff options
author | Saul Wold <sgw@linux.intel.com> | 2011-11-30 21:12:30 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-01 10:50:08 +0000 |
commit | a7ca3b42756f9467fde3f1c7e7a5827b92b80c05 (patch) | |
tree | b989fd2b3405f1e3135ffae91a05858b27b49095 /meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/macro_tweak.patch | |
parent | d7cd934376ae1edaf7055ec635eb3c85fdbf58b3 (diff) | |
download | poky-a7ca3b42756f9467fde3f1c7e7a5827b92b80c05.tar.gz |
xserver-xorg*: Update to 1.11.2
(From OE-Core rev: e2a427ef463b2892c17d0007619eb6b08a050414)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/macro_tweak.patch')
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/macro_tweak.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/macro_tweak.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/macro_tweak.patch new file mode 100644 index 0000000000..ec0eea6ca2 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/macro_tweak.patch | |||
@@ -0,0 +1,25 @@ | |||
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 | diff --git a/xorg-server.m4 b/xorg-server.m4 | ||
9 | index bdecf62..040fdb8 100644 | ||
10 | --- a/xorg-server.m4 | ||
11 | +++ b/xorg-server.m4 | ||
12 | @@ -28,10 +28,12 @@ dnl | ||
13 | # Checks for the $1 define in xorg-server.h (from the sdk). If it | ||
14 | # is defined, then add $1 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 | ||