[SCM] mplayer packaging branch, master, updated. debian/1.0.rc3+svn20090426-1-14-g4f38e97

mennucc1 at users.alioth.debian.org mennucc1 at users.alioth.debian.org
Sat Sep 19 18:40:23 UTC 2009


The following commit has been merged in the master branch:
commit 4f38e97d59b338510243d36b4aadbd9dcf4ea72c
Author: A Mennucc <mennucc1 at debian.org>
Date:   Sat Sep 19 20:35:22 2009 +0200

    add explanations inside debian/patches/22disable-xscreensaver.patch
    and also in mplayer.1

diff --git a/debian/patches/22disable-xscreensaver.patch b/debian/patches/22disable-xscreensaver.patch
index a88dc78..559decd 100644
--- a/debian/patches/22disable-xscreensaver.patch
+++ b/debian/patches/22disable-xscreensaver.patch
@@ -1,5 +1,5 @@
 Author: <mennucc1 at debian.org>
-Description: This patch avoids xscreensaver from blanking onto your favorite movie ; it was made by me, based on code posted in mplayer-dev-eng by Adam  Tlałka
+Description: This patch avoids xscreensaver from blanking onto your favorite movie ; it was made by me, based on code posted in mplayer-dev-eng by Adam  Tlałka . It works as follows: when the cursor is inside the MPlayer window, and it is hidden, then the cursor is artificially moved  a bit every 10seconds (+-), so as to disable the screensaver. Of course, it would be a VERY bad idea to move aroundthe cursor when it is in another window (e.g. the user may end up clicking the wrong button)- so it does not work when the cursor is outside the MPlayer window.
 --- a/libvo/x11_common.c
 +++ b/libvo/x11_common.c
 @@ -177,6 +177,9 @@ void vo_x11_ewmh_fullscreen(int action)
@@ -64,3 +64,19 @@ Description: This patch avoids xscreensaver from blanking onto your favorite mov
  }
  
  static int xss_suspend(Bool suspend)
+--- a/DOCS/man/en/mplayer.1
++++ b/DOCS/man/en/mplayer.1
+@@ -3257,10 +3257,12 @@ Specify the screen width for video output drivers which
+ do not know the screen resolution like fbdev, x11 and TV-out.
+ .
+ .TP
+-.B \-stop\-xscreensaver (X11 only)
++.B \-stop\-xscreensaver (X11 , KDE and GNOME only)
+ Turns off xscreensaver at startup and turns it on again on exit.
++Note that the GNOME screensaver is disabled only as long
++as the mouse cursor is kept inside the MPlayer window.
+ If your screensaver supports neither the XSS nor XResetScreenSaver
+ API please use \-heartbeat\-cmd instead.
+ .
+ .TP
+ .B "\-vm \ \ \ "

-- 
mplayer packaging



More information about the pkg-multimedia-commits mailing list