rpms/mesa/F-11 .cvsignore, 1.35, 1.36 mesa-7.1-osmesa-version.patch, 1.1, 1.2 mesa.spec, 1.250, 1.251 sources, 1.35, 1.36 mesa-7.5-r300-batch-accounting.patch, 1.1, NONE radeon-rewrite-emit1clip.patch, 1.1, NONE radeon-rewrite.patch, 1.22, NONE

Dave Airlie airlied at fedoraproject.org
Fri Jun 12 04:03:20 UTC 2009


Author: airlied

Update of /cvs/pkgs/rpms/mesa/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18764

Modified Files:
	.cvsignore mesa-7.1-osmesa-version.patch mesa.spec sources 
Removed Files:
	mesa-7.5-r300-batch-accounting.patch 
	radeon-rewrite-emit1clip.patch radeon-rewrite.patch 
Log Message:
* Fri Jun 12 2009 Dave Airlie <airlied at redhat.com> 7.6-0.1
- rebase mesa to latest git snapshot - fixes a lot of radeon issues



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/F-11/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- .cvsignore	28 Apr 2009 04:57:52 -0000	1.35
+++ .cvsignore	12 Jun 2009 04:02:49 -0000	1.36
@@ -4,3 +4,4 @@ MesaDemos-7.3.tar.bz2
 MesaLib-7.3.tar.bz2
 mesa-20090322.tar.bz2
 mesa-20090428.tar.bz2
+mesa-20090612.tar.bz2

mesa-7.1-osmesa-version.patch:

Index: mesa-7.1-osmesa-version.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/F-11/mesa-7.1-osmesa-version.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mesa-7.1-osmesa-version.patch	5 Sep 2008 05:48:02 -0000	1.1
+++ mesa-7.1-osmesa-version.patch	12 Jun 2009 04:02:49 -0000	1.2
@@ -1,21 +1,12 @@
-diff -up Mesa-7.1/src/mesa/drivers/osmesa/Makefile.jx Mesa-7.1/src/mesa/drivers/osmesa/Makefile
---- Mesa-7.1/src/mesa/drivers/osmesa/Makefile.jx	2008-08-28 14:05:47.000000000 -0400
-+++ Mesa-7.1/src/mesa/drivers/osmesa/Makefile	2008-08-28 14:07:13.000000000 -0400
-@@ -46,7 +46,7 @@ osmesa8: $(TOP)/lib/$(OSMESA_LIB_NAME)
- 
- $(TOP)/lib/$(OSMESA_LIB_NAME): $(OBJECTS)
+diff -up mesa-20090612/src/mesa/drivers/osmesa/Makefile.dma mesa-20090612/src/mesa/drivers/osmesa/Makefile
+--- mesa-20090612/src/mesa/drivers/osmesa/Makefile.dma	2009-06-12 13:57:29.000000000 +1000
++++ mesa-20090612/src/mesa/drivers/osmesa/Makefile	2009-06-12 13:57:42.000000000 +1000
+@@ -39,7 +39,7 @@ default: $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_
+ # -DCHAN_BITS=16/32.
+ $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OBJECTS) $(CORE_MESA)
  	$(MKLIB) -o $(OSMESA_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
 -		-major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
-+		-major 6 -minor 5 -patch 3 \
- 		-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
- 		-id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \
- 		$(OSMESA_LIB_DEPS) $(OBJECTS)
-@@ -58,7 +58,7 @@ $(TOP)/lib/$(OSMESA_LIB_NAME): $(OBJECTS
- # with all the other Mesa sources (compiled with -DCHAN_BITS=16/32
- osmesa16: $(OBJECTS) $(CORE_MESA)
- 	$(MKLIB) -o $(OSMESA_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
--		-major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
-+		-major 6 -minor 5 -patch 3 \
++		-major 6 -minor 5 -patch 4 \
  		-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
  		-id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \
  		$(OSMESA_LIB_DEPS) $(OBJECTS) $(CORE_MESA)


Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/F-11/mesa.spec,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -p -r1.250 -r1.251
--- mesa.spec	11 Jun 2009 20:31:23 -0000	1.250
+++ mesa.spec	12 Jun 2009 04:02:49 -0000	1.251
@@ -14,15 +14,15 @@
 
 %define manpages gl-manpages-1.0.1
 %define xdriinfo xdriinfo-1.0.2
-%define gitdate 20090428
+%define gitdate 20090612
 #% define snapshot 
 
 %define demodir %{_libdir}/mesa
 
 Summary: Mesa graphics libraries
 Name: mesa
-Version: 7.5
-Release: 0.16%{?dist}
+Version: 7.6
+Release: 0.1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -42,17 +42,12 @@ Patch1: mesa-7.1-osmesa-version.patch
 Patch2: mesa-7.1-nukeglthread-debug.patch
 Patch3: mesa-no-mach64.patch
 
-Patch6: radeon-rewrite.patch
-
 Patch7: mesa-7.1-link-shared.patch
 Patch9: intel-revert-vbl.patch
 
 Patch12: mesa-7.1-disable-intel-classic-warn.patch
 Patch13: mesa-7.5-sparc64.patch
 
-Patch15: radeon-rewrite-emit1clip.patch
-Patch16: mesa-7.5-r300-batch-accounting.patch
-
 BuildRequires: pkgconfig autoconf automake
 %if %{with_dri}
 BuildRequires: libdrm-devel >= 2.4.5-1
@@ -175,13 +170,10 @@ This package provides some demo applicat
 %patch1 -p1 -b .osmesa
 %patch2 -p1 -b .intel-glthread
 %patch3 -p0 -b .no-mach64
-%patch6 -p1 -b .radeon-rewrite
 %patch7 -p1 -b .dricore
 %patch9 -p1 -b .intel-vbl
 %patch12 -p1 -b .intel-nowarn
 %patch13 -p1 -b .sparc64
-%patch15 -p1 -b .fix-clip
-%patch16 -p1 -b .r300-accounting
 
 # Hack the demos to use installed data files
 sed -i 's,../images,%{_libdir}/mesa,' progs/demos/*.c
@@ -382,6 +374,9 @@ rm -rf $RPM_BUILD_ROOT
 %{demodir}
 
 %changelog
+* Fri Jun 12 2009 Dave Airlie <airlied at redhat.com> 7.6-0.1
+- rebase mesa to latest git snapshot - fixes a lot of radeon issues
+
 * Thu Jun 11 2009 Adam Jackson <ajax at redhat.com> 7.5-0.16
 - Install demos to %%{_libdir}/mesa
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/F-11/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	28 Apr 2009 04:57:52 -0000	1.35
+++ sources	12 Jun 2009 04:02:50 -0000	1.36
@@ -1,3 +1,3 @@
 6ae05158e678f4594343f32c2ca50515  gl-manpages-1.0.1.tar.bz2
 a5ec51ed9f0a55dc3462d90d52ff899c  xdriinfo-1.0.2.tar.bz2
-d7ff7c44fe42f2639845a2975804792d  mesa-20090428.tar.bz2
+93b7016851831fc31d02103e7d9551b3  mesa-20090612.tar.bz2


--- mesa-7.5-r300-batch-accounting.patch DELETED ---


--- radeon-rewrite-emit1clip.patch DELETED ---


--- radeon-rewrite.patch DELETED ---




More information about the fedora-extras-commits mailing list