diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2009-11-27 00:10:24 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-11-27 00:10:24 +0000 |
commit | 3f27fdaf59dfbeb29649effec62b140fbf278e03 (patch) | |
tree | cf8f68125fe75335053067ae8d6f5b4505063dcf | |
parent | 441446c6cbbceef25ad3d435bc9780213f28168d (diff) | |
download | poky-3f27fdaf59dfbeb29649effec62b140fbf278e03.tar.gz |
xserver-xf86-dri-lite: Add m4_pattern_allow
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r-- | meta/packages/xorg-xserver/xserver-xf86-dri-lite/fix_macros.patch | 9 | ||||
-rw-r--r-- | 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 1cdbdecebf..eed491b4d9 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 | |||
5 | 5 | ||
6 | Index: git/xorg-server.m4 | 6 | Index: git/xorg-server.m4 |
7 | =================================================================== | 7 | =================================================================== |
8 | --- git.orig/xorg-server.m4 2009-11-26 23:11:03.000000000 +0000 | 8 | --- git.orig/xorg-server.m4 2009-11-10 12:04:34.000000000 +0000 |
9 | +++ git/xorg-server.m4 2009-11-26 23:12:28.000000000 +0000 | 9 | +++ git/xorg-server.m4 2009-11-27 00:05:02.000000000 +0000 |
10 | @@ -30,7 +30,7 @@ | 10 | @@ -28,9 +28,10 @@ |
11 | # Checks for the $1 define in xorg-server.h (from the sdk). If it | ||
12 | # is defined, then add $1 to $REQUIRED_MODULES. | ||
11 | 13 | ||
14 | +m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$]) | ||
12 | AC_DEFUN([XORG_DRIVER_CHECK_EXT],[ | 15 | AC_DEFUN([XORG_DRIVER_CHECK_EXT],[ |
13 | SAVE_CFLAGS="$CFLAGS" | 16 | SAVE_CFLAGS="$CFLAGS" |
14 | - CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`" | 17 | - 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 2f8136d535..e039f0ad5d 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 @@ | |||
1 | require xserver-xf86-dri-lite.inc | 1 | require xserver-xf86-dri-lite.inc |
2 | 2 | ||
3 | PE = "1" | 3 | PE = "1" |
4 | PR = "r10" | 4 | PR = "r11" |
5 | PV = "1.6.0+git${SRCPV}" | 5 | PV = "1.6.0+git${SRCPV}" |
6 | 6 | ||
7 | PROTO_DEPS += "xf86driproto dri2proto" | 7 | PROTO_DEPS += "xf86driproto dri2proto" |