rpms/mesa/devel .cvsignore, 1.34, 1.35 mesa-7.1-osmesa-version.patch, 1.1, 1.2 mesa-no-mach64.patch, 1.1, 1.2 mesa.spec, 1.244, 1.245 sources, 1.36, 1.37 mesa-7.5-r300-batch-accounting.patch, 1.1, NONE radeon-rewrite-emit1clip.patch, 1.1, NONE radeon-rewrite.patch, 1.19, NONE
Dave Airlie
airlied at fedoraproject.org
Thu Jul 23 02:15:57 UTC 2009
Author: airlied
Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23028
Modified Files:
.cvsignore mesa-7.1-osmesa-version.patch mesa-no-mach64.patch
mesa.spec sources
Removed Files:
mesa-7.5-r300-batch-accounting.patch
radeon-rewrite-emit1clip.patch radeon-rewrite.patch
Log Message:
* Thu Jul 23 2009 Dave Airlie <airlied at redhat.com> 7.6-0.4
- rebase to latest upstream snapshot
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore 22 Mar 2009 02:20:15 -0000 1.34
+++ .cvsignore 23 Jul 2009 02:15:26 -0000 1.35
@@ -3,3 +3,4 @@ xdriinfo-1.0.2.tar.bz2
MesaDemos-7.3.tar.bz2
MesaLib-7.3.tar.bz2
mesa-20090322.tar.bz2
+mesa-20090723.tar.bz2
mesa-7.1-osmesa-version.patch:
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: mesa-7.1-osmesa-version.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/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 23 Jul 2009 02:15:27 -0000 1.2
@@ -10,12 +10,3 @@ diff -up Mesa-7.1/src/mesa/drivers/osmes
-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 \
- -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
- -id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \
- $(OSMESA_LIB_DEPS) $(OBJECTS) $(CORE_MESA)
mesa-no-mach64.patch:
configure.ac | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
Index: mesa-no-mach64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa-no-mach64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mesa-no-mach64.patch 5 Sep 2008 05:48:02 -0000 1.1
+++ mesa-no-mach64.patch 23 Jul 2009 02:15:27 -0000 1.2
@@ -1,45 +1,46 @@
---- configure.ac.mach64 2008-09-05 13:53:24.000000000 +1000
-+++ configure.ac 2008-09-05 13:53:39.000000000 +1000
-@@ -656,7 +656,7 @@
+diff -up mesa-20090723/configure.ac.mach64 mesa-20090723/configure.ac
+--- mesa-20090723/configure.ac.mach64 2009-07-23 12:11:01.000000000 +1000
++++ mesa-20090723/configure.ac 2009-07-23 12:11:22.000000000 +1000
+@@ -713,7 +713,7 @@ if test "$mesa_driver" = dri; then
# because there is no x86-64 system where they could *ever*
# be used.
if test "x$DRI_DIRS" = "xyes"; then
-- DRI_DIRS="i915 i965 mach64 mga r128 r200 r300 radeon \
-+ DRI_DIRS="i915 i965 mga r128 r200 r300 radeon \
+- DRI_DIRS="i915 i965 mach64 mga r128 r200 r300 r600 radeon \
++ DRI_DIRS="i915 i965 mga r128 r200 r300 r600 radeon \
savage tdfx unichrome swrast"
fi
;;
-@@ -664,13 +664,13 @@
+@@ -721,13 +721,13 @@ if test "$mesa_driver" = dri; then
# Build only the drivers for cards that exist on PowerPC.
# At some point MGA will be added, but not yet.
if test "x$DRI_DIRS" = "xyes"; then
-- DRI_DIRS="mach64 r128 r200 r300 radeon tdfx swrast"
-+ DRI_DIRS="r128 r200 r300 radeon tdfx swrast"
+- DRI_DIRS="mach64 r128 r200 r300 r600 radeon tdfx swrast"
++ DRI_DIRS="r128 r200 r300 r600 radeon tdfx swrast"
fi
;;
sparc*)
# Build only the drivers for cards that exist on sparc`
if test "x$DRI_DIRS" = "xyes"; then
-- DRI_DIRS="mach64 r128 r200 r300 radeon ffb swrast"
-+ DRI_DIRS="r128 r200 r300 radeon ffb swrast"
+- DRI_DIRS="mach64 r128 r200 r300 r600 radeon ffb swrast"
++ DRI_DIRS="r128 r200 r300 r600 radeon ffb swrast"
fi
;;
esac
-@@ -689,7 +689,7 @@
+@@ -746,7 +746,7 @@ if test "$mesa_driver" = dri; then
# ffb and gamma are missing because they have not been converted
# to use the new interface.
if test "x$DRI_DIRS" = "xyes"; then
-- DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 radeon tdfx \
-+ DRI_DIRS="i810 i915 i965 mga r128 r200 r300 radeon tdfx \
+- DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon tdfx \
++ DRI_DIRS="i810 i915 i965 mga r128 r200 r300 r600 radeon tdfx \
unichrome savage sis swrast"
fi
;;
-@@ -704,7 +704,7 @@
+@@ -765,7 +765,7 @@ if test "$mesa_driver" = dri; then
# default drivers
if test "x$DRI_DIRS" = "xyes"; then
-- DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v \
-+ DRI_DIRS="i810 i915 i965 mga r128 r200 r300 radeon s3v \
+- DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon s3v \
++ DRI_DIRS="i810 i915 i965 mga r128 r200 r300 r600 radeon s3v \
savage sis tdfx trident unichrome ffb swrast"
fi
Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -p -r1.244 -r1.245
--- mesa.spec 20 Jul 2009 21:08:47 -0000 1.244
+++ mesa.spec 23 Jul 2009 02:15:27 -0000 1.245
@@ -13,7 +13,7 @@
%define manpages gl-manpages-1.0.1
%define xdriinfo xdriinfo-1.0.2
-%define gitdate 20090612
+%define gitdate 20090723
#% define snapshot
%define demodir %{_libdir}/mesa
@@ -166,7 +166,7 @@ This package provides some demo applicat
%setup -q -n mesa-%{gitdate} -b2 -b5
%patch1 -p1 -b .osmesa
%patch2 -p1 -b .intel-glthread
-%patch3 -p0 -b .no-mach64
+%patch3 -p1 -b .no-mach64
%patch7 -p1 -b .dricore
%patch9 -p1 -b .intel-vbl
%patch12 -p1 -b .intel-nowarn
@@ -366,6 +366,9 @@ rm -rf $RPM_BUILD_ROOT
%{demodir}
%changelog
+* Thu Jul 23 2009 Dave Airlie <airlied at redhat.com> 7.6-0.4
+- rebase to latest upstream snapshot
+
* Tue Jun 16 2009 Karsten Hopp <karsten at redhat.com> 7.6-0.3
- some more fixes for s390(x)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- sources 20 Jul 2009 21:08:47 -0000 1.36
+++ sources 23 Jul 2009 02:15:27 -0000 1.37
@@ -1,3 +1,3 @@
6ae05158e678f4594343f32c2ca50515 gl-manpages-1.0.1.tar.bz2
a5ec51ed9f0a55dc3462d90d52ff899c xdriinfo-1.0.2.tar.bz2
-93b7016851831fc31d02103e7d9551b3 mesa-20090612.tar.bz2
+b3547e33cef106021dac5f5ff44e6bc6 mesa-20090723.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