diff options
author | Tom Zanussi <tom.zanussi@intel.com> | 2011-06-01 00:58:20 -0500 |
---|---|---|
committer | Tom Zanussi <tom.zanussi@intel.com> | 2011-06-01 22:20:19 -0500 |
commit | 7c19e43c9c8cbb12bdc8c50d5b3eab6383bd8518 (patch) | |
tree | 535feaca91139b19ff14bbde7fe71810752c9701 /common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch | |
parent | 9902e2fee4b993bf1c689efcc3d16ff53a238afd (diff) | |
download | meta-intel-7c19e43c9c8cbb12bdc8c50d5b3eab6383bd8518.tar.gz |
meta-intel: add xserver-xf86-dri-lite_1.9.3 to common
emgd 1.6 requires xserver 1.9.3, which is no longer in meta, and it
needs to be shared by multiple BSPs, so add it to common.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Acked-by: Darren Hart <dvhart@linux.intel.com>
Diffstat (limited to 'common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch')
-rw-r--r-- | common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch b/common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch new file mode 100644 index 00000000..2b754271 --- /dev/null +++ b/common/recipes-graphics/xorg-xserver/xserver-xf86-dri-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 | ||