rpms/mesa/devel .cvsignore, 1.39, 1.40 mesa-7.1-link-shared.patch, 1.4, 1.5 mesa-no-mach64.patch, 1.2, 1.3 mesa.spec, 1.256, 1.257 sources, 1.42, 1.43 mesa-7.5-sparc64.patch, 1.1, NONE r600-fix-tfp.patch, 1.1, NONE
Dave Airlie
airlied at fedoraproject.org
Sun Dec 20 22:50:28 UTC 2009
Author: airlied
Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11717
Modified Files:
.cvsignore mesa-7.1-link-shared.patch mesa-no-mach64.patch
mesa.spec sources
Removed Files:
mesa-7.5-sparc64.patch r600-fix-tfp.patch
Log Message:
* Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 7.8-0.1
- resnapshot from upstream for libdrm_radeon changes
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- .cvsignore 19 Oct 2009 22:32:52 -0000 1.39
+++ .cvsignore 20 Dec 2009 22:50:28 -0000 1.40
@@ -8,3 +8,4 @@ mesa-20090813.tar.bz2
mesa-20090909.tar.bz2
mesa-20090921.tar.bz2
xdriinfo-1.0.3.tar.bz2
+mesa-20091221.tar.bz2
mesa-7.1-link-shared.patch:
drivers/dri/Makefile | 12 ++++++++++--
drivers/dri/Makefile.template | 4 ++--
x86/read_rgba_span_x86.S | 4 ----
3 files changed, 12 insertions(+), 8 deletions(-)
Index: mesa-7.1-link-shared.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa-7.1-link-shared.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mesa-7.1-link-shared.patch 22 Mar 2009 02:20:15 -0000 1.4
+++ mesa-7.1-link-shared.patch 20 Dec 2009 22:50:28 -0000 1.5
@@ -1,6 +1,6 @@
-diff -up mesa-20080814/src/mesa/drivers/dri/Makefile.dricore mesa-20080814/src/mesa/drivers/dri/Makefile
---- mesa-20080814/src/mesa/drivers/dri/Makefile.dricore 2008-08-14 02:28:38.000000000 +1000
-+++ mesa-20080814/src/mesa/drivers/dri/Makefile 2008-08-14 16:18:20.000000000 +1000
+diff -up mesa-20091221/src/mesa/drivers/dri/Makefile.da mesa-20091221/src/mesa/drivers/dri/Makefile
+--- mesa-20091221/src/mesa/drivers/dri/Makefile.da 2009-12-21 08:09:11.000000000 +1000
++++ mesa-20091221/src/mesa/drivers/dri/Makefile 2009-12-21 08:43:03.000000000 +1000
@@ -6,12 +6,17 @@ include $(TOP)/configs/current
@@ -20,7 +20,7 @@ diff -up mesa-20080814/src/mesa/drivers/
subdirs:
@for dir in $(DRI_DIRS) ; do \
-@@ -31,12 +36,14 @@ dri.pc: dri.pc.in
+@@ -32,12 +37,14 @@ dri.pc: dri.pc.in
$(pcedit) $< > $@
@@ -36,38 +36,36 @@ diff -up mesa-20080814/src/mesa/drivers/
$(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
$(INSTALL) -m 0644 $(TOP)/include/GL/internal/dri_interface.h \
$(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
-@@ -52,5 +59,6 @@ clean:
+@@ -51,5 +58,6 @@ clean:
(cd $$dir && $(MAKE) clean) ; \
fi \
done
+ -rm -f libdricore.so $(TOP)/$(LIB_DIR)/libdricore.so
-rm -f common/*.o
-rm -f *.pc
-diff -up mesa-20080814/src/mesa/drivers/dri/Makefile.template.dricore mesa-20080814/src/mesa/drivers/dri/Makefile.template
---- mesa-20080814/src/mesa/drivers/dri/Makefile.template.dricore 2008-08-14 02:28:38.000000000 +1000
-+++ mesa-20080814/src/mesa/drivers/dri/Makefile.template 2008-08-14 16:19:37.000000000 +1000
+diff -up mesa-20091221/src/mesa/drivers/dri/Makefile.template.da mesa-20091221/src/mesa/drivers/dri/Makefile.template
+--- mesa-20091221/src/mesa/drivers/dri/Makefile.template.da 2009-12-21 08:09:11.000000000 +1000
++++ mesa-20091221/src/mesa/drivers/dri/Makefile.template 2009-12-21 08:43:40.000000000 +1000
@@ -1,6 +1,6 @@
# -*-makefile-*-
-MESA_MODULES = $(TOP)/src/mesa/libmesa.a
+MESA_MODULES = $(TOP)/$(LIB_DIR)/libdricore.so
- COMMON_SOURCES = \
+ COMMON_GALLIUM_SOURCES = \
../common/utils.c \
-@@ -64,7 +64,9 @@ default: symlinks depend $(LIBNAME) $(TO
-
- $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
+@@ -70,7 +70,7 @@ lib: symlinks subdirs depend
+ $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) $(WINOBJ) Makefile \
+ $(TOP)/src/mesa/drivers/dri/Makefile.template
$(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \
-- $(OBJECTS) $(PIPE_DRIVERS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS)
-+ $(OBJECTS) $(PIPE_DRIVERS) $(WINOBJ) \
-+ -L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -ldricore \
-+ $(DRI_LIB_DEPS)
+- $(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) $(WINOBJ) \
++ $(OBJECTS) $(EXTRA_MODULES) $(WINOBJ) \
+ $(DRI_LIB_DEPS)
- $(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME)
-diff -up mesa-20080814/src/mesa/x86/read_rgba_span_x86.S.dricore mesa-20080814/src/mesa/x86/read_rgba_span_x86.S
---- mesa-20080814/src/mesa/x86/read_rgba_span_x86.S.dricore 2008-08-14 02:28:38.000000000 +1000
-+++ mesa-20080814/src/mesa/x86/read_rgba_span_x86.S 2008-08-14 16:16:49.000000000 +1000
+diff -up mesa-20091221/src/mesa/x86/read_rgba_span_x86.S.da mesa-20091221/src/mesa/x86/read_rgba_span_x86.S
+--- mesa-20091221/src/mesa/x86/read_rgba_span_x86.S.da 2009-12-21 08:09:11.000000000 +1000
++++ mesa-20091221/src/mesa/x86/read_rgba_span_x86.S 2009-12-21 08:43:03.000000000 +1000
@@ -77,7 +77,6 @@
*/
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.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mesa-no-mach64.patch 23 Jul 2009 02:15:27 -0000 1.2
+++ mesa-no-mach64.patch 20 Dec 2009 22:50:28 -0000 1.3
@@ -1,7 +1,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
+diff -up mesa-20091221/configure.ac.da mesa-20091221/configure.ac
+--- mesa-20091221/configure.ac.da 2009-12-21 08:09:11.000000000 +1000
++++ mesa-20091221/configure.ac 2009-12-21 08:41:04.000000000 +1000
+@@ -723,7 +723,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
@@ -10,7 +10,7 @@ diff -up mesa-20090723/configure.ac.mach
savage tdfx unichrome swrast"
fi
;;
-@@ -721,13 +721,13 @@ if test "$mesa_driver" = dri; then
+@@ -731,13 +731,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
@@ -26,7 +26,7 @@ diff -up mesa-20090723/configure.ac.mach
fi
;;
esac
-@@ -746,7 +746,7 @@ if test "$mesa_driver" = dri; then
+@@ -756,7 +756,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
@@ -35,12 +35,12 @@ diff -up mesa-20090723/configure.ac.mach
unichrome savage sis swrast"
fi
;;
-@@ -765,7 +765,7 @@ if test "$mesa_driver" = dri; then
+@@ -775,7 +775,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 r600 radeon s3v \
-+ DRI_DIRS="i810 i915 i965 mga r128 r200 r300 r600 radeon s3v \
- savage sis tdfx trident unichrome ffb swrast"
+- DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon \
++ DRI_DIRS="i810 i915 i965 mga r128 r200 r300 r600 radeon \
+ savage sis tdfx unichrome ffb swrast"
fi
Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -p -r1.256 -r1.257
--- mesa.spec 19 Oct 2009 22:32:52 -0000 1.256
+++ mesa.spec 20 Dec 2009 22:50:28 -0000 1.257
@@ -13,15 +13,15 @@
%define manpages gl-manpages-1.0.1
%define xdriinfo xdriinfo-1.0.3
-%define gitdate 20090921
+%define gitdate 20091221
#% define snapshot
%define demodir %{_libdir}/mesa
Summary: Mesa graphics libraries
Name: mesa
-Version: 7.6
-Release: 0.13%{?dist}
+Version: 7.8
+Release: 0.1%{?dist}
License: MIT
Group: System Environment/Libraries
URL: http://www.mesa3d.org
@@ -43,9 +43,6 @@ Patch3: mesa-no-mach64.patch
Patch7: mesa-7.1-link-shared.patch
Patch9: intel-revert-vbl.patch
-Patch10: r600-fix-tfp.patch
-
-Patch13: mesa-7.5-sparc64.patch
Patch30: mesa-7.6-hush-vblank-warning.patch
@@ -178,8 +175,6 @@ This package provides some demo applicat
%patch3 -p1 -b .no-mach64
%patch7 -p1 -b .dricore
%patch9 -p1 -b .intel-vbl
-%patch10 -p1 -b .r600_tfp
-%patch13 -p1 -b .sparc64
%patch30 -p1 -b .vblank-warning
# Hack the demos to use installed data files
@@ -387,6 +382,9 @@ rm -rf $RPM_BUILD_ROOT
%{demodir}
%changelog
+* Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 7.8-0.1
+- resnapshot from upstream for libdrm_radeon changes
+
* Mon Oct 19 2009 Adam Jackson <ajax at redhat.com>
- xdriinfo 1.0.3
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources 19 Oct 2009 22:32:52 -0000 1.42
+++ sources 20 Dec 2009 22:50:28 -0000 1.43
@@ -1,4 +1,3 @@
6ae05158e678f4594343f32c2ca50515 gl-manpages-1.0.1.tar.bz2
-a5ec51ed9f0a55dc3462d90d52ff899c xdriinfo-1.0.2.tar.bz2
-0bbe19a02cacc7c48e5c79bd533b8e29 mesa-20090921.tar.bz2
cb304d1ce562ac48b68eedeba38c662f xdriinfo-1.0.3.tar.bz2
+0f4bc80e7c55cff25a44c91c8657fc1a mesa-20091221.tar.bz2
--- mesa-7.5-sparc64.patch DELETED ---
--- r600-fix-tfp.patch DELETED ---
More information about the fedora-extras-commits
mailing list