Hello community, here is the log from the commit of package xorg-x11-server checked in at Fri Nov 28 16:10:45 CET 2008. -------- --- xorg-x11-server/xorg-x11-server.changes 2008-11-21 20:17:13.000000000 +0100 +++ xorg-x11-server/xorg-x11-server.changes 2008-11-28 03:57:17.837049316 +0100 @@ -1,0 +2,16 @@ +Fri Nov 28 03:56:16 CET 2008 - sndirsch@suse.de + +- dpms_screensaver.diff + * DMPS calls dixSaveScreens() when turned on but not when turned + off. In most cases this is irrelevant as DPMS is done when a + key is hit in which case dixSaveScreens() will be called to + unblank anyhow. This isn't the case if we use xset (or the + DPMS extension directly) to unblank. (bnc #439495) + +------------------------------------------------------------------- +Wed Nov 26 14:35:30 CET 2008 - sndirsch@suse.de + +- rename "i810" driver entry in xorg.conf to "intel" during update + (bnc #448458) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- dpms_screensaver.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.tQ5891/_old 2008-11-28 16:09:40.000000000 +0100 +++ /var/tmp/diff_new_pack.tQ5891/_new 2008-11-28 16:09:40.000000000 +0100 @@ -29,7 +29,7 @@ Url: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.4 -Release: 16 +Release: 17 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -104,6 +104,7 @@ Patch124: commit-59f9fb4b8.diff Patch125: 0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch Patch126: commit-a9e2030.diff +Patch127: dpms_screensaver.diff %description This package contains the X.Org Server. @@ -223,6 +224,7 @@ %patch124 -p1 %patch125 -p1 %patch126 -p1 +%patch127 -p1 %build pushd xorg-docs-* @@ -395,6 +397,7 @@ if [ -f etc/X11/xorg.conf ]; then # SuSE 10.1 --> SuSE 10.2: X11 fonts have moved to /usr/share/fonts # SuSE 10.1 --> SuSE 10.2: radeonold --> radeon + # openSUSE 11.0 --> openSUSE 11.1: i810 --> intel (Bug #448458) if grep -q -e /usr/X11R6/lib/X11/fonts/ \ -e /usr/X11/lib/X11/fonts/ \ -e /usr/lib/X11/fonts/ \ @@ -412,6 +415,10 @@ etc/X11/xorg.conf fi fi + if grep -q \"i810\" etc/X11/xorg.conf; then + sed -i.post_xorg-x11-server -e 's/\"i810\"/\"intel\"/g' \ + etc/X11/xorg.conf + fi fi %endif # Installation of init script seems to be disabled by default @@ -539,6 +546,16 @@ %endif %changelog +* Fri Nov 28 2008 sndirsch@suse.de +- dpms_screensaver.diff + * DMPS calls dixSaveScreens() when turned on but not when turned + off. In most cases this is irrelevant as DPMS is done when a + key is hit in which case dixSaveScreens() will be called to + unblank anyhow. This isn't the case if we use xset (or the + DPMS extension directly) to unblank. (bnc #439495) +* Wed Nov 26 2008 sndirsch@suse.de +- rename "i810" driver entry in xorg.conf to "intel" during update + (bnc #448458) * Fri Nov 21 2008 sndirsch@suse.de - commit-a9e2030.diff * int10: Do an mprotect(..,PROT_EXEC) on shmat()ed memory ++++++ dpms_screensaver.diff ++++++ diff --git a/hw/xfree86/common/xf86DPMS.c b/hw/xfree86/common/xf86DPMS.c index 5ee5e24..889e05d 100644 --- a/hw/xfree86/common/xf86DPMS.c +++ b/hw/xfree86/common/xf86DPMS.c @@ -160,7 +160,8 @@ DPMSSet(ClientPtr client, int level) rc = dixSaveScreens(client, SCREEN_SAVER_FORCER, ScreenSaverActive); if (rc != Success) return rc; - } + } else + dixSaveScreens(client, SCREEN_SAVER_FORCER, ScreenSaverReset); /* For each screen, set the DPMS level */ for (i = 0; i < xf86NumScreens; i++) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org