Third release on the 2.4 branch. A timing bug in ALSA Dmix could cause high CPU usage during playback. A workaround is now in place.

(Portage version: 2.1.9.25/cvs/Linux x86_64)

4 files changed, 14 insertions, 134 deletions

diff --git a/media-plugins/audacious-plugins/ChangeLog b/media-plugins/audacious-plugins/ChangeLog
index 18c3f8893422..a856b93c4250 100644
--- a/media-plugins/audacious-plugins/ChangeLog
+++ b/media-plugins/audacious-plugins/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-plugins/audacious-plugins
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.187 2010/11/09 19:51:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.188 2010/12/07 23:26:08 chainsaw Exp $
+
+*audacious-plugins-2.4.2 (07 Dec 2010)
+
+  07 Dec 2010; <chainsaw@gentoo.org> audacious-plugins-2.2-r2.ebuild,
+  -audacious-plugins-2.3.ebuild, -audacious-plugins-2.4_rc3.ebuild,
+  +audacious-plugins-2.4.2.ebuild:
+  Third release on the 2.4 branch. A timing bug in ALSA Dmix could cause high
+  CPU usage during playback. A workaround is now in place.
 
   09 Nov 2010; Jeroen Roovers <jer@gentoo.org>
   audacious-plugins-2.4.0.ebuild:
diff --git a/media-plugins/audacious-plugins/audacious-plugins-2.2-r2.ebuild b/media-plugins/audacious-plugins/audacious-plugins-2.2-r2.ebuild
index 1b05fdadf36b..a204f54bf767 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-2.2-r2.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-2.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.2-r2.ebuild,v 1.14 2010/06/22 20:02:41 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-2.2-r2.ebuild,v 1.15 2010/12/07 23:26:08 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 ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="ppc sparc"
 IUSE="aac adplug alsa aqua bs2b cdda cue esd ffmpeg flac fluidsynth gnome icecast ipv6 jack lame
 lirc midi mp3 mtp nls oss pulseaudio projectm scrobbler sdl sid sndfile sse2 vorbis wavpack"
 
diff --git a/media-plugins/audacious-plugins/audacious-plugins-2.3.ebuild b/media-plugins/audacious-plugins/audacious-plugins-2.3.ebuild
deleted file mode 100644
index 466e95f27d0e..000000000000
--- a/media-plugins/audacious-plugins/audacious-plugins-2.3.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2010 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.3.ebuild,v 1.2 2010/06/22 20:02:41 arfrever Exp $
-
-inherit eutils flag-o-matic
-
-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.atheme.org/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="aac adplug alsa aqua bs2b cdda cue debug esd ffmpeg flac fluidsynth gnome icecast ipv6 jack
-lame lirc midi mp3 mtp nls oss pulseaudio projectm sdl sid sndfile sse2 vorbis wavpack"
-
-RDEPEND="app-arch/unzip
-	>=dev-libs/dbus-glib-0.60
-	dev-libs/libxml2
-	>=media-sound/audacious-2.3
-	>=net-libs/neon-0.26.4
-	>=x11-libs/gtk+-2.14
-	aac? ( >=media-libs/faad2-2.7 )
-	adplug? ( >=dev-cpp/libbinio-1.4 )
-	alsa? ( >=media-libs/alsa-lib-1.0.16 )
-	bs2b? ( media-libs/libbs2b )
-	cdda? ( >=media-libs/libcddb-1.2.1
-		>=dev-libs/libcdio-0.79-r1 )
-	cue? ( media-libs/libcue )
-	esd? ( >=media-sound/esound-0.2.38-r1 )
-	ffmpeg? ( media-video/ffmpeg )
-	flac? ( >=media-libs/libvorbis-1.0
-		>=media-libs/flac-1.2.1-r1 )
-	fluidsynth? ( media-sound/fluidsynth )
-	icecast? ( media-libs/libshout )
-	jack? ( >=media-libs/bio2jack-0.4
-		media-sound/jack-audio-connection-kit )
-	lame? ( media-sound/lame )
-	lirc? ( app-misc/lirc )
-	mp3? ( media-libs/libmad )
-	mtp? ( media-libs/libmtp )
-	projectm? ( >=media-libs/libprojectm-1.2.0
-		>=media-libs/libsdl-1.2.5
-		x11-libs/gtkglext )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
-	sdl? (	>=media-libs/libsdl-1.2.5 )
-	sid? ( >=media-libs/libsidplay-2.1.1-r2 )
-	sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
-	vorbis? ( >=media-libs/libvorbis-1.2.0
-		  >=media-libs/libogg-1.1.3 )
-	wavpack? ( >=media-sound/wavpack-4.50.1-r1 )"
-
-DEPEND="${RDEPEND}
-	nls? ( dev-util/intltool )
-	>=dev-util/pkgconfig-0.9.0"
-
-mp3_warning() {
-	if ! use mp3 ; then
-		ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
-	fi
-}
-
-src_compile() {
-	mp3_warning
-
-	econf \
-		--enable-chardet \
-		--enable-dbus \
-		--enable-modplug \
-		--enable-neon \
-		--disable-projectm \
-		$(use_enable adplug) \
-		$(use_enable aac) \
-		$(use_enable alsa) \
-		$(use_enable alsa bluetooth) \
-		$(use_enable alsa amidiplug-alsa) \
-		$(use_enable aqua coreaudio) \
-		$(use_enable aqua dockalbumart) \
-		$(use_enable bs2b) \
-		$(use_enable cdda cdaudio) \
-		$(use_enable cue) \
-		$(use_enable debug) \
-		$(use_enable esd) \
-		$(use_enable ffmpeg ffaudio) \
-		$(use_enable flac flacng) \
-		$(use_enable fluidsynth amidiplug-flsyn) \
-		$(use_enable flac filewriter_flac) \
-		$(use_enable icecast) \
-		$(use_enable ipv6) \
-		$(use_enable jack) \
-		$(use_enable gnome gnomeshortcuts) \
-		$(use_enable lame filewriter_mp3) \
-		$(use_enable lirc) \
-		$(use_enable mp3) \
-		$(use_enable midi amidiplug) \
-		$(use_enable mtp mtp_up) \
-		$(use_enable nls) \
-		$(use_enable oss) \
-		$(use_enable projectm projectm-1.0) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable sdl paranormal) \
-		$(use_enable sid) \
-		$(use_enable sndfile) \
-		$(use_enable sse2) \
-		$(use_enable vorbis) \
-		$(use_enable vorbis filewriter_vorbis) \
-		$(use_enable wavpack)
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS
-}
-
-pkg_postinst() {
-	mp3_warning
-	einfo "Your bug reports for this beta version should go upstream: http://jira.atheme.org/"
-}
diff --git a/media-plugins/audacious-plugins/audacious-plugins-2.4_rc3.ebuild b/media-plugins/audacious-plugins/audacious-plugins-2.4.2.ebuild
index da2f9f29fdd0..2d0f68726db5 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-2.4_rc3.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-2.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4_rc3.ebuild,v 1.1 2010/08/23 22:15:01 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-2.4.2.ebuild,v 1.1 2010/12/07 23:26:08 chainsaw Exp $
 
 inherit eutils flag-o-matic
 
@@ -13,13 +13,13 @@ SRC_URI="http://distfiles.atheme.org/${MY_P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="aac adplug alsa aqua bs2b cdda cue debug ffmpeg flac fluidsynth gnome ipv6 jack
+IUSE="aac adplug alsa aqua bs2b cdda cue ffmpeg flac fluidsynth gnome ipv6 jack
 lame lirc midi mp3 mtp nls oss pulseaudio scrobbler sdl sid sndfile sse2 vorbis wavpack"
 
 RDEPEND="app-arch/unzip
 	>=dev-libs/dbus-glib-0.60
 	dev-libs/libxml2
-	>=media-sound/audacious-2.4_rc3
+	>=media-sound/audacious-2.4.2
 	>=net-libs/neon-0.26.4
 	>=x11-libs/gtk+-2.14
 	aac? ( >=media-libs/faad2-2.7 )
@@ -78,7 +78,6 @@ src_compile() {
 		$(use_enable bs2b) \
 		$(use_enable cdda cdaudio) \
 		$(use_enable cue) \
-		$(use_enable debug) \
 		$(use_enable ffmpeg ffaudio) \
 		$(use_enable flac flacng) \
 		$(use_enable fluidsynth amidiplug-flsyn) \
@@ -110,8 +109,3 @@ src_install() {
 	make DESTDIR="${D}" install || die
 	dodoc AUTHORS
 }
-
-pkg_postinst() {
-	mp3_warning
-	einfo "Your bug reports for this alpha version should go upstream: http://jira.atheme.org/"
-}