diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2011-10-07 16:37:10 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-11 18:08:31 +0100 |
commit | c09f0eb561a53b97a769dd0744076af7d904eafb (patch) | |
tree | ffdea22503027c6939e08c4e6ebc60b1c1346103 /meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/macro_tweak.patch | |
parent | 359006159996f95aaa7e53279229d72e161514bd (diff) | |
download | poky-c09f0eb561a53b97a769dd0744076af7d904eafb.tar.gz |
xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite
* xserver-xorg is closer to upstream naming and
that's how it's named in OE-classic and meta-oe? It would make meta-oe
transition easier and better to do it now then convert meta-oe to
xserver-xf86 and then rename it back later.
(From OE-Core rev: 0b31c7200a368533df970f0efeb81e2e20c73593)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/macro_tweak.patch')
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/macro_tweak.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/macro_tweak.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/macro_tweak.patch new file mode 100644 index 0000000000..2b32d4e48d --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-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-xorg(-lite). 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 | ||