diff options
author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2013-03-11 14:19:28 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-15 01:53:04 +0000 |
commit | 55cbf613423d7e0eb30ad46a027cfac59ed91429 (patch) | |
tree | 845f68dc3cda2ae68ae1493c1e6b74f7de233278 /meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/macro_tweak.patch | |
parent | 31c134bc2c5be925edcb13804f35651a7b325acc (diff) | |
download | poky-55cbf613423d7e0eb30ad46a027cfac59ed91429.tar.gz |
xserver-xorg: upgrade to 1.14.0
Aditionally:
* adjust the aarch64.patch because the logic changed and the
lnx_video.c changes are no longer necessary;
* created patch to fix compilation issue when not using xinerama;
(From OE-Core rev: 1204a04c28546aa131d295fe7791f5de3694ad11)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
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.14.0/macro_tweak.patch')
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/macro_tweak.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/macro_tweak.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/macro_tweak.patch new file mode 100644 index 0000000000..ec0eea6ca2 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/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 | ||