xserver-xorg-1.4: add a workaround to xorg-xserver.m4

* stops cross compiling badness during xorg drivers do_configure:
  `pkg-config --variable=sdkdir xorg-server` does not prepent sysroot,
  so use `pkg-config --cflags xorg-server` instead.

diff --git a/packages/xorg-xserver/files/sysroot_fix.patch b/packages/xorg-xserver/files/sysroot_fix.patch
new file mode 100644 (file)
index 0000000..59753d5
--- /dev/null
+++ b/packages/xorg-xserver/files/sysroot_fix.patch
@@ -0,0 +1,13 @@
+Index: xorg-server-1.4/xorg-server.m4
+===================================================================
+--- xorg-server-1.4.orig/xorg-server.m4        2008-03-15 20:09:36.000000000 +0100
++++ xorg-server-1.4/xorg-server.m4     2008-03-15 20:09:51.000000000 +0100
+@@ -30,7 +30,7 @@
+ 
+ AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
+       SAVE_CFLAGS="$CFLAGS"
+-      CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`"
++      CFLAGS="$CFLAGS `pkg-config --cflags xorg-server`"
+       AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include "xorg-server.h"
+ #if !defined $1

diff --git a/packages/xorg-xserver/xserver-xorg_1.4.bb b/packages/xorg-xserver/xserver-xorg_1.4.bb
index b89be01..ee84cac 100644 (file)
--- a/packages/xorg-xserver/xserver-xorg_1.4.bb
+++ b/packages/xorg-xserver/xserver-xorg_1.4.bb
@@ -3,9 +3,11 @@ require xorg-xserver-common.inc
 DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman"
 PE = "1"
+PR = "r1"
 
 SRC_URI += "file://drmfix.patch;patch=1 \
-            file://pkgconfig_fix.patch;patch=1"
+            file://pkgconfig_fix.patch;patch=1 \
+            file://sysroot_fix.patch;patch=1"
 
 MESA_VER = "7.0.2"