[xscreensaver/f15/master] Don't try to change DPMS state on blank-only mode startup (bug 702698, bug 703483)
Mamoru Tasaka
mtasaka at fedoraproject.org
Tue May 10 16:52:26 UTC 2011
commit b81c7ed4634b68b95bea3257df2d11c070fe719a
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date: Wed May 11 01:52:15 2011 +0900
Don't try to change DPMS state on blank-only mode startup
(bug 702698, bug 703483)
...-5.13-dont-dpmsmodeoff-on-blankonly-start.patch | 20 ++++++++++++++++++++
xscreensaver.spec | 12 +++++++++---
2 files changed, 29 insertions(+), 3 deletions(-)
---
diff --git a/xscreensaver-5.13-dont-dpmsmodeoff-on-blankonly-start.patch b/xscreensaver-5.13-dont-dpmsmodeoff-on-blankonly-start.patch
new file mode 100644
index 0000000..5d6d43a
--- /dev/null
+++ b/xscreensaver-5.13-dont-dpmsmodeoff-on-blankonly-start.patch
@@ -0,0 +1,20 @@
+--- xscreensaver-5.13/driver/xscreensaver.c.blank_dpms 2011-01-10 10:43:26.000000000 +0900
++++ xscreensaver-5.13/driver/xscreensaver.c 2011-05-11 01:03:31.000000000 +0900
+@@ -1229,8 +1229,17 @@
+
+ /* If we are blanking only, we might as well power down the monitor
+ right now, regardless of what the DPMS settings are. */
++
++ /* Reverting for now.
++ 1. People setting DPMS now seems to get confused because their DPMS
++ settings are ignored.
++ 2. People not using DPMS now observers xscreensaver's abnormal
++ exit with X Error
++ */
++#if 0
+ if (p->mode == BLANK_ONLY)
+ monitor_power_on (si, False);
++#endif
+
+ /* Don't start the cycle timer in demo mode. */
+ if (!si->demoing_p && p->cycle)
diff --git a/xscreensaver.spec b/xscreensaver.spec
index c58c8d0..dfd6abb 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -10,7 +10,7 @@
%define split_getimage 1
%endif
-%define fedora_rel 1
+%define fedora_rel 2
%undefine extrarel
@@ -61,8 +61,9 @@ Patch30: xscreensaver-5.11-conf264.patch
#
## Patches which must be discussed with upstream
#
-## Patch31, 32, 33, 34, 35, 36, 37, 38, 39: already sent to the upstream
-## Patch40: from the upstream
+# Don't try to change DPMS state on blank-only mode startup
+# (bug 702698, bug 703483)
+Patch31: xscreensaver-5.13-dont-dpmsmodeoff-on-blankonly-start.patch
#
# driver/test-passwd tty segfaults
Patch41: xscreensaver-5.12-test-passwd-segv-tty.patch
@@ -257,6 +258,7 @@ This package contains some test programs to debug XScreenSaver.
%patch1 -p1 -b .sanitize-hacks
%patch21 -p1 -b .nonet
%patch30 -p1 -b .conf264
+%patch31 -p1 -b .blank_dpms
%patch41 -p1 -b .test_passwd
%patch42 -p1 -b .test_misc
@@ -785,6 +787,10 @@ exit 0
%defattr(-,root,root,-)
%changelog
+* Wed May 11 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1:5.13-2
+- Don't try to change DPMS state on blank-only mode startup
+ (bug 702698, bug 703483)
+
* Tue Apr 19 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1:5.13-1
- Update to 5.13
More information about the scm-commits
mailing list