summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.cvsignore1
-rw-r--r--mesa-7.1-link-shared.patch37
-rw-r--r--mesa-no-mach64.patch20
-rw-r--r--mesa.spec7
-rw-r--r--sources2
5 files changed, 35 insertions, 32 deletions
diff --git a/.cvsignore b/.cvsignore
index 5f8f575..91e0adf 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -7,3 +7,4 @@ mesa-20090723.tar.bz2
mesa-20090813.tar.bz2
mesa-20090909.tar.bz2
mesa-20090921.tar.bz2
+mesa-20091030.tar.bz2
diff --git a/mesa-7.1-link-shared.patch b/mesa-7.1-link-shared.patch
index f042383..d397e28 100644
--- a/mesa-7.1-link-shared.patch
+++ b/mesa-7.1-link-shared.patch
@@ -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-20091030/src/mesa/drivers/dri/Makefile.da mesa-20091030/src/mesa/drivers/dri/Makefile
+--- mesa-20091030/src/mesa/drivers/dri/Makefile.da 2009-10-30 11:12:50.000000000 +1000
++++ mesa-20091030/src/mesa/drivers/dri/Makefile 2009-10-30 14:54:13.000000000 +1000
@@ -6,12 +6,17 @@ include $(TOP)/configs/current
@@ -20,7 +20,7 @@ diff -up mesa-20080814/src/mesa/drivers/dri/Makefile.dricore mesa-20080814/src/m
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,37 @@ diff -up mesa-20080814/src/mesa/drivers/dri/Makefile.dricore mesa-20080814/src/m
$(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-20091030/src/mesa/drivers/dri/Makefile.template.da mesa-20091030/src/mesa/drivers/dri/Makefile.template
+--- mesa-20091030/src/mesa/drivers/dri/Makefile.template.da 2009-10-30 11:12:50.000000000 +1000
++++ mesa-20091030/src/mesa/drivers/dri/Makefile.template 2009-10-30 14:56:12.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
+@@ -66,7 +66,8 @@ default: symlinks subdirs depend $(LIBNA
+ $(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) \
+- $(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) $(WINOBJ) \
++ $(OBJECTS) $(EXTRA_MODULES) $(WINOBJ) \
+ -L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -ldricore \
-+ $(DRI_LIB_DEPS)
+ $(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-20091030/src/mesa/x86/read_rgba_span_x86.S.da mesa-20091030/src/mesa/x86/read_rgba_span_x86.S
+--- mesa-20091030/src/mesa/x86/read_rgba_span_x86.S.da 2009-10-30 11:12:50.000000000 +1000
++++ mesa-20091030/src/mesa/x86/read_rgba_span_x86.S 2009-10-30 14:54:13.000000000 +1000
@@ -77,7 +77,6 @@
*/
diff --git a/mesa-no-mach64.patch b/mesa-no-mach64.patch
index 450c54d..b8d3272 100644
--- a/mesa-no-mach64.patch
+++ b/mesa-no-mach64.patch
@@ -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-20091030/configure.ac.da mesa-20091030/configure.ac
+--- mesa-20091030/configure.ac.da 2009-10-30 11:12:50.000000000 +1000
++++ mesa-20091030/configure.ac 2009-10-30 14:53:02.000000000 +1000
+@@ -716,7 +716,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.mach64 mesa-20090723/configure.ac
savage tdfx unichrome swrast"
fi
;;
-@@ -721,13 +721,13 @@ if test "$mesa_driver" = dri; then
+@@ -724,13 +724,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.mach64 mesa-20090723/configure.ac
fi
;;
esac
-@@ -746,7 +746,7 @@ if test "$mesa_driver" = dri; then
+@@ -749,7 +749,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.mach64 mesa-20090723/configure.ac
unichrome savage sis swrast"
fi
;;
-@@ -765,7 +765,7 @@ if test "$mesa_driver" = dri; then
+@@ -768,7 +768,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
diff --git a/mesa.spec b/mesa.spec
index 00587f1..a3edafd 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -13,7 +13,7 @@
%define manpages gl-manpages-1.0.1
%define xdriinfo xdriinfo-1.0.2
-%define gitdate 20090921
+%define gitdate 20091030
#% define snapshot
%define demodir %{_libdir}/mesa
@@ -21,7 +21,7 @@
Summary: Mesa graphics libraries
Name: mesa
Version: 7.6
-Release: 0.13%{?dist}
+Release: 0.14%{?dist}
License: MIT
Group: System Environment/Libraries
URL: http://www.mesa3d.org
@@ -387,6 +387,9 @@ rm -rf $RPM_BUILD_ROOT
%{demodir}
%changelog
+* Thu Nov 05 2009 Dave Airlie <airlied@redhat.com> 7.6-0.14
+- update to git snapshot - makes gnome-shell on r600 work better
+
* Mon Sep 21 2009 Adam Jackson <ajax@redhat.com> 7.6-0.13
- Today's git snap. Fixes picking in clutter apps on Intel chips (#524338)
diff --git a/sources b/sources
index 165e934..b80acfa 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
6ae05158e678f4594343f32c2ca50515 gl-manpages-1.0.1.tar.bz2
a5ec51ed9f0a55dc3462d90d52ff899c xdriinfo-1.0.2.tar.bz2
-0bbe19a02cacc7c48e5c79bd533b8e29 mesa-20090921.tar.bz2
+3808501d6198933e1866db7ddb329aac mesa-20091030.tar.bz2
generated by cgit (git 2.34.1) at 2024-05-17 23:10:26 +0000