rpms/mesa/devel mesa-7.1pre-osmesa-version.patch, 1.2, 1.3 mesa.spec, 1.189, 1.190

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10051

Modified Files:
	mesa-7.1pre-osmesa-version.patch mesa.spec 
Log Message:
* Thu Aug 28 2008 Dave Airlie <airlied at redhat.com> 7.1-0.38
- latest Mesa snapshot - re-enable tex offset
- add r300 command buffer support on top of snapshot
- fix mesa build on intel driver


mesa-7.1pre-osmesa-version.patch:

Index: mesa-7.1pre-osmesa-version.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa-7.1pre-osmesa-version.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mesa-7.1pre-osmesa-version.patch	2 Jul 2008 12:35:05 -0000	1.2
+++ mesa-7.1pre-osmesa-version.patch	28 Aug 2008 12:36:35 -0000	1.3
@@ -1,21 +1,21 @@
-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)
+diff -up mesa-20080814/src/mesa/drivers/osmesa/Makefile.osmesa mesa-20080814/src/mesa/drivers/osmesa/Makefile
+--- mesa-20080814/src/mesa/drivers/osmesa/Makefile.osmesa	2008-08-28 22:33:46.000000000 +1000
++++ mesa-20080814/src/mesa/drivers/osmesa/Makefile	2008-08-28 22:34:06.000000000 +1000
+@@ -46,7 +46,7 @@ osmesa8: $(TOP)/lib/$(OSMESA_LIB_NAME)
+ 
  $(TOP)/lib/$(OSMESA_LIB_NAME): $(OBJECTS)
- 	$(TOP)/bin/mklib -o $(OSMESA_LIB) \
- 		-linker "$(CC)" \
+ 	$(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) \
+ 		-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
+ 		-id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \
  		$(OSMESA_LIB_DEPS) $(OBJECTS)
-@@ -60,7 +60,7 @@ $(TOP)/lib/$(OSMESA_LIB_NAME): $(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)
- 	$(TOP)/bin/mklib -o $(OSMESA_LIB) \
- 		-linker "$(CC)" \
+ 	$(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) \
+ 		-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/devel/mesa.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- mesa.spec	28 Aug 2008 12:32:42 -0000	1.189
+++ mesa.spec	28 Aug 2008 12:36:35 -0000	1.190
@@ -163,7 +163,7 @@
 %prep
 #%setup -q -n Mesa-%{version}pre -b1 -b2
 %setup -q -n mesa-%{gitdate} -b2
-#patch0 -p1 -b .osmesa
+%patch0 -p1 -b .osmesa
 %patch1 -p1 -b .fixes
 %patch2 -p1 -b .intel-glthread
 %patch5 -p1 -b .r300cmdbuf
@@ -402,10 +402,9 @@
 %{_libdir}/mesa-demos-data
 
 %changelog
-* Thu Aug 14 2008 Dave Airlie <airlied at redhat.com> 7.1-0.38
+* Thu Aug 28 2008 Dave Airlie <airlied at redhat.com> 7.1-0.38
 - latest Mesa snapshot - re-enable tex offset
 - add r300 command buffer support on top of snapshot
-- disable osmesa version patch -- (ajax???)
 - fix mesa build on intel driver
 
 * Fri Jun 27 2008 Adam Jackson <ajax at redhat.com> 7.1-0.37