Allow opening of more than one file from file managers. Fix volume control key bindings. Don't lock screen when playing video files.

(Portage version: 2.1.5_rc7)
 (Unsigned Manifest commit)

5 files changed, 126 insertions, 1 deletions

diff --git a/media-video/xfmedia/Manifest b/media-video/xfmedia/Manifest
index 7340c4e3ab0e..761a3801ccb5 100644
--- a/media-video/xfmedia/Manifest
+++ b/media-video/xfmedia/Manifest
@@ -1,4 +1,9 @@
+AUX 0.9.2/03_all_fix_volume_steps.patch 1365 RMD160 ddc4494320cd9b44daea8f669fc92177ec47ef34 SHA1 b801184ebb97ded004fa0411f5f236cfadf15d2d SHA256 53c6fe7c0e00fe1c23ca2ef362c55f498d6352a05fda579690f154b18b171714
+AUX 0.9.2/04_all_permit-multiple-filenames-on-remote-Exec.patch 417 RMD160 13f74b92fd03c987b669794ddab66692d1ab2949 SHA1 09ba63373616735212c261e9c93bd62450288e40 SHA256 22db35664a4b16673376c01a87e4836681281dcca89e09c302b8ee7a75a9aad7
+AUX 0.9.2/05_all_dont-lock-display.patch 2037 RMD160 a17786e076c0917ea594efb23560b2c54a297c7b SHA1 888707d2d46959724e81fb725a3308a9c46897bb SHA256 727415b2772502d6a5461c6c1ff052cdbbbea3d449989f5354143cbc98cf17ec
+AUX 0.9.2/06_all_correct-desktop-file.patch 1652 RMD160 dab78152efd51c08125e39f9d84ccaa15ce23e96 SHA1 f29ddbc585d8d91d7275f9bf4626387b83d90b46 SHA256 58cbb68085955b2beabf27249f2dd0a881487d9fddf8c4a656cde79b0ebd9e8a
 DIST xfmedia-0.9.2.tar.bz2 893228 RMD160 e1d16fe50609475f916594f2b6a885cfed6251e0 SHA1 cb8d39f2a4ee6a6164f722162fa45004770a7605 SHA256 451b67541527cde7f96693fa1ef7776eb03ac40edcef3023bfb2c1ebcf3e7e0c
 EBUILD xfmedia-0.9.2-r1.ebuild 1542 RMD160 61c5f0af86b651110a1fa293b3f692079a366359 SHA1 a25ec4b89ee258580894517ddbcbf63ff67868bb SHA256 bcbf1b370236f2acfb21c38d8dd42e1567d5d882699afbe9428f00543eb93a8b
-MISC ChangeLog 2853 RMD160 4cf475a0ce1f0e2c71dcb6f32944a6d6a09b701e SHA1 35bf2d029fc2ff2476a8e3a48b6525eba6f7cf66 SHA256 24affdc3f3dfbf71697e8e65d1c54289c26de9bae03a49a24bedfffa00c8cf84
+EBUILD xfmedia-0.9.2-r2.ebuild 1641 RMD160 bc595b8126b66c34157dadeb75c5525132bf19e6 SHA1 62e529ca9e40054f3824777550dfd7a123ecec99 SHA256 d9f1f782b74a98379bc34b5641ebc031dc81c61e63cd687da7f60c3db0729963
+MISC ChangeLog 3312 RMD160 f43ed6df7875a7c99b558566629a8b5d97a795e8 SHA1 81b3a66536f84e4fa25f0d122dfb3637da88be80 SHA256 d7d9c8dc14c245b9e99e1f3c4d477dbd0cc9450b22efc56f942baf2831d512ad
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
diff --git a/media-video/xfmedia/files/0.9.2/03_all_fix_volume_steps.patch b/media-video/xfmedia/files/0.9.2/03_all_fix_volume_steps.patch
new file mode 100644
index 000000000000..65dee6eb62cb
--- /dev/null
+++ b/media-video/xfmedia/files/0.9.2/03_all_fix_volume_steps.patch
@@ -0,0 +1,40 @@
+--- src/trayicon.c.old	2006-11-27 08:21:23.000000000 +0100
++++ src/trayicon.c	2006-11-27 22:06:07.000000000 +0100
+@@ -121,7 +121,7 @@
+     if(evt->direction == GDK_SCROLL_UP) {
+         gint volume = xfmedia_xine_get_param(mwin->xfx,
+                                              XINE_PARAM_AUDIO_VOLUME);
+-        volume += 2;
++        volume += 3;
+         if(volume > 100)
+ 	      volume = 100;
+         xfmedia_xine_set_param(mwin->xfx, XINE_PARAM_AUDIO_VOLUME, volume);
+@@ -130,7 +130,7 @@
+     } else if(evt->direction == GDK_SCROLL_DOWN) {
+         gint volume = xfmedia_xine_get_param(mwin->xfx,
+                                              XINE_PARAM_AUDIO_VOLUME);
+-        volume -= 2;
++        volume -= 3;
+         if(volume < 0)
+ 	        volume = 0;
+         xfmedia_xine_set_param(mwin->xfx, XINE_PARAM_AUDIO_VOLUME, volume);
+--- src/xfmedia-keybindings.c.old	2006-11-27 08:21:23.000000000 +0100
++++ src/xfmedia-keybindings.c	2006-11-27 22:06:21.000000000 +0100
+@@ -430,7 +430,7 @@
+ {
+     gint volume = xfmedia_xine_get_param(mwin->xfx, XINE_PARAM_AUDIO_VOLUME);
+     
+-    volume += 2;
++    volume += 3;
+     if(volume > 100)
+         volume = 100;
+     
+@@ -441,7 +441,7 @@
+ {
+     gint volume = xfmedia_xine_get_param(mwin->xfx, XINE_PARAM_AUDIO_VOLUME);
+     
+-    volume -= 2;
++    volume -= 3;
+     if(volume < 0)
+         volume = 0;
+     
diff --git a/media-video/xfmedia/files/0.9.2/04_all_permit-multiple-filenames-on-remote-Exec.patch b/media-video/xfmedia/files/0.9.2/04_all_permit-multiple-filenames-on-remote-Exec.patch
new file mode 100644
index 000000000000..770e90c59686
--- /dev/null
+++ b/media-video/xfmedia/files/0.9.2/04_all_permit-multiple-filenames-on-remote-Exec.patch
@@ -0,0 +1,14 @@
+--- xfmedia.desktop.in.old	2006-11-27 08:21:25.000000000 +0100
++++ xfmedia.desktop.in	2007-03-23 16:52:20.000000000 +0100
+@@ -14,9 +14,9 @@
+ Actions=Enqueue;Enqueue and Play;
+ 
+ [Desktop Action Enqueue]
+-Exec=xfmedia-remote -a %f
++Exec=xfmedia-remote -a %F
+ _Name=Enqueue in Xfmedia
+ 
+ [Desktop Action Enqueue and Play]
+-Exec=xfmedia-remote -p -a %f
++Exec=xfmedia-remote -p -a %F
+ _Name=Enqueue and play with Xfmedia
diff --git a/media-video/xfmedia/files/0.9.2/05_all_dont-lock-display.patch b/media-video/xfmedia/files/0.9.2/05_all_dont-lock-display.patch
new file mode 100644
index 000000000000..e3165c5b2d3b
--- /dev/null
+++ b/media-video/xfmedia/files/0.9.2/05_all_dont-lock-display.patch
@@ -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) {
diff --git a/media-video/xfmedia/files/0.9.2/06_all_correct-desktop-file.patch b/media-video/xfmedia/files/0.9.2/06_all_correct-desktop-file.patch
new file mode 100644
index 000000000000..a8682aaf23ce
--- /dev/null
+++ b/media-video/xfmedia/files/0.9.2/06_all_correct-desktop-file.patch
@@ -0,0 +1,14 @@
+--- xfmedia-0.9.2/xfmedia.desktop.in.orig	2006-11-27 08:21:25.000000000 +0100
++++ xfmedia-0.9.2/xfmedia.desktop.in	2007-12-08 22:05:59.000000000 +0100
+@@ -8,9 +8,9 @@
+ TryExec=xfmedia
+ Icon=xfmedia
+ Terminal=false
+-Categories=X-XFCE;Application;AudioVideo;AudioPlayer;VideoPlayer;
++Categories=X-XFCE;AudioVideo;Player;
+ StartupNotify=true
+-MimeType=application/x-annodex;audio/x-ogg;audio/x-speex;application/x-ogg;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wma;application/vnd.ms-asf;application/x-mplayer2;video/x-ms-asf-plugin;video/x-ms-wvx;video/x-ms-wax;audio/x-aiff;audio/aiff;audio/x-pn-aiff;audio/x-realaudio;audio/basic;audio/x-basic;audio/x-pn-au;audio/x-wav;audio/wav;audio/x-pn-wav;audio/x-pn-windows-acm;video/msvideo;video/x-msvideo;video/quicktime;video/x-quicktime;audio/x-m4a;application/x-quicktimeplayer;video/x-flic;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;audio/x-real-audio;application/vnd.rn-realmedia;video/mkv;audio/x-8svx;audio/8svx;audio/x-16sv;audio/168sv;image/x-ilbm;image/ilbm;video/x-anim;video/anim;video/mpeg;video/x-mpeg;audio/mpeg2;audio/x-mpeg2;audio/mpeg3;audio/x-mpeg3;audio/mpeg;audio/x-mpeg;audio/x-mpegurl;audio/mpegurl;audio/mp3;audio/x-mp3;application/x-flac;audio/x-flac;
++MimeType=audio/ogg;audio/x-speex;application/ogg;video/x-ms-asf;video/x-ms-wmv;audio/x-aiff;audio/vnd.rn-realaudio;audio/basic;audio/x-wav;video/x-msvideo;video/quicktime;application/x-quicktime-media-link;video/x-flic;application/vnd.rn-realmedia;image/x-ilbm;video/x-anim;video/mpeg;audio/mpeg;audio/x-mpegurl;audio/x-mp3-playlist;audio/x-flac+off;audio/x-flac;
+ Actions=Enqueue;Enqueue and Play;
+ 
+ [Desktop Action Enqueue]