From d9dfbf4e1295d5fc6f7233ae774a78633e887ded Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Wed, 5 Nov 2008 00:03:56 +0000
Subject: xserver-x86: Fix m4 autoconf macro

---
 meta/packages/xorg-xserver/files/macro_tweak.patch     | 18 ++++++++++++++++++
 meta/packages/xorg-xserver/xserver-xf86-common.inc     |  9 +--------
 .../xorg-xserver/xserver-xf86-dri-lite_1.5.0.bb        |  2 +-
 .../packages/xorg-xserver/xserver-xf86-dri-lite_git.bb |  2 +-
 .../xorg-xserver/xserver-xf86-dri2-lite_git.bb         |  2 +-
 meta/packages/xorg-xserver/xserver-xf86-lite_1.5.0.bb  |  2 +-
 6 files changed, 23 insertions(+), 12 deletions(-)
 create mode 100644 meta/packages/xorg-xserver/files/macro_tweak.patch

(limited to 'meta')

diff --git a/meta/packages/xorg-xserver/files/macro_tweak.patch b/meta/packages/xorg-xserver/files/macro_tweak.patch
new file mode 100644
index 000000000..6998adffe
--- /dev/null
+++ b/meta/packages/xorg-xserver/files/macro_tweak.patch
@@ -0,0 +1,18 @@
+Index: xorg-server-1.5.0/xorg-server.m4
+===================================================================
+--- xorg-server-1.5.0.orig/xorg-server.m4	2007-05-29 20:36:51.000000000 +0100
++++ xorg-server-1.5.0/xorg-server.m4	2008-11-04 23:56:55.000000000 +0000
+@@ -28,9 +28,12 @@
+ # 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],[
++	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
diff --git a/meta/packages/xorg-xserver/xserver-xf86-common.inc b/meta/packages/xorg-xserver/xserver-xf86-common.inc
index 17d88bb17..d31e97a0e 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-common.inc
+++ b/meta/packages/xorg-xserver/xserver-xf86-common.inc
@@ -31,14 +31,7 @@ FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \
 
 CONFFILES_${PN} += "${sysconfdir}/X11/xorg.conf"
 
-# xorg-server.m4 contains a macro used by the xf86-*-* drivers to check for
-# server extensions. The problem is that it modifies CFLAGS during the drivers
-# ./configure with -I`pkg-config --variable=sdkdir xorg-server` and the sdkdir
-# variable doesn't point into the staging area and so causes
-# "CROSS COMPILE Badness" warnings.
-do_configure_prepend () {
-        sed -i "s|\`pkg-config --variable=sdkdir xorg-server\`|${STAGING_DIR}/${HOST_SYS}/\`pkg-config --variable=sdkdir xorg-server\`|" xorg-server.m4
-}
+SRC_URI += "file://macro_tweak.patch;patch=1"
 
 do_stage() {
 	autotools_stage_all
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.5.0.bb b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.5.0.bb
index c9bd3f9fb..6144f755d 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.5.0.bb
+++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.5.0.bb
@@ -1,7 +1,7 @@
 require xserver-xf86-dri-lite.inc
 
 PE = "1"
-PR = "r3"
+PR = "r4"
 
 PROTO_DEPS += "xf86driproto"
 
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 e8706903b..1d5c21868 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb
+++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb
@@ -1,7 +1,7 @@
 require xserver-xf86-dri-lite.inc
 
 PE = "1"
-PR = "r3"
+PR = "r4"
 PV = "1.5.99.1+git${SRCREV}"
 
 PROTO_DEPS += "xf86driproto"
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri2-lite_git.bb b/meta/packages/xorg-xserver/xserver-xf86-dri2-lite_git.bb
index 694979a22..029efa383 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-dri2-lite_git.bb
+++ b/meta/packages/xorg-xserver/xserver-xf86-dri2-lite_git.bb
@@ -1,6 +1,6 @@
 require xserver-xf86-dri-lite.inc
 
-PR = "r0"
+PR = "r1"
 PV = "1.5.99.1+git${SRCREV}"
 
 PROTO_DEPS += "dri2proto"
diff --git a/meta/packages/xorg-xserver/xserver-xf86-lite_1.5.0.bb b/meta/packages/xorg-xserver/xserver-xf86-lite_1.5.0.bb
index d16e7b085..15e7763db 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-lite_1.5.0.bb
+++ b/meta/packages/xorg-xserver/xserver-xf86-lite_1.5.0.bb
@@ -1,6 +1,6 @@
 require xserver-xf86-lite.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI += "file://drmfix.patch;patch=1 \
             file://libdri-xinerama-symbol.patch;patch=1 "
-- 
cgit v1.2.3