Version bump and cleanups.

(Portage version: 2.2.0_alpha108/cvs/Linux i686)

3 files changed, 161 insertions, 1 deletions

diff --git a/media-sound/audacious/ChangeLog b/media-sound/audacious/ChangeLog
index 63153ff7746d..16c5813b9f29 100644
--- a/media-sound/audacious/ChangeLog
+++ b/media-sound/audacious/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/audacious
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/ChangeLog,v 1.264 2012/05/24 02:16:35 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/ChangeLog,v 1.265 2012/05/27 21:00:17 jdhore Exp $
+
+*audacious-3.2.3 (27 May 2012)
+
+  27 May 2012; Jeff Horelick <jdhore@gentoo.org> +audacious-3.2.3.ebuild,
+  +files/audacious-3.2.3-fix-mutex.patch:
+  Version bump and cleanups.
 
   24 May 2012; Jeff Horelick <jdhore@gentoo.org> audacious-3.2.2-r1.ebuild:
   marked x86 per bug 417143
diff --git a/media-sound/audacious/audacious-3.2.3.ebuild b/media-sound/audacious/audacious-3.2.3.ebuild
new file mode 100644
index 000000000000..93cf15410754
--- /dev/null
+++ b/media-sound/audacious/audacious-3.2.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-3.2.3.ebuild,v 1.1 2012/05/27 21:00:17 jdhore Exp $
+
+EAPI=4
+inherit eutils
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
+HOMEPAGE="http://audacious-media-player.org/"
+SRC_URI="http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2
+	 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+IUSE="chardet +gtk gtk3 nls session"
+
+RDEPEND=">=dev-libs/dbus-glib-0.60
+	>=dev-libs/glib-2.16
+	dev-libs/libxml2
+	>=x11-libs/cairo-1.2.6
+	>=x11-libs/pango-1.8.0
+	gtk? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	session? ( x11-libs/libSM )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	chardet? ( >=app-i18n/libguess-1.1 )
+	nls? ( dev-util/intltool )"
+
+PDEPEND=">=media-plugins/audacious-plugins-3.2.3"
+REQUIRED_USE="^^ ( gtk gtk3 )"
+
+src_prepare() {
+	epatch "$FILESDIR"/${P}-fix-mutex.patch
+}
+
+src_configure() {
+	# D-Bus is a mandatory dependency, remote control,
+	# session management and some plugins depend on this.
+	# Building without D-Bus is *unsupported* and a USE-flag
+	# will not be added due to the bug reports that will result.
+	# Bugs #197894, #199069, #207330, #208606
+	# Use of GTK+2 causes plugin build failures, bug #384185
+	econf \
+		--enable-dbus \
+		$(use_enable gtk3) \
+		$(use_enable chardet) \
+		$(use_enable nls) \
+		$(use_enable session sm)
+}
+
+src_install() {
+	default
+	dodoc AUTHORS README
+
+	# Gentoo_ice skin installation; bug #109772
+	insinto /usr/share/audacious/Skins/gentoo_ice
+	doins "${WORKDIR}"/gentoo_ice/*
+	docinto gentoo_ice
+	dodoc "${WORKDIR}"/README
+}
diff --git a/media-sound/audacious/files/audacious-3.2.3-fix-mutex.patch b/media-sound/audacious/files/audacious-3.2.3-fix-mutex.patch
new file mode 100644
index 000000000000..3fb209196f83
--- /dev/null
+++ b/media-sound/audacious/files/audacious-3.2.3-fix-mutex.patch
@@ -0,0 +1,89 @@
+commit b53935921298b8164f80454c2016bd40de29704b
+Author: John Lindgren <john.lindgren@aol.com>
+Date:   Sat May 26 11:55:42 2012 -0400
+
+    Fix violation of mutex locking order (playback then playlist). Found by Helgrind.
+
+diff --git a/src/audacious/playlist-new.c b/src/audacious/playlist-new.c
+index 6407f64..596fbaa 100644
+--- a/src/audacious/playlist-new.c
++++ b/src/audacious/playlist-new.c
+@@ -822,6 +822,7 @@ void playlist_reorder (int from, int to, int count)
+ 
+ void playlist_delete (int playlist_num)
+ {
++    /* stop playback before locking playlists */
+     if (playback_get_playing () && playlist_num == playlist_get_playing ())
+         playback_stop ();
+ 
+@@ -969,6 +970,7 @@ int playlist_get_active (void)
+ 
+ void playlist_set_playing (int playlist_num)
+ {
++    /* stop playback before locking playlists */
+     if (playback_get_playing ())
+         playback_stop ();
+ 
+@@ -1112,6 +1114,7 @@ void playlist_entry_insert_batch_raw (int playlist_num, int at,
+ 
+ void playlist_entry_delete (int playlist_num, int at, int number)
+ {
++    /* stop playback before locking playlists */
+     if (playback_get_playing () && playlist_num == playlist_get_playing () &&
+      playlist_get_position (playlist_num) >= at && playlist_get_position
+      (playlist_num) < at + number)
+@@ -1225,6 +1228,7 @@ int playlist_entry_get_length (int playlist_num, int entry_num, bool_t fast)
+ 
+ void playlist_set_position (int playlist_num, int entry_num)
+ {
++    /* stop playback before locking playlists */
+     if (playback_get_playing () && playlist_num == playlist_get_playing ())
+         playback_stop ();
+ 
+@@ -1423,6 +1427,7 @@ int playlist_shift (int playlist_num, int entry_num, int distance)
+ 
+ void playlist_delete_selected (int playlist_num)
+ {
++    /* stop playback before locking playlists */
+     if (playback_get_playing () && playlist_num == playlist_get_playing () &&
+      playlist_get_position (playlist_num) >= 0 && playlist_entry_get_selected
+      (playlist_num, playlist_get_position (playlist_num)))
+@@ -2023,6 +2028,7 @@ static bool_t shuffle_prev (Playlist * playlist)
+ 
+ bool_t playlist_prev_song (int playlist_num)
+ {
++    /* stop playback before locking playlists */
+     if (playback_get_playing () && playlist_num == playlist_get_playing ())
+         playback_stop ();
+ 
+@@ -2110,6 +2116,7 @@ static void shuffle_reset (Playlist * playlist)
+ 
+ bool_t playlist_next_song (int playlist_num, bool_t repeat)
+ {
++    /* stop playback before locking playlists */
+     if (playback_get_playing () && playlist_num == playlist_get_playing ())
+         playback_stop ();
+ 
+@@ -2253,6 +2260,11 @@ int playback_entry_get_end_time (void)
+ 
+ void playlist_save_state (void)
+ {
++    /* get playback state before locking playlists */
++    resume_state = playback_get_playing () ? (playback_get_paused () ?
++     RESUME_PAUSE : RESUME_PLAY) : RESUME_STOP;
++    resume_time = playback_get_playing () ? playback_get_time () : 0;
++
+     ENTER;
+ 
+     char * path = g_strdup_printf ("%s/" STATE_FILE, get_path (AUD_PATH_USER_DIR));
+@@ -2261,10 +2273,6 @@ void playlist_save_state (void)
+     if (! handle)
+         LEAVE_RET_VOID;
+ 
+-    resume_state = playback_get_playing () ? (playback_get_paused () ?
+-     RESUME_PAUSE : RESUME_PLAY) : RESUME_STOP;
+-    resume_time = playback_get_playing () ? playback_get_time () : 0;
+-
+     fprintf (handle, "resume-state %d\n", resume_state);
+     fprintf (handle, "resume-time %d\n", resume_time);
+