From 7bc501f69a9a532faaa10cfc67d64e65a70071fc Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 14 Jan 2011 07:37:28 -0500 Subject: [PATCH] Don't run the shell on softpipe --- ...sider-Gallium-s-softpipe-and-llvmpip.patch | 36 +++++++++++++++++++ gnome-session.spec | 9 ++++- 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 0001-tools-Do-not-consider-Gallium-s-softpipe-and-llvmpip.patch diff --git a/0001-tools-Do-not-consider-Gallium-s-softpipe-and-llvmpip.patch b/0001-tools-Do-not-consider-Gallium-s-softpipe-and-llvmpip.patch new file mode 100644 index 0000000..321c381 --- /dev/null +++ b/0001-tools-Do-not-consider-Gallium-s-softpipe-and-llvmpip.patch @@ -0,0 +1,36 @@ +From 2bd1975803f1d7e03a7f98881e8332a2330c4146 Mon Sep 17 00:00:00 2001 +From: Vincent Untz +Date: Fri, 14 Jan 2011 08:44:52 +0100 +Subject: [PATCH] tools: Do not consider Gallium's softpipe and llvmpipe as accelerated + +Those are software renderers too. It might be that llvmpipe gets good +enough in the future, but it's not the case at the moment. + +Based on patch from Matthias Clasen . + +https://bugzilla.gnome.org/show_bug.cgi?id=639490 +--- + tools/gnome-session-is-accelerated.c | 7 +++++-- + 1 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/tools/gnome-session-is-accelerated.c b/tools/gnome-session-is-accelerated.c +index 6b8b1a4..0729c14 100644 +--- a/tools/gnome-session-is-accelerated.c ++++ b/tools/gnome-session-is-accelerated.c +@@ -144,8 +144,11 @@ _has_hardware_gl (Display *display) + + renderer = (const char *) glGetString (GL_RENDERER); + /* The current Mesa software GL renderer string is +- * "Software Rasterizer" */ +- if (strcasestr (renderer, "software rasterizer") != NULL) ++ * "Software Rasterizer". ++ * Gallium has softpipe and llvmpipe. */ ++ if (strcasestr (renderer, "software rasterizer") != NULL || ++ strcasestr (renderer, "softpipe") != NULL || ++ strcasestr (renderer, "llvmpipe") != NULL) + goto out; + + /* we need to get the max texture size while we have a context, +-- +1.7.3.4 + diff --git a/gnome-session.spec b/gnome-session.spec index 11b016b..e71af6b 100644 --- a/gnome-session.spec +++ b/gnome-session.spec @@ -5,11 +5,13 @@ Summary: GNOME session manager Name: gnome-session Version: 2.91.4 -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/2.91/%{name}-%{version}.tar.bz2 Source2: gnome.desktop +# upstream fix +Patch0: 0001-tools-Do-not-consider-Gallium-s-softpipe-and-llvmpip.patch License: GPLv2+ Group: User Interface/Desktops @@ -90,6 +92,8 @@ Desktop file to add GNOME to display manager session menu. %prep %setup -q +%patch0 -p1 -b .softpipe + # %patch3 -p1 -b .max-idle # %patch4 -p1 -b .nag-root-user # %patch7 -p1 -b .cflags @@ -178,6 +182,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Fri Dec 14 2011 Matthias Clasen 2.91.4-2 +- Don't run the shell on softpipe + * Sun Jan 9 2011 Matthias Clasen 2.91.4-1 - Update to 2.91.4