Merge ssh://gitserver@git.pokylinux.org/poky

5 files changed, 1 insertions, 54 deletions

diff --git a/meta/packages/mesa/mesa-7.0.2/fix-host-compile.patch b/meta/packages/mesa/mesa-7.0.2/fix-host-compile.patch
deleted file mode 100644
index d24d03d37..000000000
--- a/meta/packages/mesa/mesa-7.0.2/fix-host-compile.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- /src/mesa/x86/orig-Makefile	2005-07-01 04:54:38.000000000 +0300
-+++ /src/mesa/x86/Makefile	2007-06-07 21:52:31.000000000 +0300
-@@ -5,6 +5,7 @@
- 
- 
- INCLUDE_DIRS = \
-+        -I/usr/include \
- 	-I$(TOP)/include/GL \
- 	-I$(TOP)/include \
- 	-I.. \
-@@ -13,6 +14,10 @@
- 	-I../glapi \
- 	-I../tnl
- 
-+OPT_FLAGS_host = -fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os
-+
-+CFLAGS_host = -Wall -Wmissing-prototypes $(OPT_FLAGS_host) $(PIC_FLAGS) $(ARCH_FLAGS) \
-+        $(DEFINES) $(ASM_FLAGS) $(X11_INCLUDES) -std=c99 -ffast-math
- 
- default: gen_matypes matypes.h
- 
-@@ -21,7 +26,7 @@
- 
- 
- gen_matypes: gen_matypes.c
--	$(CC) $(INCLUDE_DIRS) $(CFLAGS) gen_matypes.c -o gen_matypes
-+	$(CC) $(INCLUDE_DIRS) $(CFLAGS_host) gen_matypes.c -o gen_matypes
- 
- # need some special rules here, unfortunately
- matypes.h: ../main/mtypes.h ../tnl/t_context.h gen_matypes
diff --git a/meta/packages/mesa/mesa-7.0.2/mklib-rpath-link.patch b/meta/packages/mesa/mesa-7.0.2/mklib-rpath-link.patch
deleted file mode 100644
index 618f5b57e..000000000
--- a/meta/packages/mesa/mesa-7.0.2/mklib-rpath-link.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- /tmp/mklib	2007-12-08 11:03:23.000000000 +0100
-+++ Mesa-7.0.2/bin/mklib	2007-12-08 11:04:02.509863000 +0100
-@@ -106,6 +106,9 @@
- 	-L*)
- 	    DEPS="$DEPS $1"
- 	    ;;
-+        -Wl*)
-+            DEPS="$DEPS $1"
-+            ;;
- 	-pthread)
- 	    # this is a special case (see bugzilla 10876)
- 	    DEPS="$DEPS $1"
---- /tmp/default	2007-12-08 11:04:17.000000000 +0100
-+++ Mesa-7.0.2/configs/default	2007-12-08 11:05:06.279863000 +0100
-@@ -76,7 +76,7 @@
- GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11
- 
- # Program dependencies - specific GL/glut libraries added in Makefiles
--APP_LIB_DEPS = -lm
-+APP_LIB_DEPS = $(EXTRA_LIB_PATH) -lm
- 
- 
- 
diff --git a/meta/packages/mesa/mesa-dri_7.2.bb b/meta/packages/mesa/mesa-dri_7.4.bb
index 43e4cb552..43e4cb552 100644
--- a/meta/packages/mesa/mesa-dri_7.2.bb
+++ b/meta/packages/mesa/mesa-dri_7.4.bb
diff --git a/meta/packages/mesa/mesa-dri_git.bb b/meta/packages/mesa/mesa-dri_git.bb
index e565ac536..2608e226b 100644
--- a/meta/packages/mesa/mesa-dri_git.bb
+++ b/meta/packages/mesa/mesa-dri_git.bb
@@ -14,7 +14,7 @@ DEFAULT_PREFERENCE = "-1"
 # Netbooks have DRI support so use mesa-dri by default
 DEFAULT_PREFERENCE_netbook = "1"
 
-SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git;branch=intel-2008-q3 "
+SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git;branch=master"
 S = "${WORKDIR}/git"
 
 PACKAGES =+ "${PN}-xprogs"
diff --git a/meta/packages/mesa/mesa-xlib_7.2.bb b/meta/packages/mesa/mesa-xlib_7.4.bb
index 069446904..069446904 100644
--- a/meta/packages/mesa/mesa-xlib_7.2.bb
+++ b/meta/packages/mesa/mesa-xlib_7.4.bb