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:33:54 +0100 |
| commit | 057613870f54d1f9a25317e350219d967fcd25ef (patch) | |
| tree | 39772cf3e8067303086cd53a639dceae6570df27 /meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/macro_tweak.patch | |
| parent | 642f7199c2a5221a45be25b4aa008fde25a5c07a (diff) | |
| download | openembedded-core-057613870f54d1f9a25317e350219d967fcd25ef.tar.gz openembedded-core-057613870f54d1f9a25317e350219d967fcd25ef.tar.bz2 openembedded-core-057613870f54d1f9a25317e350219d967fcd25ef.tar.xz openembedded-core-057613870f54d1f9a25317e350219d967fcd25ef.zip | |
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
Signed-off-by: Yu Ke <ke.yu@intel.com>
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 000000000..2b7542712 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/macro_tweak.patch @@ -0,0 +1,30 @@ +This is the revised version of files/macro_tweak.patch for +xorg-server 1.8.99.904. + +the files/macro_tweak.patch can not removed now since it is used by +xserver-kdrive-1.7.99.2 and xserver-xf86-lite_1.7.99.2. Once they +are all upgraded to 1.8.99.904, the the files/macro_tweak.patch +can be safely replace by this patch. + +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 |