Patch a deadlock observed when both methods of selecting a decoder are disabled.

(Portage version: 2.1.2_rc4-r6)

2 files changed, 52 insertions, 0 deletions

diff --git a/media-sound/audacious/files/1.3.0_alpha1-avoid-decoder-selection-deadlock.patch b/media-sound/audacious/files/1.3.0_alpha1-avoid-decoder-selection-deadlock.patch
new file mode 100644
index 000000000000..5f689e5ade10
--- /dev/null
+++ b/media-sound/audacious/files/1.3.0_alpha1-avoid-decoder-selection-deadlock.patch
@@ -0,0 +1,46 @@
+Index: audacious/playlist.c
+===================================================================
+--- audacious/playlist.c	(revision 3572)
++++ audacious/playlist.c	(working copy)
+@@ -2456,6 +2456,13 @@
+             playlist_get_info_scan_active = FALSE;
+             g_mutex_unlock(mutex_scan);
+         }
++        else /* not on_demand and not on_load...
++                NOTE: this shouldn't happen anymore, sanity check in bmp_config_load now */
++        {
++            g_mutex_lock(mutex_scan);
++            playlist_get_info_scan_active = FALSE;
++            g_mutex_unlock(mutex_scan);
++        }
+ 
+         if (update_playlistwin) {
+             playlistwin_update_list(playlist);
+Index: audacious/ui_main.c
+===================================================================
+--- audacious/ui_main.c	(revision 3572)
++++ audacious/ui_main.c	(working copy)
+@@ -3867,7 +3867,7 @@
+ void
+ action_play_file( void )
+ {
+-  util_run_filebrowser(NO_PLAY_BUTTON);
++  util_run_filebrowser(PLAY_BUTTON);
+ }
+ 
+ void
+Index: audacious/main.c
+===================================================================
+--- audacious/main.c	(revision 3572)
++++ audacious/main.c	(working copy)
+@@ -604,6 +604,10 @@
+ 
+     if (!cfg.session_uri_base)
+         cfg.session_uri_base = g_strdup("");
++
++    /* at least one of these should be true */
++    if ((!cfg.get_info_on_demand) && (!cfg.get_info_on_load))
++        cfg.get_info_on_demand = TRUE;
+ }
+ 
+ 
diff --git a/media-sound/audacious/files/digest-audacious-1.3.0_alpha1-r1 b/media-sound/audacious/files/digest-audacious-1.3.0_alpha1-r1
new file mode 100644
index 000000000000..285723a315dd
--- /dev/null
+++ b/media-sound/audacious/files/digest-audacious-1.3.0_alpha1-r1
@@ -0,0 +1,6 @@
+MD5 037ddc1b36d104af4979b599ba01c32c audacious-1.3.0-alpha1.tgz 1791152
+RMD160 1f12cc2c4def13148b3f5cc233b4663ae2eacc26 audacious-1.3.0-alpha1.tgz 1791152
+SHA256 1dbabe4a6c676194fb3235930e13c5a6e34eb50baf6dff99416a3f9bdf5afdd8 audacious-1.3.0-alpha1.tgz 1791152
+MD5 41eababfa8bad11e9e34e467cdfb86be gentoo_ice-xmms-0.2.tar.bz2 51839
+RMD160 11439cbebf8c6dc5745c8593a79e88303d094544 gentoo_ice-xmms-0.2.tar.bz2 51839
+SHA256 d1be63368b76f4a8b1d5b0e955cd7a77177f56a7f0b828c6603d8fd2836422b1 gentoo_ice-xmms-0.2.tar.bz2 51839