rpms/mesa/F-9 mesa-7.1-link-shared.patch, 1.2, 1.3 mesa-7.1pre-osmesa-version.patch, 1.1, 1.2 mesa.spec, 1.192, 1.193 mesa-7.1-bag-of-fixes.patch, 1.1, NONE mesa-7.1-fda4895d-update.patch, 1.1, NONE mesa-7.1-sparc.patch, 1.1, NONE mesa-r500-support.patch, 1.1, NONE

Dave Airlie (airlied) fedora-extras-commits at redhat.com
Thu Jun 12 03:34:36 UTC 2008 

Author: airlied

Update of /cvs/pkgs/rpms/mesa/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11070

Modified Files:
	mesa-7.1-link-shared.patch mesa-7.1pre-osmesa-version.patch 
	mesa.spec 
Removed Files:
	mesa-7.1-bag-of-fixes.patch mesa-7.1-fda4895d-update.patch 
	mesa-7.1-sparc.patch mesa-r500-support.patch 
Log Message:
* Thu Jun 12 2008 Dave Airlie <airlied at redhat.com> 7.1-0.35
- Update mesa to latest git snapshot - drop patches merged upstream


mesa-7.1-link-shared.patch:

Index: mesa-7.1-link-shared.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/F-9/mesa-7.1-link-shared.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mesa-7.1-link-shared.patch	5 Jun 2008 16:02:44 -0000	1.2
+++ mesa-7.1-link-shared.patch	12 Jun 2008 03:33:40 -0000	1.3
@@ -1,41 +1,6 @@
-diff -up mesa-20080331/src/mesa/x86/read_rgba_span_x86.S.jx mesa-20080331/src/mesa/x86/read_rgba_span_x86.S
---- mesa-20080331/src/mesa/x86/read_rgba_span_x86.S.jx	2008-03-31 16:58:48.000000000 -0400
-+++ mesa-20080331/src/mesa/x86/read_rgba_span_x86.S	2008-04-10 12:11:31.000000000 -0400
-@@ -77,7 +77,6 @@
-  */
- 
- .globl _generic_read_RGBA_span_BGRA8888_REV_MMX
--.hidden _generic_read_RGBA_span_BGRA8888_REV_MMX
- 	.type	_generic_read_RGBA_span_BGRA8888_REV_MMX, @function
- _generic_read_RGBA_span_BGRA8888_REV_MMX:
- 	pushl	%ebx
-@@ -172,7 +171,6 @@ _generic_read_RGBA_span_BGRA8888_REV_MMX
-  */
- 
- .globl _generic_read_RGBA_span_BGRA8888_REV_SSE
--.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE
- 	.type	_generic_read_RGBA_span_BGRA8888_REV_SSE, @function
- _generic_read_RGBA_span_BGRA8888_REV_SSE:
- 	pushl	%esi
-@@ -335,7 +333,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE
- 
- 	.text
- .globl _generic_read_RGBA_span_BGRA8888_REV_SSE2
--.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE2
- 	.type	_generic_read_RGBA_span_BGRA8888_REV_SSE2, @function
- _generic_read_RGBA_span_BGRA8888_REV_SSE2:
- 	pushl	%esi
-@@ -492,7 +489,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE
- 
- 	.text
- 	.globl	_generic_read_RGBA_span_RGB565_MMX
--        .hidden _generic_read_RGBA_span_RGB565_MMX
- 	.type	_generic_read_RGBA_span_RGB565_MMX, @function
- 
- _generic_read_RGBA_span_RGB565_MMX:
-diff -up mesa-20080331/src/mesa/drivers/dri/Makefile.jx mesa-20080331/src/mesa/drivers/dri/Makefile
---- mesa-20080331/src/mesa/drivers/dri/Makefile.jx	2008-03-31 16:58:48.000000000 -0400
-+++ mesa-20080331/src/mesa/drivers/dri/Makefile	2008-04-10 12:02:30.000000000 -0400
+diff -up mesa-20080612/src/mesa/drivers/dri/Makefile.dricore mesa-20080612/src/mesa/drivers/dri/Makefile
+--- mesa-20080612/src/mesa/drivers/dri/Makefile.dricore	2008-06-12 12:06:50.000000000 +1000
++++ mesa-20080612/src/mesa/drivers/dri/Makefile	2008-06-12 13:25:58.000000000 +1000
 @@ -6,12 +6,17 @@ include $(TOP)/configs/current
  
  
@@ -67,19 +32,19 @@
  		fi \
  	done
 +	$(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
-+	$(INSTALL) -m 755 $(TOP)/$(LIB_DIR)/libdricore.so $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
- 	$(TOP)/bin/minstall -d $(DESTDIR)$(INSTALL_DIR)/include/GL/internal
- 	$(TOP)/bin/minstall -m 0644 $(TOP)/include/GL/internal/dri_interface.h $(DESTDIR)$(INSTALL_DIR)/include/GL/internal
- 	$(TOP)/bin/minstall -m 0644 $(TOP)/include/GL/internal/dri_sarea.h $(DESTDIR)$(INSTALL_DIR)/include/GL/internal
++	$(INSTALL) -m 755 -d $(TOP)/$(LIB_DIR)/libdricore.so $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
+ 	$(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GL/internal
+ 	$(INSTALL) -m 0644 $(TOP)/include/GL/internal/dri_interface.h $(DESTDIR)$(INSTALL_DIR)/include/GL/internal
+ 	$(INSTALL) -m 0644 $(TOP)/include/GL/internal/dri_sarea.h $(DESTDIR)$(INSTALL_DIR)/include/GL/internal
 @@ -38,4 +45,5 @@ clean:
  			(cd $$dir && $(MAKE) clean) ; \
  		fi \
  	done
 +	-rm -f libdricore.so $(TOP)/$(LIB_DIR)/libdricore.so
  	-rm -f common/*.o
-diff -up mesa-20080331/src/mesa/drivers/dri/Makefile.template.jx mesa-20080331/src/mesa/drivers/dri/Makefile.template
---- mesa-20080331/src/mesa/drivers/dri/Makefile.template.jx	2008-03-31 16:58:48.000000000 -0400
-+++ mesa-20080331/src/mesa/drivers/dri/Makefile.template	2008-04-10 12:02:30.000000000 -0400
+diff -up mesa-20080612/src/mesa/drivers/dri/Makefile.template.dricore mesa-20080612/src/mesa/drivers/dri/Makefile.template
+--- mesa-20080612/src/mesa/drivers/dri/Makefile.template.dricore	2008-06-12 12:06:50.000000000 +1000
++++ mesa-20080612/src/mesa/drivers/dri/Makefile.template	2008-06-12 13:15:34.000000000 +1000
 @@ -1,6 +1,6 @@
  # -*-makefile-*-
  
@@ -87,8 +52,8 @@
 +MESA_MODULES = $(TOP)/$(LIB_DIR)/libdricore.so
  
  COMMON_SOURCES = \
-         ../../common/driverfuncs.c \
-@@ -70,7 +70,9 @@ default: symlinks depend $(LIBNAME) $(TO
+         ../common/utils.c \
+@@ -69,7 +69,9 @@ default: symlinks depend $(LIBNAME) $(TO
  
  $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
  	$(TOP)/bin/mklib -ldflags '$(LDFLAGS)' -noprefix -o $@ \
@@ -99,3 +64,38 @@
  
  
  $(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME)
+diff -up mesa-20080612/src/mesa/x86/read_rgba_span_x86.S.dricore mesa-20080612/src/mesa/x86/read_rgba_span_x86.S
+--- mesa-20080612/src/mesa/x86/read_rgba_span_x86.S.dricore	2008-06-12 12:06:50.000000000 +1000
++++ mesa-20080612/src/mesa/x86/read_rgba_span_x86.S	2008-06-12 13:15:34.000000000 +1000
+@@ -77,7 +77,6 @@
+  */
+ 
+ .globl _generic_read_RGBA_span_BGRA8888_REV_MMX
+-.hidden _generic_read_RGBA_span_BGRA8888_REV_MMX
+ 	.type	_generic_read_RGBA_span_BGRA8888_REV_MMX, @function
+ _generic_read_RGBA_span_BGRA8888_REV_MMX:
+ 	pushl	%ebx
+@@ -172,7 +171,6 @@ _generic_read_RGBA_span_BGRA8888_REV_MMX
+  */
+ 
+ .globl _generic_read_RGBA_span_BGRA8888_REV_SSE
+-.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE
+ 	.type	_generic_read_RGBA_span_BGRA8888_REV_SSE, @function
+ _generic_read_RGBA_span_BGRA8888_REV_SSE:
+ 	pushl	%esi
+@@ -335,7 +333,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE
+ 
+ 	.text
+ .globl _generic_read_RGBA_span_BGRA8888_REV_SSE2
+-.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE2
+ 	.type	_generic_read_RGBA_span_BGRA8888_REV_SSE2, @function
+ _generic_read_RGBA_span_BGRA8888_REV_SSE2:
+ 	pushl	%esi
+@@ -494,7 +491,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE
+ 
+ 	.text
+ 	.globl	_generic_read_RGBA_span_RGB565_MMX
+-        .hidden _generic_read_RGBA_span_RGB565_MMX
+ 	.type	_generic_read_RGBA_span_RGB565_MMX, @function
+ 
+ _generic_read_RGBA_span_RGB565_MMX:

mesa-7.1pre-osmesa-version.patch:

Index: mesa-7.1pre-osmesa-version.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/F-9/mesa-7.1pre-osmesa-version.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mesa-7.1pre-osmesa-version.patch	1 Nov 2007 06:55:38 -0000	1.1
+++ mesa-7.1pre-osmesa-version.patch	12 Jun 2008 03:33:40 -0000	1.2
@@ -1,39 +1,21 @@
-From 8a156f47fc6547d5ed0fb8031f332cbf9e16948d Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied at redhat.com>
-Date: Thu, 1 Nov 2007 16:16:52 +1000
-Subject: [PATCH] mesa: keep OSMESA version at 6.5.3
-
----
- src/mesa/Makefile |    9 +++++----
- 1 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/src/mesa/Makefile b/src/mesa/Makefile
-index 77bb7be..e2a09ed 100644
---- a/src/mesa/Makefile
-+++ b/src/mesa/Makefile
-@@ -117,17 +117,18 @@ $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS)
- 		$(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(STAND_ALONE_OBJECTS)
- 
- # Make the OSMesa library
-+# Note: version is kept at 6.5.3 to simplify app/linking issues
- $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_DRIVER_OBJECTS) $(OSMESA16_OBJECTS)
- 	@ if [ "${DRIVER_DIRS}" = "osmesa" ] ; then \
- 		$(TOP)/bin/mklib -o $(OSMESA_LIB) -linker '$(CC)' \
--			-ldflags '$(LDFLAGS)' -major $(MESA_MAJOR) \
--			-minor $(MESA_MINOR) -patch $(MESA_TINY) \
-+			-ldflags '$(LDFLAGS)' -major 6 \
-+			-minor 5 -patch 3 \
- 			-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
- 			$(OSMESA_LIB_DEPS) $(OSMESA16_OBJECTS) ; \
- 	else \
- 		$(TOP)/bin/mklib -o $(OSMESA_LIB) -linker '$(CC)' \
--			-ldflags '$(LDFLAGS)' -major $(MESA_MAJOR) \
--			-minor $(MESA_MINOR) -patch $(GL_TINY) \
-+			-ldflags '$(LDFLAGS)' -major 6 \
-+			-minor 5 -patch 3 \
- 			-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
- 			$(OSMESA_LIB_DEPS) $(OSMESA_DRIVER_OBJECTS) ; \
- 	fi
--- 
-1.5.3.4
-
+diff -up mesa-20080612/src/mesa/drivers/osmesa/Makefile.osmesa mesa-20080612/src/mesa/drivers/osmesa/Makefile
+--- mesa-20080612/src/mesa/drivers/osmesa/Makefile.osmesa	2008-06-12 12:17:27.000000000 +1000
++++ mesa-20080612/src/mesa/drivers/osmesa/Makefile	2008-06-12 13:14:24.000000000 +1000
+@@ -47,7 +47,7 @@ osmesa8: $(TOP)/lib/$(OSMESA_LIB_NAME)
+ $(TOP)/lib/$(OSMESA_LIB_NAME): $(OBJECTS)
+ 	$(TOP)/bin/mklib -o $(OSMESA_LIB) \
+ 		-linker "$(CC)" \
+-		-major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
++		-major 6 -minor 5 -patch 3 \
+ 		-install $(TOP)/$(LIB_DIR) \
+ 		$(MKLIB_OPTIONS) \
+ 		$(OSMESA_LIB_DEPS) $(OBJECTS)
+@@ -60,7 +60,7 @@ $(TOP)/lib/$(OSMESA_LIB_NAME): $(OBJECTS
+ osmesa16: $(OBJECTS) $(CORE_MESA)
+ 	$(TOP)/bin/mklib -o $(OSMESA_LIB) \
+ 		-linker "$(CC)" \
+-		-major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
++		-major 6 -minor 5 -patch 3 \
+ 		-install $(TOP)/$(LIB_DIR) \
+ 		$(MKLIB_OPTIONS) \
+ 		$(OSMESA_LIB_DEPS) $(OBJECTS) $(CORE_MESA)


Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/F-9/mesa.spec,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- mesa.spec	5 Jun 2008 16:02:44 -0000	1.192
+++ mesa.spec	12 Jun 2008 03:33:40 -0000	1.193
@@ -10,12 +10,12 @@
 %endif
 
 %define manpages gl-manpages-1.0.1
-%define gitdate 20080415
+%define gitdate 20080612
 
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.1
-Release: 0.34%{?dist}
+Release: 0.35%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -29,18 +29,13 @@
 
 Patch0: mesa-7.1pre-osmesa-version.patch
 Patch2: mesa-7.1pre-nukeglthread-debug.patch
-Patch3: mesa-7.1-fda4895d-update.patch
 
 # This doesn't work, disable for now.
 Patch4: disable-tex-offset.patch
 
 Patch7: mesa-7.1-link-shared.patch
-# lets only build drivers on sparc that are remotely useful
-Patch8: mesa-7.1-sparc.patch
 
-Patch10: mesa-7.1-bag-of-fixes.patch
 Patch12: mesa-7.1-disable-intel-classic-warn.patch
-Patch13: mesa-r500-support.patch
 
 BuildRequires: pkgconfig autoconf automake
 %if %{with_dri}
@@ -166,13 +161,9 @@
 %setup -q -n mesa-%{gitdate} -b2
 %patch0 -p1 -b .osmesa
 %patch2 -p1 -b .intel-glthread
-%patch3 -p1 -b .git-update-fix-intel
 %patch4 -p1 -b .disable-tex-offset
 %patch7 -p1 -b .dricore
-%patch8 -p1
-%patch10 -p1 -b .misc-fixes
 %patch12 -p1 -b .intel-nowarn
-%patch13 -p1 -b .r500
 
 # WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT
 # license and are not open source/free software, so we remove them.
@@ -421,6 +412,9 @@
 %{_libdir}/mesa-demos-data
 
 %changelog
+* Thu Jun 12 2008 Dave Airlie <airlied at redhat.com> 7.1-0.35
+- Update mesa to latest git snapshot - drop patches merged upstream
+
 * Wed Jun 04 2008 Adam Jackson <ajax at redhat.com> 7.1-0.34
 - Link libdricore with gcc instead of ld, so we automagically pick up the
   ld --build-id flags.


--- mesa-7.1-bag-of-fixes.patch DELETED ---


--- mesa-7.1-fda4895d-update.patch DELETED ---


--- mesa-7.1-sparc.patch DELETED ---


--- mesa-r500-support.patch DELETED ---

More information about the fedora-extras-commits mailing list