summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-09-01 16:49:01 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-09-01 16:49:01 +0100
commitfaec274207810ebb443fe5b51354e6cd7a1541c8 (patch)
treeeba2575cdf1f9b7b83a12a33584d266d7af84bd6
parentd5341fb7968108615da58d127655c8238a3e19b0 (diff)
downloadpoky-faec274207810ebb443fe5b51354e6cd7a1541c8.tar.gz
mesa-dri: Update patch against git
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/packages/mesa/mesa-dri/cross2.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/packages/mesa/mesa-dri/cross2.patch b/meta/packages/mesa/mesa-dri/cross2.patch
index 3c62a469ed..d2147910ae 100644
--- a/meta/packages/mesa/mesa-dri/cross2.patch
+++ b/meta/packages/mesa/mesa-dri/cross2.patch
@@ -1,8 +1,8 @@
1Index: git/configure.ac 1Index: git/configure.ac
2=================================================================== 2===================================================================
3--- git.orig/configure.ac 2009-08-14 16:16:23.000000000 +0100 3--- git.orig/configure.ac 2009-09-01 16:38:26.000000000 +0100
4+++ git/configure.ac 2009-08-14 16:17:27.000000000 +0100 4+++ git/configure.ac 2009-09-01 16:38:47.000000000 +0100
5@@ -268,15 +268,6 @@ 5@@ -269,15 +269,6 @@
6 GLAPI_ASM_SOURCES="" 6 GLAPI_ASM_SOURCES=""
7 AC_MSG_CHECKING([whether to enable assembly]) 7 AC_MSG_CHECKING([whether to enable assembly])
8 test "x$enable_asm" = xno && AC_MSG_RESULT([no]) 8 test "x$enable_asm" = xno && AC_MSG_RESULT([no])
@@ -20,8 +20,8 @@ Index: git/configure.ac
20 case "$host_cpu" in 20 case "$host_cpu" in
21Index: git/src/mesa/x86/Makefile 21Index: git/src/mesa/x86/Makefile
22=================================================================== 22===================================================================
23--- git.orig/src/mesa/x86/Makefile 2009-08-14 16:18:23.000000000 +0100 23--- git.orig/src/mesa/x86/Makefile 2009-09-01 16:40:02.000000000 +0100
24+++ git/src/mesa/x86/Makefile 2009-08-14 16:19:10.000000000 +0100 24+++ git/src/mesa/x86/Makefile 2009-09-01 16:40:13.000000000 +0100
25@@ -14,19 +14,6 @@ 25@@ -14,19 +14,6 @@
26 -I../tnl 26 -I../tnl
27 27
@@ -33,7 +33,7 @@ Index: git/src/mesa/x86/Makefile
33- 33-
34- 34-
35-gen_matypes: gen_matypes.c 35-gen_matypes: gen_matypes.c
36- $(HOST_CC) $(INCLUDE_DIRS) $(HOST_CFLAGS) gen_matypes.c -o gen_matypes 36- $(HOST_CC) $(ARCH_FLAGS) $(INCLUDE_DIRS) $(HOST_CFLAGS) gen_matypes.c -o gen_matypes
37- 37-
38-# need some special rules here, unfortunately 38-# need some special rules here, unfortunately
39-matypes.h: ../main/mtypes.h ../tnl/t_context.h gen_matypes 39-matypes.h: ../main/mtypes.h ../tnl/t_context.h gen_matypes