From 3f27fdaf59dfbeb29649effec62b140fbf278e03 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 27 Nov 2009 00:10:24 +0000 Subject: xserver-xf86-dri-lite: Add m4_pattern_allow Signed-off-by: Richard Purdie --- .../packages/xorg-xserver/xserver-xf86-dri-lite/fix_macros.patch | 9 ++++++--- meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/fix_macros.patch b/meta/packages/xorg-xserver/xserver-xf86-dri-lite/fix_macros.patch index 1cdbdeceb..eed491b4d 100644 --- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/fix_macros.patch +++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite/fix_macros.patch @@ -5,10 +5,13 @@ RP - 26/11/09 Index: git/xorg-server.m4 =================================================================== ---- git.orig/xorg-server.m4 2009-11-26 23:11:03.000000000 +0000 -+++ git/xorg-server.m4 2009-11-26 23:12:28.000000000 +0000 -@@ -30,7 +30,7 @@ +--- git.orig/xorg-server.m4 2009-11-10 12:04:34.000000000 +0000 ++++ git/xorg-server.m4 2009-11-27 00:05:02.000000000 +0000 +@@ -28,9 +28,10 @@ + # 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],[ SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`" 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 2f8136d53..e039f0ad5 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 = "r10" +PR = "r11" PV = "1.6.0+git${SRCPV}" PROTO_DEPS += "xf86driproto dri2proto" -- cgit v1.2.3