rpms/gnome-screensaver/devel gnome-screensaver-2.27.0-gamma.patch, NONE, 1.1 gnome-screensaver.spec, 1.222, 1.223

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/gnome-screensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9307

Modified Files:
	gnome-screensaver.spec 
Added Files:
	gnome-screensaver-2.27.0-gamma.patch 
Log Message:
* Tue Aug 18 2009 Adam Jackson <ajax at redhat.com> 2.27.0-9
- gnome-screensaver-2.27.0-gamma.patch: Backport patch to fix gamma fadeout
  (#508513)


gnome-screensaver-2.27.0-gamma.patch:
 gs-fade.c |   53 +++++++++++++++++++++++++++--------------------------
 1 file changed, 27 insertions(+), 26 deletions(-)

--- NEW FILE gnome-screensaver-2.27.0-gamma.patch ---
commit 1edd5817ac177e4f73ff8578746510abd3541390
Author: Michel Dänzer <daenzer at debian.org>
Date:   Wed Aug 12 17:52:07 2009 -0400

    Fix gamma fadeout when X reports 0-size gamma ramp (#581995)

diff --git a/src/gs-fade.c b/src/gs-fade.c
index f591ab8..75595a7 100644
--- a/src/gs-fade.c
+++ b/src/gs-fade.c
@@ -308,32 +308,15 @@ gamma_info_init (GSFade *fade)
         */
         for (screen = 0; screen < fade->priv->num_screens; screen++) {
 
-                if (FADE_TYPE_GAMMA_NUMBER == fade->priv->fade_type) {
-                        /* only have gamma parameter, not ramps. */
-
-                        res = XF86VidModeGetGamma (GDK_DISPLAY (), screen, &info [screen].vmg);
-                        if (! res) {
-                                goto FAIL;
-                        }
-                        gs_debug ("Initialized gamma fade for screen %d: %f %f %f",
-                                  screen,
-                                  info [screen].vmg.red,
-                                  info [screen].vmg.green,
-                                  info [screen].vmg.blue);
-                }
-
 # ifdef HAVE_XF86VMODE_GAMMA_RAMP
 
-                else if (FADE_TYPE_GAMMA_RAMP == fade->priv->fade_type) {
+                if (FADE_TYPE_GAMMA_RAMP == fade->priv->fade_type) {
                         /* have ramps */
 
                         res = XF86VidModeGetGammaRampSize (GDK_DISPLAY (), screen, &info [screen].size);
-                        if (! res) {
-                                goto FAIL;
-                        }
-
-                        if (info [screen].size <= 0) {
-                                goto FAIL;
+                        if (! res || info [screen].size <= 0) {
+                                fade->priv->fade_type = FADE_TYPE_GAMMA_NUMBER;
+                                goto test_number;
                         }
 
                         info [screen].r = g_new0 (unsigned short, info[screen].size);
@@ -341,7 +324,8 @@ gamma_info_init (GSFade *fade)
                         info [screen].b = g_new0 (unsigned short, info[screen].size);
 
                         if (! (info [screen].r && info [screen].g && info [screen].b)) {
-                                goto FAIL;
+                                fade->priv->fade_type = FADE_TYPE_GAMMA_NUMBER;
+                                goto test_number;
                         }
 
                         res = XF86VidModeGetGammaRamp (GDK_DISPLAY (),
@@ -351,15 +335,32 @@ gamma_info_init (GSFade *fade)
                                                        info [screen].g,
                                                        info [screen].b);
                         if (! res) {
-                                goto FAIL;
+                                fade->priv->fade_type = FADE_TYPE_GAMMA_NUMBER;
+                                goto test_number;
                         }
                         gs_debug ("Initialized gamma ramp fade");
                 }
 # endif /* HAVE_XF86VMODE_GAMMA_RAMP */
-                else if (FADE_TYPE_NONE == fade->priv->fade_type) {
+
+ test_number:
+                if (FADE_TYPE_GAMMA_NUMBER == fade->priv->fade_type) {
+                        /* only have gamma parameter, not ramps. */
+
+                        res = XF86VidModeGetGamma (GDK_DISPLAY (), screen, &info [screen].vmg);
+                        if (! res) {
+                                fade->priv->fade_type = FADE_TYPE_NONE;
+                                goto test_none;
+                        }
+                        gs_debug ("Initialized gamma fade for screen %d: %f %f %f",
+                                  screen,
+                                  info [screen].vmg.red,
+                                  info [screen].vmg.green,
+                                  info [screen].vmg.blue);
+                }
+
+ test_none:
+                if (FADE_TYPE_NONE == fade->priv->fade_type) {
                         goto FAIL;
-                } else {
-                        g_assert_not_reached ();
                 }
         }
 


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -p -r1.222 -r1.223
--- gnome-screensaver.spec	15 Aug 2009 21:07:12 -0000	1.222
+++ gnome-screensaver.spec	18 Aug 2009 19:49:14 -0000	1.223
@@ -14,7 +14,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.27.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 Group: Amusements/Graphics
 Source0: http://download.gnome.org/sources/gnome-screensaver/2.27/%{name}-%{version}.tar.bz2
@@ -31,6 +31,8 @@ Patch8: gnome-screensaver-2.20.0-selinux
 Patch9: use-gtkbuilder.patch
 # from upstream
 Patch10: button-images.patch
+# from upstream
+Patch11: gnome-screensaver-2.27.0-gamma.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.gnome.org
@@ -86,6 +88,7 @@ simple, sane, secure defaults and be wel
 %patch8 -p1 -b .selinux-permit
 %patch9 -p1 -b .use-gtkbuilder
 %patch10 -p1 -b .button-images
+%patch11 -p1 -b .gamma
 
 libtoolize --force --copy
 
@@ -162,6 +165,10 @@ fi
 %doc %{_mandir}/man1/*.1.gz
 
 %changelog
+* Tue Aug 18 2009 Adam Jackson <ajax at redhat.com> 2.27.0-9
+- gnome-screensaver-2.27.0-gamma.patch: Backport patch to fix gamma fadeout
+  (#508513)
+
 * Sat Aug 15 2009 Matthias Clasen <mclasen at redhat.com> 2.27.0-8
 - Manual XML editing considered harmful...