Upstream patch from Matti Hamalainen <ccr@tnsp.org> allows unusual USE-flag combination of icecast without vorbis, closes bug #274309 by Diego E. 'Flameeyes' Pettenò <flameeyes@gentoo.org>. No revision bump, just a build fix. Marking stable on AMD64 as there have been no significant bugs reported for this package. Tested on a Core2 Duo with Realtek ALC226 @ ICH9M HD-Audio.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 46 insertions, 12 deletions

diff --git a/media-plugins/audacious-plugins/ChangeLog b/media-plugins/audacious-plugins/ChangeLog
index 5daa17f088ae..2bc3fe73d992 100644
--- a/media-plugins/audacious-plugins/ChangeLog
+++ b/media-plugins/audacious-plugins/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-plugins/audacious-plugins
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.114 2009/06/16 14:04:09 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.115 2009/06/17 12:07:28 chainsaw Exp $
+
+  17 Jun 2009; <chainsaw@gentoo.org>
+  +files/2.0.1-icecast-flawed-vorbis-enum.patch,
+  audacious-plugins-2.0.1.ebuild:
+  Upstream patch from Matti Hamalainen <ccr@tnsp.org> allows unusual
+  USE-flag combination of icecast without vorbis, closes bug #274309 by
+  Diego E. 'Flameeyes' Pettenò <flameeyes@gentoo.org>. No revision bump,
+  just a build fix. Marking stable on AMD64 as there have been no
+  significant bugs reported for this package. Tested on a Core2 Duo with
+  Realtek ALC226 @ ICH9M HD-Audio.
 
 *audacious-plugins-2.1_alpha1 (16 Jun 2009)
 
diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index f5552b934f6f..dd7585613a2e 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -3,6 +3,7 @@ Hash: SHA1
 
 AUX 1.5.1-libmtp-0.3.0-API.patch 1936 RMD160 5a02b522df61e0dc32db13ab18d825ad1289b03f SHA1 1bfe2256f7f30703b39c98e9a3d815d89f22e9f2 SHA256 9e4154cfd8ae19a9525e7c5429ade2f5f049cc263fcb421ebc1ed208baf8d619
 AUX 1.5.1-missing-include.patch 376 RMD160 ae09acafa32c52696d4d8cec79636cfa17eee87e SHA1 fee2cdfeecac269c5ae6c32bf1eaff14de281c13 SHA256 fc91c4cf6b8d70d8a81e5744abdd3c19b6eaf6f76332a6b782e2ecb62389ea59
+AUX 2.0.1-icecast-flawed-vorbis-enum.patch 578 RMD160 297eefc31bb4435a8d19136233aeaeb78d25343a SHA1 b928760a5d9edc56e77a65935cf5bca524b816b9 SHA256 7b9164e054c7e284930ae1ae7bd9a9c1e7d6254af9d35a58fbe8a0965b4d203a
 DIST audacious-plugins-1.4.4.tgz 3174204 RMD160 2625263c76f806d99973d6726a5e794b550778c8 SHA1 157e760e8b7731dd548fe988a99706e4893e4c05 SHA256 31fcb553eb81f9bcd5e66c7c4a8ba392db6ced2397295663ea1523e6d286d663
 DIST audacious-plugins-1.4.5.tgz 3176785 RMD160 6aeca88ce90082f4c028e43f2b572398cce7b056 SHA1 9ee0244526f7a2c6bc48f8ca903f4604a1155b43 SHA256 5ffe377f6df0b701c8a7de7bb63c1ba1951b0a1b0f95a8841765b39204e64d07
 DIST audacious-plugins-1.5.0.tgz 2961507 RMD160 0a44cdd99819b9769b5b260dc41d546278a64039 SHA1 7cd157b0663674e6c271cb0353fb91e068f91f7e SHA256 566bc8cb73967f85fc08cb9d6de90fd4e066fa7fa137614b3c71a93eadaf6552
@@ -16,14 +17,14 @@ EBUILD audacious-plugins-1.5.1-r1.ebuild 3114 RMD160 6aac54bfcc9836f9aa56577978f
 EBUILD audacious-plugins-1.5.1-r2.ebuild 3320 RMD160 33ec5b194625584203310c6c46ef7c4ff01813af SHA1 f11277ccfbc9b6bb96038d4f78b4cbeb041ea4b0 SHA256 82f128ed331f224e1ce033a4a1cc777cf68a6480e8bef3563119ce402bf14065
 EBUILD audacious-plugins-1.5.1-r3.ebuild 3345 RMD160 5f966da48fdba4bc70ce1feb1dea5836c4969773 SHA1 1c23f90575ac5737893dfe873fd706dbd6b9000b SHA256 031b9a34c94295d868b4165ab6cb788d137aad1d349bf2172478557b77ac7587
 EBUILD audacious-plugins-1.5.1.ebuild 2919 RMD160 4181d5605b803f7f4e9320d5cd2fe535d948a06a SHA1 dc2408af6fbfebe33284c95f15de22527452996d SHA256 87d14452e1b5afbe160633257128a6e6bab3508e02f12122d65b9889545cc54a
-EBUILD audacious-plugins-2.0.1.ebuild 3366 RMD160 99accaf2c32308932b5fd84fc5d915aae99625cf SHA1 708646a4f24a9c4ef6883b291bd2d0d37a2ca604 SHA256 c8604f1e775c83a84a677834c4117f4069d2a4b219716d2fc2ce6a6170d1f381
+EBUILD audacious-plugins-2.0.1.ebuild 3315 RMD160 f5b994ee404a3a3f33694c3ac75a37b94f117f71 SHA1 3d8d1db77ad0671529675c4ef4f6a97164f4ad36 SHA256 f1ab68cb57a2b6f88b03149fb27e0a1f048e13418ac4a0a02318e95993bbce95
 EBUILD audacious-plugins-2.1_alpha1.ebuild 3411 RMD160 593fa1abd50788f138a5f7f3767f7d08b4d0fcb3 SHA1 2c5e545cea989cbcba48899a1eddb6fb7137d5d3 SHA256 8dd8c25c768f0f582423d1bc0c5879e0984a1f11713ff63bcb1e19775cfe76e6
-MISC ChangeLog 23921 RMD160 f0a92c5e8bf73f00989336f3319e38071d230932 SHA1 114abe34c6aaab4e0c93fd03a40469fa0ae90155 SHA256 b1d19f03b5712cb61ff26f54e234bd004d6cc3efe3ceb8e6ae0e742389a3f298
+MISC ChangeLog 24431 RMD160 f5267b8c66bd58353dd9c6aef3a1bbc598da1795 SHA1 a0e9683964cb7c7ef2564f348f066c9b3c3ab68f SHA256 ca92b8b2f72aeb04b74b353351c225ce4884521208dccf63fcad3450f54ff2b5
 MISC metadata.xml 995 RMD160 4f335ce5ec797fde2d14288575e8ebe8359c15aa SHA1 2037d8e8601216cf05ff8218ec13ac90d39bd5cb SHA256 5d24a7ec85edfd9a1156b2b3d6745fe125dbef85a26a8f7e7989de862513b0fa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAko3plYACgkQp5vW4rUFj5oaOACeNXWsFEYXQEevrklNW2Glv9lj
-BsUAoLBc98RlXFbO+0973/+Lp9ivUKCY
-=zC3w
+iEYEARECAAYFAko43HoACgkQp5vW4rUFj5rjqgCdExBG0zIriF3BplTeK0fpBQ8N
+FEkAn2s+mx4craCpY53zEROo7ncOx8Ev
+=uk4Q
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/audacious-plugins/audacious-plugins-2.0.1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-2.0.1.ebuild
index be07be49a153..53923390b7a0 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-2.0.1.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-2.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-2.0.1.ebuild,v 1.2 2009/05/24 15:43:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-2.0.1.ebuild,v 1.3 2009/06/17 12:07:28 chainsaw Exp $
 
 inherit eutils flag-o-matic
 
@@ -12,7 +12,7 @@ SRC_URI="http://distfiles.atheme.org/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="adplug alsa cdaudio esd flac gnome icecast ipv6 jack lirc mp3 mtp musepack
 nls oss projectm pulseaudio scrobbler sdl sid sndfile sse2 timidity tta vorbis wavpack wma"
 
@@ -59,11 +59,13 @@ mp3_warning() {
 	fi
 }
 
-src_compile() {
-	# This is masked in the portage tree, so I'll save you the
-	# popup. Be good, bugs go upstream and we like patches.
-	append-flags -DNOT_ALPHA_RELEASE
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PV}-icecast-flawed-vorbis-enum.patch"
+}
 
+src_compile() {
 	mp3_warning
 
 	econf \
diff --git a/media-plugins/audacious-plugins/files/2.0.1-icecast-flawed-vorbis-enum.patch b/media-plugins/audacious-plugins/files/2.0.1-icecast-flawed-vorbis-enum.patch
new file mode 100644
index 000000000000..925ca623e00b
--- /dev/null
+++ b/media-plugins/audacious-plugins/files/2.0.1-icecast-flawed-vorbis-enum.patch
@@ -0,0 +1,21 @@
+
+# HG changeset patch
+# User Matti Hamalainen <ccr@tnsp.org>
+# Date 1245161877 -10800
+# Node ID c41b5966778fce4eb9b15e0c5ee262c7ff1758fb
+# Parent  54c7d2087c8af9e01430a907675cb066f0b30b61
+Default to '0' instead of enum value VORBIS, which may not be defined if
+Vorbis support is not compiled in.
+
+--- a/src/icecast/icecast.c	Tue Jun 16 08:15:49 2009 -0500
++++ b/src/icecast/icecast.c	Tue Jun 16 17:17:57 2009 +0300
+@@ -52,7 +52,7 @@
+     streamformat_MAX
+ };
+ 
+-static gint streamformat = VORBIS;
++static gint streamformat = 0;
+ 
+ static unsigned int streamformat_shout[] =
+ {
+