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.

Package-Manager: portage-2.1.1

6 files changed, 199 insertions, 5 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/Manifest b/media-sound/audacious/Manifest
index 00ceeb9b0187..a664c5bb2a78 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.1.1-ffwma-asm.diff 471 RMD160 6a3bb116099b0c99081a484210f54d8f6a66f9c9 SHA1 17109fd56c3bd8107abaa78e6b6ac5e72fb3507a SHA256 c41b953be4f3a3060d436a1cbb7bc859a9f7b0173dddc8315a9134c8f2550deb
 MD5 b907827ddaf6c1ad9fa41f1f93567588 files/1.1.1-ffwma-asm.diff 471
 RMD160 6a3bb116099b0c99081a484210f54d8f6a66f9c9 files/1.1.1-ffwma-asm.diff 471
@@ -6,6 +9,14 @@ AUX 1.1.1-remove-15instrument-magic.diff 1168 RMD160 ceccb606ac171c5d42ab02a50ed
 MD5 88cb889d4b67a0701a82ea72de630d86 files/1.1.1-remove-15instrument-magic.diff 1168
 RMD160 ceccb606ac171c5d42ab02a50edebd8f885605c7 files/1.1.1-remove-15instrument-magic.diff 1168
 SHA256 add25e7833dedb6e5ebb5fb3c913b6b2742d36b9544bbf76d1bd34f940ec96cc files/1.1.1-remove-15instrument-magic.diff 1168
+AUX 1.1.2-fix-playlist-transparency.patch 754 RMD160 11c4d50082c97126e987bf17c3f245953537b1aa SHA1 d8eb75f27eeec23570ef5eb14807c6d24949a532 SHA256 9415835c6000339674f5fe2200d5bde6dddbf62d2a4cb931bc5352e919a88384
+MD5 59f49d82d1f7f6b4d0ad187182f00136 files/1.1.2-fix-playlist-transparency.patch 754
+RMD160 11c4d50082c97126e987bf17c3f245953537b1aa files/1.1.2-fix-playlist-transparency.patch 754
+SHA256 9415835c6000339674f5fe2200d5bde6dddbf62d2a4cb931bc5352e919a88384 files/1.1.2-fix-playlist-transparency.patch 754
+AUX 1.1.2-robust-resume.patch 697 RMD160 c5835fce2bf0c2bf5440af68b8ac4d1a5c8f278b SHA1 ec0cdfe95660433593c4973eac0eb4414d513ee2 SHA256 da94b6b5e792cb49477bd6196695a4a49671e6d88680063d9d7e92c6b1c841e9
+MD5 eb6cee8203c226ec7d4d92b0ab86c0f8 files/1.1.2-robust-resume.patch 697
+RMD160 c5835fce2bf0c2bf5440af68b8ac4d1a5c8f278b files/1.1.2-robust-resume.patch 697
+SHA256 da94b6b5e792cb49477bd6196695a4a49671e6d88680063d9d7e92c6b1c841e9 files/1.1.2-robust-resume.patch 697
 DIST audacious-1.1.0.tgz 3365149 RMD160 5825caacd093dabadd16d1f37d7225490e1ce1c9 SHA1 443c68b185381d3ad6c7f053e17aa5345bbc5ba1 SHA256 ac2fcba9020d4ae38c578d9494f99761cddd153b0281570b538d7d3a6af6a4f8
 DIST audacious-1.1.1.tgz 3387162 RMD160 852a2af9ad71fcb9480f32d0581c4864aeaece17 SHA1 89246f0232e6e4d98419268e395a9fc4a40a6ed9 SHA256 11f0079bfedb01ff7248c32065cca7706d0eba75dd3035a0770ed9c42b94b887
 DIST audacious-1.1.2.tgz 3394364 RMD160 920cb247dc1e583364cfac9cc8f1f0c39c37550e SHA1 25087f081054807aa48e3415aae0e1679667a392 SHA256 54f8f9e10e9a20a0a77e9d063708cd4bd572576ea9b36b9b1bb3ea3cbeaa1a81
@@ -22,14 +33,18 @@ EBUILD audacious-1.1.1.ebuild 2644 RMD160 90995eecb27ca934a4fb7c9ca083853f79dd5e
 MD5 9e44c5f7aed278543f5f22efe8e120d0 audacious-1.1.1.ebuild 2644
 RMD160 90995eecb27ca934a4fb7c9ca083853f79dd5e60 audacious-1.1.1.ebuild 2644
 SHA256 af57fe161b17fc538e6a6c70c8136e5b78f19c3043e0e2a71182079d8def7c49 audacious-1.1.1.ebuild 2644
+EBUILD audacious-1.1.2-r1.ebuild 2792 RMD160 185a44b15f25bad06b8743e5eb2e78567eaee997 SHA1 c2a3eecbd2caa27a7546b8fe8203631619b09672 SHA256 c5ae9f815fafac443b4c99ea4fca43191327cb815607af396e6c36b6483f653d
+MD5 32b1526874b647f2da992591cbd4b5b5 audacious-1.1.2-r1.ebuild 2792
+RMD160 185a44b15f25bad06b8743e5eb2e78567eaee997 audacious-1.1.2-r1.ebuild 2792
+SHA256 c5ae9f815fafac443b4c99ea4fca43191327cb815607af396e6c36b6483f653d audacious-1.1.2-r1.ebuild 2792
 EBUILD audacious-1.1.2.ebuild 2718 RMD160 e054764dd3ad4a2fb988cae98b4bc84572b3e423 SHA1 919e6a36c6664f67b4912e7ae55d78837b38c985 SHA256 7ff67342069dfa5f1b135b2beb62baa6696c7453e489c694d45e6ebfd742dac3
 MD5 d7bcfb26afe0f5851d8742d0f2454987 audacious-1.1.2.ebuild 2718
 RMD160 e054764dd3ad4a2fb988cae98b4bc84572b3e423 audacious-1.1.2.ebuild 2718
 SHA256 7ff67342069dfa5f1b135b2beb62baa6696c7453e489c694d45e6ebfd742dac3 audacious-1.1.2.ebuild 2718
-MISC ChangeLog 12247 RMD160 f118eea476f074c77290fc1afe9b152d553e981b SHA1 4f82a734aaa8601d1399e212d12f6f887f7d0baf SHA256 3cf43d4b1c98401868c601d87592ef5d20d80849f08fc4389de40b2fd6f28655
-MD5 aca7874ee9cbc4d7bcfccbb7e4c9bdbc ChangeLog 12247
-RMD160 f118eea476f074c77290fc1afe9b152d553e981b ChangeLog 12247
-SHA256 3cf43d4b1c98401868c601d87592ef5d20d80849f08fc4389de40b2fd6f28655 ChangeLog 12247
+MISC ChangeLog 12642 RMD160 ad3382cbb920b6468ec8cd0a808d25726fe54ca4 SHA1 981af092b77159426d65f623cc4e764b06eccce1 SHA256 be74d6feb562f831ebbd64da40b59a14b3692b3c1563e6e6ab21fc1f949d620f
+MD5 51c12909950f5da56a38616e5c3e6a46 ChangeLog 12642
+RMD160 ad3382cbb920b6468ec8cd0a808d25726fe54ca4 ChangeLog 12642
+SHA256 be74d6feb562f831ebbd64da40b59a14b3692b3c1563e6e6ab21fc1f949d620f ChangeLog 12642
 MISC metadata.xml 248 RMD160 f9de13e16a150195633b055ebe61bb4cea95160d SHA1 4ea80510c4e90c385ac851b4f82c36b4f91d9402 SHA256 6a8ca116bded5cdd92cb700f92acd22b01ae159ef1b69c60a03fc9859bb9b3d6
 MD5 319fe8f45b51a2d31f8d4e9a4071ca10 metadata.xml 248
 RMD160 f9de13e16a150195633b055ebe61bb4cea95160d metadata.xml 248
@@ -46,3 +61,13 @@ SHA256 740da60ce500fcc16e36ea972aed38116e2c3328db451789e91973df79b23c3a files/di
 MD5 c6fde6ad566e03c50022dae6ec667b70 files/digest-audacious-1.1.2 500
 RMD160 c7ee4f2471187e573ee773a6e6013cd02574af32 files/digest-audacious-1.1.2 500
 SHA256 9123102dc3acec65b5306acae63aa0e41673098cc8f7cdbeb04754dcde769bd4 files/digest-audacious-1.1.2 500
+MD5 c6fde6ad566e03c50022dae6ec667b70 files/digest-audacious-1.1.2-r1 500
+RMD160 c7ee4f2471187e573ee773a6e6013cd02574af32 files/digest-audacious-1.1.2-r1 500
+SHA256 9123102dc3acec65b5306acae63aa0e41673098cc8f7cdbeb04754dcde769bd4 files/digest-audacious-1.1.2-r1 500
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFFB/J5p5vW4rUFj5oRAlDCAJwMkQbxN5F3XpQv6SD8QLSY1IDa+gCgphgy
+fL/Wnyl5Ea4uj6DY5kRf+pg=
+=RhpF
+-----END PGP SIGNATURE-----
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