[Pkg-xfce-commits] r1457 - in goodies/xfmedia/debian: . patches

[corsac-guest at alioth.debian.org]

Author: corsac-guest
Date: 2007-12-05 11:42:44 +0000 (Wed, 05 Dec 2007)
New Revision: 1457

Added:
   goodies/xfmedia/debian/patches/05_dont-lock-display.patch
Modified:
   goodies/xfmedia/debian/changelog
   goodies/xfmedia/debian/control
Log:
reorder changelog, and add patch not to lock display when playing videos


Modified: goodies/xfmedia/debian/changelog
===================================================================
--- goodies/xfmedia/debian/changelog	2007-12-05 07:34:48 UTC (rev 1456)
+++ goodies/xfmedia/debian/changelog	2007-12-05 11:42:44 UTC (rev 1457)
@@ -3,17 +3,21 @@
   [ Yves-Alexis Perez ]
   * New upstream release.
   * debian/control:
-   - recommends dbus instead of dbus-1-utils.                   closes: #451453
-   - removed Jani from uploaders as he's not anymore in the team.
-  * debian/patches: 04_permit-multiple-filenames-on-remote-Exec.patch
-   - people can now select multiple file and select "open in xfmedia" from
-   their file manager. Thanks Erich Schubert.                   closes: #415966
-  * debian/control: use ${binary:Version} instead of ${Source-Version} for
-    declaring dependencies between two arch:any packages.
+    - recommends dbus instead of dbus-1-utils.                  closes: #451453
+    - removed Jani from uploaders as he's not anymore in the team.
+    - use ${binary:Version} instead of ${Source-Version} for declaring
+      dependencies between two arch:any packages.
+    - add dependency on libxine1-x.
+  * debian/patches:
+    - added 04_permit-multiple-filenames-on-remote-Exec, people can now select
+      multiple file and select "open in xfmedia" from their file manager.
+      Thanks Erich Schubert.                                    closes: #415966
+    - added 05_dont-lock-display to not lock screen when playing video.
+  * debian/control:
   * debian/menu: switch to new menu policy.
 
   [ Stefan Ott ]
-  * Added a patch to change the volume-step size		closes: #331584
+  * Added a patch to change the volume-step size		        closes: #331584
 
   [ Simon Huggins ]
   * Build against latest libs to avoid version skew on different archs.
@@ -23,7 +27,7 @@
   FIXME this doesn't appear to actually like, er, work?
   * Add Vcs-* headers to debian/control
 
- -- Simon Huggins <huggie at earth.li>  Tue, 27 Nov 2007 17:07:21 +0000
+ -- Yves-Alexis Perez <corsac at debian.org>  Wed, 05 Dec 2007 12:41:50 +0100
 
 xfmedia (0.9.1-6) unstable; urgency=low
 

Modified: goodies/xfmedia/debian/control
===================================================================
--- goodies/xfmedia/debian/control	2007-12-05 07:34:48 UTC (rev 1456)
+++ goodies/xfmedia/debian/control	2007-12-05 11:42:44 UTC (rev 1457)
@@ -11,7 +11,7 @@
 
 Package: xfmedia
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, libxine1-x
 Suggests: dbus
 Description: Xfce media player
  Xfmedia is a lightweight media player for the Xfce Desktop Environment.

Added: goodies/xfmedia/debian/patches/05_dont-lock-display.patch
===================================================================
--- goodies/xfmedia/debian/patches/05_dont-lock-display.patch	                        (rev 0)
+++ goodies/xfmedia/debian/patches/05_dont-lock-display.patch	2007-12-05 11:42:44 UTC (rev 1457)
@@ -0,0 +1,52 @@
+--- src/xfmedia-xine.c.orig	2007-10-25 22:36:47.000000000 +0000
++++ src/xfmedia-xine.c	2007-10-25 22:38:34.000000000 +0000
+@@ -1371,9 +1371,7 @@
+                 XINE_STREAM_INFO_HAS_VIDEO);
+         if((has_video || xfx->priv->vis_plugin_id) && !xfx->priv->video_port) {
+             DBG("creating real vid out driver");
+-            XLockDisplay(xfx->priv->display);
+             xfx->priv->video_port = load_video_out_driver(xfx, NULL);
+-            XUnlockDisplay(xfx->priv->display);
+             if(xfx->priv->video_port) {
+                 xine_post_out_t *vid_src = xine_get_video_source(xfx->priv->stream);
+                 xine_post_wire_video_port(vid_src, xfx->priv->video_port);
+@@ -1926,9 +1924,7 @@
+                     xine_stop(xfx->priv->stream);
+                 }
+                 
+-                XLockDisplay(xfx->priv->display);
+                 xfx->priv->video_port = load_video_out_driver(xfx, NULL);
+-                XUnlockDisplay(xfx->priv->display);
+                 if(xfx->priv->video_port) {
+                     xine_post_out_t *vid_src = xine_get_video_source(xfx->priv->stream);
+                     xine_post_wire_video_port(vid_src, xfx->priv->video_port);
+@@ -2076,13 +2072,11 @@
+         return TRUE;
+     
+     if(xfx->priv->video_port) {
+-        XLockDisplay(xfx->priv->display);
+         new_port = load_video_out_driver(xfx, plugin_id);
+         if(!new_port) {
+             XUnlockDisplay(xfx->priv->display);
+             return FALSE;
+         }
+-        XUnlockDisplay(xfx->priv->display);
+     }
+     
+     g_free(xfx->priv->video_driver_id);
+@@ -2099,7 +2093,6 @@
+         xine_post_out_t *vid_src;
+         xine_video_port_t *old_port;
+         
+-        XLockDisplay(xfx->priv->display);
+         
+         old_port = xfx->priv->video_port;
+         xfx->priv->video_port = new_port;
+@@ -2110,7 +2103,6 @@
+         
+         xine_close_video_driver(xfx->priv->xine, old_port);
+         
+-        XUnlockDisplay(xfx->priv->display);
+     }
+     
+     if(status == XINE_STATUS_PLAY) {