[gnome-session] gnome-session-3.3.1-llvmpipe.patch: Don't consider llvmpipe unsupported.

Adam Jackson ajax at fedoraproject.org
Thu Nov 3 21:40:49 UTC 2011


commit 1c00acf38d678781286dec558915e8b7662be6ad
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Nov 3 21:39:05 2011 -0400

    gnome-session-3.3.1-llvmpipe.patch: Don't consider llvmpipe unsupported.

 gnome-session-3.0.1-renderer-blacklist.patch |    5 ++---
 gnome-session-3.3.1-llvmpipe.patch           |    9 +++++++++
 gnome-session.spec                           |    8 +++++++-
 3 files changed, 18 insertions(+), 4 deletions(-)
---
diff --git a/gnome-session-3.0.1-renderer-blacklist.patch b/gnome-session-3.0.1-renderer-blacklist.patch
index d5fecd5..33754fb 100644
--- a/gnome-session-3.0.1-renderer-blacklist.patch
+++ b/gnome-session-3.0.1-renderer-blacklist.patch
@@ -1,7 +1,7 @@
 diff -up gnome-session-3.0.1/tools/gnome-session-check-accelerated-helper.c.blacklist gnome-session-3.0.1/tools/gnome-session-check-accelerated-helper.c
 --- gnome-session-3.0.1/tools/gnome-session-check-accelerated-helper.c.blacklist	2011-03-22 16:31:43.000000000 -0400
 +++ gnome-session-3.0.1/tools/gnome-session-check-accelerated-helper.c	2011-04-27 13:01:15.132322955 -0400
-@@ -108,6 +108,21 @@ _has_hardware_gl (Display *display)
+@@ -108,6 +108,20 @@ _has_hardware_gl (Display *display)
          Window window = None;
          const char *renderer;
          int ret = 1;
@@ -15,7 +15,6 @@ diff -up gnome-session-3.0.1/tools/gnome-session-check-accelerated-helper.c.blac
 +        static const char * const renderer_blacklist[] = {
 +                "software rasterizer", /* Classic mesa software rendering */
 +                "softpipe",            /* Gallium software rendering */
-+                "llvmpipe",            /* Somewhat better Gallium software rendering */
 +                "R100",                /* ATI Radeon R1xx */
 +                "R200",                /* ATI Radeon R2xx */
 +                "Intel(R) 8"           /* Intel 830-865 */
@@ -23,7 +22,7 @@ diff -up gnome-session-3.0.1/tools/gnome-session-check-accelerated-helper.c.blac
  
          int attrlist[] = {
                  GLX_RGBA,
-@@ -143,13 +158,10 @@ _has_hardware_gl (Display *display)
+@@ -143,13 +157,10 @@ _has_hardware_gl (Display *display)
                  goto out;
  
          renderer = (const char *) glGetString (GL_RENDERER);
diff --git a/gnome-session-3.3.1-llvmpipe.patch b/gnome-session-3.3.1-llvmpipe.patch
new file mode 100644
index 0000000..40da1c9
--- /dev/null
+++ b/gnome-session-3.3.1-llvmpipe.patch
@@ -0,0 +1,9 @@
+diff -up gnome-session-3.3.1/data/hardware-compatibility.jx gnome-session-3.3.1/data/hardware-compatibility
+--- gnome-session-3.3.1/data/hardware-compatibility.jx	2011-10-21 10:35:39.000000000 -0400
++++ gnome-session-3.3.1/data/hardware-compatibility	2011-11-03 17:53:17.156407217 -0400
+@@ -20,4 +20,4 @@
+ 
+ # Gallium has softpipe and llvmpipe
+ -softpipe
+--llvmpipe
++#llvmpipe
diff --git a/gnome-session.spec b/gnome-session.spec
index 564ac6c..49f8e3a 100644
--- a/gnome-session.spec
+++ b/gnome-session.spec
@@ -3,13 +3,15 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 3.3.1
-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
 Source1: gnome-authentication-agent.desktop
 Source2: gnome.desktop
 
+Patch0: gnome-session-3.3.1-llvmpipe.patch
+
 License: GPLv2+
 Group: User Interface/Desktops
 
@@ -74,6 +76,7 @@ Desktop file to add GNOME to display manager session menu.
 
 %prep
 %setup -q
+%patch0 -p1 -b .llvmpipe
 
 echo "ACLOCAL_AMFLAGS = -I m4" >> Makefile.am
 
@@ -148,6 +151,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
 %{_datadir}/glib-2.0/schemas/org.gnome.SessionManager.gschema.xml
 
 %changelog
+* Thu Nov 03 2011 Adam Jackson <ajax at redhat.com> 3.3.1-2
+- gnome-session-3.3.1-llvmpipe.patch: Don't consider llvmpipe unsupported.
+
 * Wed Nov  2 2011 Matthias Clasen <mclasen at redhat.com> - 3.3.1-1
 - Update to 3.3.1
 


More information about the scm-commits mailing list