[gentoo-commits] gentoo-x86 commit in gnome-extra/gnome-power-manager/files: gnome-power-manager-2.26.4-Remove-an-unused-include-to-fix-compile.patch gnome-power-manager-2.26.4-Check-for-XRR-functions-using-library-version-instea.patch gnome-power-manager-2.26.4-Use-a-larger-DPMS-idletime-timeout-to-mitigate-an-XS.patch gnome-power-manager-2.26.1-fix-xrandr-1.3-detection.patch

[Remi Cardona (remi)]

remi        09/10/26 16:07:00

  Added:               
                        gnome-power-manager-2.26.4-Remove-an-unused-include-to-fix-compile.patch
                        gnome-power-manager-2.26.4-Check-for-XRR-functions-using-library-version-instea.patch
                        gnome-power-manager-2.26.4-Use-a-larger-DPMS-idletime-timeout-to-mitigate-an-XS.patch
  Removed:             
                        gnome-power-manager-2.26.1-fix-xrandr-1.3-detection.patch
  Log:
  gnome-extra/gnome-power-manager: backport patches from upstream, add randr patch
  (Portage version: 2.2_rc46/cvs/Linux i686)

Revision  Changes    Path
1.1                  gnome-extra/gnome-power-manager/files/gnome-power-manager-2.26.4-Remove-an-unused-include-to-fix-compile.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.26.4-Remove-an-unused-include-to-fix-compile.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.26.4-Remove-an-unused-include-to-fix-compile.patch?rev=1.1&content-type=text/plain

Index: gnome-power-manager-2.26.4-Remove-an-unused-include-to-fix-compile.patch
===================================================================
From 83ab201c9c4637f2b81dc640f297178f850450b8 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@××××××.com>
Date: Tue, 28 Jul 2009 08:42:46 +0100
Subject: [PATCH] Remove an unused include to fix compile

Signed-off-by: Richard Hughes <richard@×××××××.com>
---
 src/gpm-dpms.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/src/gpm-dpms.c b/src/gpm-dpms.c
index a58ed7d..d939b80 100644
--- a/src/gpm-dpms.c
+++ b/src/gpm-dpms.c
@@ -40,7 +40,6 @@
 #ifdef HAVE_DPMS_EXTENSION
 #include <X11/Xproto.h>
 #include <X11/extensions/dpms.h>
-#include <X11/extensions/dpmsstr.h>
 #endif
 
 #include "egg-debug.h"
-- 
1.6.5.1




1.1                  gnome-extra/gnome-power-manager/files/gnome-power-manager-2.26.4-Check-for-XRR-functions-using-library-version-instea.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.26.4-Check-for-XRR-functions-using-library-version-instea.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.26.4-Check-for-XRR-functions-using-library-version-instea.patch?rev=1.1&content-type=text/plain

Index: gnome-power-manager-2.26.4-Check-for-XRR-functions-using-library-version-instea.patch
===================================================================
From 558a5634d60221e5485083193155d1ee062c8e0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@g.o>
Date: Fri, 11 Sep 2009 21:33:58 +0200
Subject: [PATCH] Check for XRR* functions using library version instead of proto version
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

randrproto 1.3 can be installed with libXrandr 1.2, which causes linking
errors with g-p-m. This patch checks that libXrandr (and not randrproto)
1.3 is available.

Signed-off-by: Rémi Cardona <remi@g.o>
---
 configure.ac                |    4 ++++
 src/gpm-brightness-xrandr.c |   13 ++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4cbe47c..4baa0cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -171,6 +171,10 @@ PKG_CHECK_MODULES(XRANDR, [
 AC_SUBST(XRANDR_CFLAGS)
 AC_SUBST(XRANDR_LIBS)
 
+PKG_CHECK_EXISTS(
+ [xrandr >= 1.3],
+ [AC_DEFINE(HAVE_XRANDR_13, 1, [xrandr 1.3 available])])
+
 PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED)
 AC_SUBST(LIBNOTIFY_CFLAGS)
 AC_SUBST(LIBNOTIFY_LIBS)
diff --git a/src/gpm-brightness-xrandr.c b/src/gpm-brightness-xrandr.c
index cce4df2..3332be3 100644
--- a/src/gpm-brightness-xrandr.c
+++ b/src/gpm-brightness-xrandr.c
@@ -60,7 +60,7 @@ struct GpmBrightnessXRandRPrivate
 	Display			*dpy;
 	guint			 shared_value;
 	gboolean		 has_extension;
-#if (RANDR_MAJOR == 1 && RANDR_MINOR >= 3)
+#ifdef HAVE_XRANDR_13
 	gboolean		 has_randr13;
 #endif
 	gboolean		 hw_changed;
@@ -173,7 +173,7 @@ gpm_brightness_xrandr_setup_display (GpmBrightnessXRandR *brightness)
 	return TRUE;
 }
 
-#if (RANDR_MAJOR == 1 && RANDR_MINOR >= 3)
+#ifdef HAVE_XRANDR_13
 /**
  * gpm_brightness_xrandr_setup_version: Check whether xserver really supports xrandr-1.3 features.
  **/
@@ -650,14 +650,13 @@ gpm_brightness_xrandr_update_cache (GpmBrightnessXRandR *brightness)
 		   in RandR 1.3 or higher and of course xserver needs
 		   to support it.
 		*/
-#if (RANDR_MAJOR == 1 && RANDR_MINOR >= 3)
+#ifdef HAVE_XRANDR_13
 		if (brightness->priv->has_randr13)
 			resource = XRRGetScreenResourcesCurrent (brightness->priv->dpy, root);
 		else
-			resource = XRRGetScreenResources (brightness->priv->dpy, root);
-#else
-		resource = XRRGetScreenResources (brightness->priv->dpy, root);
 #endif
+			resource = XRRGetScreenResources (brightness->priv->dpy, root);
+
 		if (resource != NULL) {
 			egg_debug ("adding resource %p", resource);
 			g_ptr_array_add (brightness->priv->resources, resource);
@@ -724,7 +723,7 @@ gpm_brightness_xrandr_init (GpmBrightnessXRandR *brightness)
 		egg_debug ("no XRANDR extension, so aborting init");
 		return;
 	}
-#if (RANDR_MAJOR == 1 && RANDR_MINOR >= 3)
+#ifdef HAVE_XRANDR_13
 	brightness->priv->has_randr13 = gpm_brightness_xrandr_setup_version (brightness);
 #endif
 
-- 
1.6.5.1




1.1                  gnome-extra/gnome-power-manager/files/gnome-power-manager-2.26.4-Use-a-larger-DPMS-idletime-timeout-to-mitigate-an-XS.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.26.4-Use-a-larger-DPMS-idletime-timeout-to-mitigate-an-XS.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.26.4-Use-a-larger-DPMS-idletime-timeout-to-mitigate-an-XS.patch?rev=1.1&content-type=text/plain

Index: gnome-power-manager-2.26.4-Use-a-larger-DPMS-idletime-timeout-to-mitigate-an-XS.patch
===================================================================
From bebf24f41c43f0b2338aefea87f39ba7423d02be Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@×××××××.com>
Date: Fri, 14 Aug 2009 11:17:45 +0100
Subject: [PATCH] Use a larger DPMS idletime timeout to mitigate an XSync bug

---
 src/gpm-idle.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/gpm-idle.c b/src/gpm-idle.c
index 852f0f3..abe6075 100644
--- a/src/gpm-idle.c
+++ b/src/gpm-idle.c
@@ -51,6 +51,11 @@
 #define GPM_IDLE_TIMEOUT_IGNORE_DPMS_CHANGE	1.0f /* seconds */
 #define	GPM_IDLE_IDLETIME_ID			1
 
+/* XSync seems to be unreliable when setting small values of time.
+ * Ideally we want this to be 1ms (or smaller!) to reduce the chance of a race,
+ * but this fails to trigger on some systems. */
+#define GPM_IDLE_SMALLEST_RESET_VALUE		500 /* ms */
+
 struct GpmIdlePrivate
 {
 	EggIdletime	*idletime;
@@ -366,8 +371,8 @@ gpm_idle_idletime_reset_cb (EggIdletime *idletime, GpmIdle *idle)
 	if (idle->priv->mode == GPM_IDLE_MODE_BLANK &&
 	    elapsed < GPM_IDLE_TIMEOUT_IGNORE_DPMS_CHANGE) {
 		egg_debug ("ignoring reset, as we've just done a state change");
-		/* make sure we trigger a short 1ms timeout so we can get the expired signal */
-		egg_idletime_alarm_set (idle->priv->idletime, GPM_IDLE_IDLETIME_ID, 1);
+		/* make sure we trigger a short timeout so we can get the expired signal */
+		egg_idletime_alarm_set (idle->priv->idletime, GPM_IDLE_IDLETIME_ID, GPM_IDLE_SMALLEST_RESET_VALUE);
 		return;
 	}
 
-- 
1.6.5.1