Backported playlist transparency fix from upstream (by nhjm449), closes bug #146276 by Peter Volkov Alexandrovich <pva@gentoo.org>. Also backported my resume robustness patch from upstream.

(Portage version: 2.1.1)

5 files changed, 170 insertions, 1 deletions

diff --git a/media-sound/audacious/ChangeLog b/media-sound/audacious/ChangeLog
index 61ba9d450337..88b564a6276e 100644
--- a/media-sound/audacious/ChangeLog
+++ b/media-sound/audacious/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-sound/audacious
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/ChangeLog,v 1.72 2006/09/04 05:03:08 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/ChangeLog,v 1.73 2006/09/13 11:58:29 chainsaw Exp $
+
+*audacious-1.1.2-r1 (13 Sep 2006)
+
+  13 Sep 2006; Tony Vroon <chainsaw@gentoo.org>
+  +files/1.1.2-fix-playlist-transparency.patch,
+  +files/1.1.2-robust-resume.patch, +audacious-1.1.2-r1.ebuild:
+  Backported playlist transparency fix from upstream (by nhjm449), closes bug
+  #146276 by Peter Volkov Alexandrovich <pva@gentoo.org>. Also backported my
+  resume robustness patch from upstream.
 
   04 Sep 2006; Joshua Kinard <kumba@gentoo.org> audacious-1.1.2.ebuild:
   Marked stable on mips.
diff --git a/media-sound/audacious/audacious-1.1.2-r1.ebuild b/media-sound/audacious/audacious-1.1.2-r1.ebuild
new file mode 100644
index 000000000000..d46e8c678a7e
--- /dev/null
+++ b/media-sound/audacious/audacious-1.1.2-r1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-1.1.2-r1.ebuild,v 1.1 2006/09/13 11:58:29 chainsaw Exp $
+
+inherit flag-o-matic
+
+DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
+HOMEPAGE="http://audacious-media-player.org/"
+SRC_URI="http://audacious-media-player.org/release/${P}.tgz
+	mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="aac alsa arts chardet esd flac gnome jack lirc mmx modplug mp3 musepack nls oss sid sndfile timidity vorbis wma"
+
+RDEPEND="app-arch/unzip
+	net-misc/curl
+	media-libs/musicbrainz
+	>=x11-libs/gtk+-2.6
+	>=gnome-base/libglade-2.3.1
+	>=dev-cpp/libbinio-1.4
+	media-libs/taglib
+	alsa? ( >=media-libs/alsa-lib-1.0.9_rc2 )
+	arts? ( kde-base/arts )
+	esd? ( >=media-sound/esound-0.2.30 )
+	flac? ( >=media-libs/libvorbis-1.0
+		>=media-libs/flac-1.1.2 )
+	gnome? ( >=gnome-base/gconf-2.6.0 )
+	jack? ( >=media-libs/bio2jack-0.4
+		media-libs/libsamplerate
+		media-sound/jack-audio-connection-kit )
+	lirc? ( app-misc/lirc )
+	modplug? ( media-libs/libmodplug )
+	musepack? ( media-libs/libmpcdec )
+	sid? ( media-libs/libsidplay )
+	sndfile? ( media-libs/libsndfile )
+	timidity? ( media-sound/timidity++ )
+	vorbis? ( >=media-libs/libvorbis-1.0
+		  >=media-libs/libogg-1.0 )"
+DEPEND="${RDEPEND}
+	nls? ( dev-util/intltool )
+	>=dev-util/pkgconfig-0.9.0"
+
+mp3_warning() {
+	if ! useq mp3 ; then
+		echo
+		ewarn "MP3 support is now optional, you may want to enable the mp3 USE-flag"
+		echo
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/1.1.2-fix-playlist-transparency.patch
+	epatch ${FILESDIR}/1.1.2-robust-resume.patch
+}
+
+src_compile() {
+	mp3_warning
+
+	# Bug #42893
+	replace-flags "-Os" "-O2"
+	# Bug #86689
+	is-flag "-O*" || append-flags -O
+
+	econf \
+		--with-dev-dsp=/dev/sound/dsp \
+		--with-dev-mixer=/dev/sound/mixer \
+		$(use_enable mmx simd) \
+		$(use_enable gnome gconf) \
+		$(use_enable vorbis) \
+		$(use_enable esd) \
+		$(use_enable mp3) \
+		$(use_enable nls) \
+		$(use_enable oss) \
+		$(use_enable alsa) \
+		$(use_enable arts) \
+		$(use_enable flac) \
+		$(use_enable aac) \
+		$(use_enable modplug) \
+		$(use_enable lirc) \
+		$(use_enable sndfile) \
+		$(use_enable wma) \
+		$(use_enable sid) \
+		$(use_enable musepack) \
+		$(use_enable jack) \
+		$(use_enable timidity) \
+		$(use_enable chardet) \
+		|| die
+
+	emake || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS NEWS README
+
+	# Gentoo_ice skin installation; bug #109772
+	insinto /usr/share/audacious/Skins/gentoo_ice
+	doins "${WORKDIR}"/gentoo_ice/*
+	docinto gentoo_ice
+	dodoc "${WORKDIR}"/README
+}
+
+pkg_postinst() {
+	mp3_warning
+}
diff --git a/media-sound/audacious/files/1.1.2-fix-playlist-transparency.patch b/media-sound/audacious/files/1.1.2-fix-playlist-transparency.patch
new file mode 100644
index 000000000000..8389bee82cd4
--- /dev/null
+++ b/media-sound/audacious/files/1.1.2-fix-playlist-transparency.patch
@@ -0,0 +1,24 @@
+Index: trunk/audacious/widgets/playlist_list.c
+===================================================================
+--- audacious/playlist_list.c	(revision 2158)
++++ audacious/playlist_list.c	(revision 2159)
+@@ -108,10 +108,16 @@
+ 
+ 	gdk_error_trap_pop();
+ 
+-	shade_gdkimage_generic(gdk_drawable_get_visual(GDK_WINDOW(playlistwin->window)),
+-		ximg, ximg->bpl, w, h, 60, 60, 60, shade_color->pixel);
++	if (GDK_IS_IMAGE(ximg))
++	{
++		shade_gdkimage_generic(gdk_drawable_get_visual(GDK_WINDOW(playlistwin->window)),
++			ximg, ximg->bpl, w, h, 60, 60, 60, shade_color->pixel);
+ 
+-	gdk_draw_image(p, gc, ximg, 0, 0, x, y, w, h);
++		gdk_draw_image(p, gc, ximg, 0, 0, x, y, w, h);
++	}
++	else {
++		cfg.playlist_transparent = FALSE;
++	}
+ 
+ 	g_object_unref(gc);
+ 
diff --git a/media-sound/audacious/files/1.1.2-robust-resume.patch b/media-sound/audacious/files/1.1.2-robust-resume.patch
new file mode 100644
index 000000000000..53e9f9b1af56
--- /dev/null
+++ b/media-sound/audacious/files/1.1.2-robust-resume.patch
@@ -0,0 +1,21 @@
+--- trunk/audacious/main.c	2006/09/08 05:26:54	2239
++++ trunk/audacious/main.c	2006/09/10 01:04:36	2255
+@@ -1127,12 +1127,15 @@
+ 	has_x11_connection = TRUE;
+ 
+ 	if (cfg.resume_playback_on_startup) {
+-		if (cfg.resume_playback_on_startup_time != -1) {
++		if (cfg.resume_playback_on_startup_time != -1 && playlist_get_length() > 0) {
++			int i;
+ 			while (gtk_events_pending()) gtk_main_iteration();
+ 			bmp_playback_initiate();
+-			g_usleep(10000);	/* XXX: musepack and others need this! */
+-			while (!ip_data.playing)
++			for (i = 0; i < 8; i++) {
+ 				g_usleep(10000);
++				if (!ip_data.playing)
++					break;
++			}
+ 			bmp_playback_seek(cfg.resume_playback_on_startup_time /
+ 					  1000);
+ 		}
diff --git a/media-sound/audacious/files/digest-audacious-1.1.2-r1 b/media-sound/audacious/files/digest-audacious-1.1.2-r1
new file mode 100644
index 000000000000..f5a998a9027a
--- /dev/null
+++ b/media-sound/audacious/files/digest-audacious-1.1.2-r1
@@ -0,0 +1,6 @@
+MD5 14aba1f9c42a48afeeb6ce5dcaf180c6 audacious-1.1.2.tgz 3394364
+RMD160 920cb247dc1e583364cfac9cc8f1f0c39c37550e audacious-1.1.2.tgz 3394364
+SHA256 54f8f9e10e9a20a0a77e9d063708cd4bd572576ea9b36b9b1bb3ea3cbeaa1a81 audacious-1.1.2.tgz 3394364
+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