- Fix radeon colors for rawhide

4 files changed, 12 insertions, 43 deletions

diff --git a/.cvsignore b/.cvsignore
index 3201e04..9bf2a14 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -12,3 +12,4 @@ mesa-20091221.tar.bz2
 mesa-20100106.tar.bz2
 mesa-20100108.tar.bz2
 mesa-20100121.tar.bz2
+mesa-20100203.tar.bz2
diff --git a/mesa-7.7-fix-radeon-colors.patch b/mesa-7.7-fix-radeon-colors.patch
deleted file mode 100644
index 819f158..0000000
--- a/mesa-7.7-fix-radeon-colors.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 395e08a839bca94b8c0cd7fca4b48bb06bc02952 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Wed, 27 Jan 2010 11:46:26 +1000
-Subject: [PATCH] radeon/r200/r300: don't clean non-emitted state.
-
-So if we don't actually emit an atom to the hw because we don't
-need it in the current state (e.g. lighting related atoms when
-lighting is off) then don't mark it as clean, because when
-lighting gets switched on we won't emit it at all.
-
-This fixes funky gears colors.
-
-Signed-off-by: Dave Airlie <airlied@redhat.com>
----
- src/mesa/drivers/dri/radeon/radeon_common.c |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/src/mesa/drivers/dri/radeon/radeon_common.c b/src/mesa/drivers/dri/radeon/radeon_common.c
-index e0b853b..79f3ff7 100644
---- a/src/mesa/drivers/dri/radeon/radeon_common.c
-+++ b/src/mesa/drivers/dri/radeon/radeon_common.c
-@@ -1036,10 +1036,11 @@ static INLINE void radeon_emit_atom(radeonContextPtr radeon, struct radeon_state
- 			OUT_BATCH_TABLE(atom->cmd, dwords);
- 			END_BATCH();
- 		}
-+		atom->dirty = GL_FALSE;
-+
- 	} else {
- 		radeon_print(RADEON_STATE, RADEON_VERBOSE, "  skip state %s\n", atom->name);
- 	}
--	atom->dirty = GL_FALSE;
- 
- }
- 
--- 
-1.6.5.2
-
diff --git a/mesa.spec b/mesa.spec
index 2201cbe..afac7a1 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 20100121
+%define gitdate 20100203
 #% define snapshot 
 
 %define demodir %{_libdir}/mesa
@@ -21,7 +21,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.8
-Release: 0.12%{?dist}
+Release: 0.13%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -41,7 +41,6 @@ Patch1: mesa-7.1-osmesa-version.patch
 Patch2: mesa-7.1-nukeglthread-debug.patch
 Patch3: mesa-no-mach64.patch
 
-Patch5: mesa-7.7-fix-radeon-colors.patch
 #Patch7: mesa-7.1-link-shared.patch
 
 Patch30: mesa-7.6-hush-vblank-warning.patch
@@ -53,7 +52,7 @@ BuildRequires: kernel-headers >= 2.6.27-0.305.rc5.git6
 BuildRequires: libdrm-devel >= 2.4.17-0.1
 BuildRequires: libXxf86vm-devel
 BuildRequires: expat-devel >= 2.0
-BuildRequires: xorg-x11-proto-devel >= 7.1-10
+BuildRequires: xorg-x11-proto-devel >= 7.4-35
 BuildRequires: makedepend
 BuildRequires: libselinux-devel
 BuildRequires: libXext-devel
@@ -181,7 +180,6 @@ Group: User Interface/X Hardware Support
 %patch1 -p1 -b .osmesa
 %patch2 -p1 -b .intel-glthread
 %patch3 -p1 -b .no-mach64
-%patch5 -p1 -b .r100-color
 #%patch7 -p1 -b .dricore
 %patch30 -p1 -b .vblank-warning
 
@@ -240,6 +238,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS -Os"
     --with-dri-driverdir=%{_libdir}/dri \
     --with-state-trackers=dri,xorg,glx \
     --enable-gallium-svga \
+    --enable-gallium-nouveau \
     %{?dri_drivers}
 
 make #{?_smp_mflags}
@@ -332,10 +331,12 @@ rm -rf $RPM_BUILD_ROOT
 #%{_libdir}/dri/libdricore.so
 %{_libdir}/dri/*_dri.so
 %exclude %{_libdir}/dri/vmwgfx_dri.so
+%exclude %{_libdir}/dri/nouveau_dri.so
 
 %files dri-drivers-experimental
 %defattr(-,root,root,-)
 %{_libdir}/dri/vmwgfx_dri.so
+%{_libdir}/dri/nouveau_dri.so
 
 %files libGL-devel
 %defattr(-,root,root,-)
@@ -395,6 +396,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/xorg/modules/drivers/vmwgfx_drv.so
 
 %changelog
+* Wed Feb 03 2010 Dave Airlie <airlied@redhat.com> 7.8-0.13
+- update dri2proto requirement
+- add nouveau to experimental drivers set
+
 * Wed Jan 27 2010 Dave Airlie <airlied@redhat.com> 7.8-0.12
 - Fix radeon colors for rawhide
 
diff --git a/sources b/sources
index eda2167..85118f2 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 6ae05158e678f4594343f32c2ca50515  gl-manpages-1.0.1.tar.bz2
 cb304d1ce562ac48b68eedeba38c662f  xdriinfo-1.0.3.tar.bz2
-88e7532d0abb631fa199e58e12d30f9f  mesa-20100121.tar.bz2
+f25919456666b8ec8bd6e47f68677a75  mesa-20100203.tar.bz2