summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-02-05 12:13:47 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-02-05 12:13:47 +0000
commit8886fa114591a2b0e49c5186799cec4674d06b20 (patch)
treed81b62c31131ca924b3b372b61cd2fb90b1688cf
parent03890f3fc084a12aa9821fe4814a6fb8f13eca0f (diff)
downloadpoky-8886fa114591a2b0e49c5186799cec4674d06b20.tar.gz
xserver-xf86-dri-lite: Update git recipe for latest versions
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/packages/xorg-xserver/xserver-xf86-dri-lite/fix_macros1.patch22
-rw-r--r--meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb13
2 files changed, 30 insertions, 5 deletions
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/fix_macros1.patch b/meta/packages/xorg-xserver/xserver-xf86-dri-lite/fix_macros1.patch
new file mode 100644
index 0000000000..94852f0dea
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite/fix_macros1.patch
@@ -0,0 +1,22 @@
1We need to insert the sysroot path into compiler commandlines for this
2kind of variable use, otherwise we're looking into /usr/include/.
3
4RP - 26/11/09
5
6Index: git/xorg-server.m4
7===================================================================
8--- git.orig/xorg-server.m4 2010-02-05 10:00:55.000000000 +0000
9+++ git/xorg-server.m4 2010-02-05 10:02:12.000000000 +0000
10@@ -28,10 +28,11 @@
11 # Checks for the $1 define in xorg-server.h (from the sdk). If it
12 # is defined, then add $1 to $REQUIRED_MODULES.
13
14+m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$])
15 AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
16 AC_REQUIRE([PKG_PROG_PKG_CONFIG])
17 SAVE_CFLAGS="$CFLAGS"
18- CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
19+ CFLAGS="$CFLAGS -I$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=sdkdir xorg-server`"
20 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
21 #include "xorg-server.h"
22 #if !defined $1
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb
index e039f0ad5d..4789f28f5f 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb
+++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb
@@ -1,11 +1,13 @@
1require xserver-xf86-dri-lite.inc 1require xserver-xf86-dri-lite.inc
2 2
3PE = "1" 3PE = "1"
4PR = "r11" 4PR = "r0"
5PV = "1.6.0+git${SRCPV}" 5PV = "1.7.99+git${SRCPV}"
6 6
7PROTO_DEPS += "xf86driproto dri2proto" 7PROTO_DEPS += "xf86driproto dri2proto"
8 8
9DEPENDS += "font-util"
10
9RDEPENDS_${PN} += "xkeyboard-config" 11RDEPENDS_${PN} += "xkeyboard-config"
10 12
11# file://cache-xkbcomp-output-for-fast-start-up.patch;patch=1 \ 13# file://cache-xkbcomp-output-for-fast-start-up.patch;patch=1 \
@@ -15,10 +17,11 @@ RDEPENDS_${PN} += "xkeyboard-config"
15# file://xserver-DRI2Swapbuffer.patch;patch=1" 17# file://xserver-DRI2Swapbuffer.patch;patch=1"
16 18
17 19
18SRC_URI = "git://anongit.freedesktop.org/git/xorg/xserver;protocol=git;branch=server-1.6-branch \ 20SRC_URI = "git://anongit.freedesktop.org/git/xorg/xserver;protocol=git;branch=master \
19 file://nodolt.patch;patch=1 \ 21 file://nodolt.patch;patch=1 \
20 file://fix_macros.patch;patch=1 \ 22 file://crosscompile.patch;patch=1 \
21 file://libdri-xinerama-symbol.patch;patch=1" 23 file://fix_macros1.patch;patch=1"
24# file://libdri-xinerama-symbol.patch;patch=1"
22 25
23# Misc build failure for master HEAD 26# Misc build failure for master HEAD
24SRC_URI += "file://fix_open_max_preprocessor_error.patch;patch=1" 27SRC_URI += "file://fix_open_max_preprocessor_error.patch;patch=1"