From 87d64c144b5a76203e155ba3a80dcfe9a31770cd Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Thu, 22 Mar 2012 23:44:12 -0700
Subject: [PATCH] blacklist NV30 adapters on nouveau until #745202 is fixed

---
 gnome-session-3.3.92-nv30.patch | 12 ++++++++++++
 gnome-session.spec              |  8 +++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 gnome-session-3.3.92-nv30.patch

diff --git a/gnome-session-3.3.92-nv30.patch b/gnome-session-3.3.92-nv30.patch
new file mode 100644
index 0000000..8bb1d85
--- /dev/null
+++ b/gnome-session-3.3.92-nv30.patch
@@ -0,0 +1,12 @@
+--- gnome-session/data/hardware-compatibility	2012-03-21 16:30:06.269104695 -0700
++++ gnome-session/data/hardware-compatibility.new	2012-03-22 23:26:37.201967075 -0700
+@@ -19,6 +19,9 @@
+ -Mesa DRI R[12]00[^[:digit:]]
+ -Mesa DRI R[12]00$
+ 
++# NV30 family on Nouveau: https://bugzilla.redhat.com/show_bug.cgi?id=745202
++-Gallium .* on NV3[0-9A-F]$
++
+ # Old Mesa software GL renderer
+ -software rasterizer
+ 
diff --git a/gnome-session.spec b/gnome-session.spec
index fed07f0..609d329 100644
--- a/gnome-session.spec
+++ b/gnome-session.spec
@@ -3,7 +3,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 3.3.92
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 #VCS: git:git://git.gnome.org/gnome-session
 Source0: http://download.gnome.org/sources/gnome-session/3.3/%{name}-%{version}.tar.xz
@@ -11,6 +11,8 @@ Source1: gnome-authentication-agent.desktop
 Source2: gnome.desktop
 
 Patch0: gnome-session-3.3.1-llvmpipe.patch
+# Blacklist NV30: https://bugzilla.redhat.com/show_bug.cgi?id=745202
+Patch1: gnome-session-3.3.92-nv30.patch
 
 License: GPLv2+
 Group: User Interface/Desktops
@@ -79,6 +81,7 @@ Desktop file to add GNOME to display manager session menu.
 %prep
 %setup -q
 %patch0 -p1 -b .llvmpipe
+%patch1 -p1 -b .nv30
 
 echo "ACLOCAL_AMFLAGS = -I m4" >> Makefile.am
 
@@ -154,6 +157,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
 %{_datadir}/glib-2.0/schemas/org.gnome.SessionManager.gschema.xml
 
 %changelog
+* Thu Mar 22 2012 Adam Williamson <awilliam@redhat.com> - 3.3.92-2
+- blacklist NV30 family until RH #745202 is resolved
+
 * Wed Mar 21 2012 Kalev Lember <kalevlember@gmail.com> - 3.3.92-1
 - Update to 3.3.92