diff options
author | Yu Ke <ke.yu@intel.com> | 2011-05-09 16:12:51 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-11 16:43:22 +0100 |
commit | 57d50baa7dc318471d5915c405ccba8032a02249 (patch) | |
tree | 1b3ab1da8f286de410e51df8443537aee66e30c8 /meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/macro_tweak.patch | |
parent | 495c109534b32be107c55864c0818df9387284cf (diff) | |
download | poky-57d50baa7dc318471d5915c405ccba8032a02249.tar.gz |
xserver-xf86-lite: upgrade to from 1.7 RC2 to 1.10.1
- remove the following patches, since they are already in upstream
xserver-xf86-lite/libdri-xinerama-symbol.patch,
xserver-xf86-lite/drmfix.patch
xserver-xf86-lite/nodolt.patch
xserver-xf86-lite/revert_make_sys_c_use_unaligned_access_functions.patch
- rebase the patch for 1.10.1
xserver-xf86-lite/crosscompile.patch
(From OE-Core rev: 057613870f54d1f9a25317e350219d967fcd25ef)
Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/macro_tweak.patch')
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/macro_tweak.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/macro_tweak.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/macro_tweak.patch new file mode 100644 index 0000000000..2b75427129 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/macro_tweak.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | This is the revised version of files/macro_tweak.patch for | ||
2 | xorg-server 1.8.99.904. | ||
3 | |||
4 | the files/macro_tweak.patch can not removed now since it is used by | ||
5 | xserver-kdrive-1.7.99.2 and xserver-xf86-lite_1.7.99.2. Once they | ||
6 | are all upgraded to 1.8.99.904, the the files/macro_tweak.patch | ||
7 | can be safely replace by this patch. | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Yu Ke <ke.yu@intel.com> | ||
12 | |||
13 | diff --git a/xorg-server.m4 b/xorg-server.m4 | ||
14 | index bdecf62..040fdb8 100644 | ||
15 | --- a/xorg-server.m4 | ||
16 | +++ b/xorg-server.m4 | ||
17 | @@ -28,10 +28,12 @@ dnl | ||
18 | # Checks for the $1 define in xorg-server.h (from the sdk). If it | ||
19 | # is defined, then add $1 to $REQUIRED_MODULES. | ||
20 | |||
21 | +m4_pattern_allow(PKG_CONFIG_SYSROOT_DIR) | ||
22 | + | ||
23 | AC_DEFUN([XORG_DRIVER_CHECK_EXT],[ | ||
24 | AC_REQUIRE([PKG_PROG_PKG_CONFIG]) | ||
25 | SAVE_CFLAGS="$CFLAGS" | ||
26 | - CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`" | ||
27 | + CFLAGS="$CFLAGS -I$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=sdkdir xorg-server`" | ||
28 | AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ | ||
29 | #include "xorg-server.h" | ||
30 | #if !defined $1 | ||