[mesa/f14/master] - update to latest 7.9 prelease snapshot

Dave Airlie airlied at fedoraproject.org
Tue Sep 21 22:55:53 UTC 2010


commit e0c4a82815ae00565ff06f5be4c5e50f92dd0c87
Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Sep 22 08:54:58 2010 +1000

    - update to latest 7.9 prelease snapshot

 mesa-7.1-osmesa-version.patch |   18 +++++++++---------
 mesa.spec                     |    7 +++++--
 sources                       |    2 +-
 3 files changed, 15 insertions(+), 12 deletions(-)
---
diff --git a/mesa-7.1-osmesa-version.patch b/mesa-7.1-osmesa-version.patch
index 177c0c3..f67c1e0 100644
--- a/mesa-7.1-osmesa-version.patch
+++ b/mesa-7.1-osmesa-version.patch
@@ -1,12 +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)
- 	$(MKLIB) -o $(OSMESA_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
+diff -up mesa-20100922/src/mesa/drivers/osmesa/Makefile.osmesa mesa-20100922/src/mesa/drivers/osmesa/Makefile
+--- mesa-20100922/src/mesa/drivers/osmesa/Makefile.osmesa	2010-09-22 06:58:24.000000000 +1000
++++ mesa-20100922/src/mesa/drivers/osmesa/Makefile	2010-09-22 08:30:40.000000000 +1000
+@@ -37,7 +37,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 '$(CXX)' -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) -cplusplus $(MKLIB_OPTIONS) \
  		-id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \
- 		$(OSMESA_LIB_DEPS) $(OBJECTS)
+ 		$(OSMESA_LIB_DEPS) $(OBJECTS) $(CORE_MESA)
diff --git a/mesa.spec b/mesa.spec
index 6323e55..5c0dc6f 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -13,7 +13,7 @@
 
 %define manpages gl-manpages-1.0.1
 %define xdriinfo xdriinfo-1.0.3
-%define gitdate 20100720
+%define gitdate 20100922
 %define demosgitdate 20100529
 #% define snapshot 
 
@@ -23,7 +23,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.9
-Release: 0.6%{?dist}
+Release: 0.7%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -429,6 +429,9 @@ rm -rf $RPM_BUILD_ROOT
 %{demodir}
 
 %changelog
+* Wed Sep 22 2010 Dave Airlie <airlied at redhat.com> 7.9-0.7
+- update to latest 7.9 prelease snapshot
+
 * Tue Jul 20 2010 Dave Airlie <airlied at redhat.com> 7.9-0.6
 - snapshot latest git
 
diff --git a/sources b/sources
index 706de97..4869790 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6ae05158e678f4594343f32c2ca50515  gl-manpages-1.0.1.tar.bz2
 cb304d1ce562ac48b68eedeba38c662f  xdriinfo-1.0.3.tar.bz2
 b4d32564ccc411bbfcfe657f42d3632d  mesa-demos-20100529.tar.bz2
-339f8241ef63673469fcbb05de10ed84  mesa-20100720.tar.bz2
+ef60a12e54eef48b4a07db18e07bf04a  mesa-20100922.tar.bz2


More information about the scm-commits mailing list