xserver-x86: Fix m4 autoconf macro

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

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
+SRC_URI += "file://macro_tweak.patch;patch=1"
-# 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
-}
 
 do_stage() {
 	autotools_stage_all

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"
 

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"

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"

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 "