old

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

5 files changed, 7 insertions, 253 deletions

diff --git a/media-plugins/alsa-plugins/ChangeLog b/media-plugins/alsa-plugins/ChangeLog
index f8088ef9a30b..ccc47697210c 100644
--- a/media-plugins/alsa-plugins/ChangeLog
+++ b/media-plugins/alsa-plugins/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/alsa-plugins
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/ChangeLog,v 1.191 2014/04/05 18:36:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/ChangeLog,v 1.192 2014/04/05 19:20:01 ssuominen Exp $
+
+  05 Apr 2014; Samuli Suominen <ssuominen@gentoo.org>
+  -alsa-plugins-1.0.26.ebuild, -alsa-plugins-1.0.27.ebuild,
+  -files/alsa-plugins-1.0.25-avcodec54.patch,
+  -files/alsa-plugins-1.0.26-libav9.patch:
+  old
 
   05 Apr 2014; Agostino Sarubbo <ago@gentoo.org> alsa-plugins-1.0.27-r1.ebuild:
   Stable for sparc, wrt bug #498186
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.0.26.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.0.26.ebuild
deleted file mode 100644
index d7b5c5ac43cb..000000000000
--- a/media-plugins/alsa-plugins/alsa-plugins-1.0.26.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/alsa-plugins-1.0.26.ebuild,v 1.13 2013/04/23 21:56:12 lu_zero Exp $
-
-EAPI=4
-
-MY_P=${P/_/}
-
-inherit autotools eutils base flag-o-matic multilib
-
-DESCRIPTION="ALSA extra plugins"
-HOMEPAGE="http://www.alsa-project.org/"
-SRC_URI="mirror://alsaproject/plugins/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~amd64-linux"
-IUSE="debug ffmpeg jack libsamplerate pulseaudio speex"
-
-RDEPEND=">=media-libs/alsa-lib-${PV}
-	ffmpeg? ( virtual/ffmpeg )
-	jack? ( >=media-sound/jack-audio-connection-kit-0.98 )
-	libsamplerate? ( media-libs/libsamplerate )
-	pulseaudio? ( media-sound/pulseaudio )
-	speex? ( media-libs/speex )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.19-missing-avutil.patch
-	"${FILESDIR}"/${PN}-1.0.23-automagic.patch
-	"${FILESDIR}"/${PN}-1.0.25-avcodec54.patch
-	"${FILESDIR}"/${P}-libav9.patch #443258
-)
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	base_src_prepare
-
-	# For some reasons the polyp/pulse plugin does fail with alsaplayer with a
-	# failed assert. As the code works just fine with asserts disabled, for now
-	# disable them waiting for a better solution.
-	sed -i \
-		-e '/AM_CFLAGS/s:-Wall:-DNDEBUG -Wall:' \
-		pulse/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	use debug || append-cppflags -DNDEBUG
-
-	local myspeex=no
-	use speex && myspeex=lib
-
-	econf \
-		$(use_enable ffmpeg avcodec) \
-		$(use_enable jack) \
-		$(use_enable libsamplerate samplerate) \
-		$(use_enable pulseaudio) \
-		--with-speex=${myspeex}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	cd doc
-	dodoc upmix.txt vdownmix.txt README-pcm-oss
-	use jack && dodoc README-jack
-	use libsamplerate && dodoc samplerate.txt
-	use ffmpeg && dodoc lavcrate.txt a52.txt
-
-	if use pulseaudio; then
-		dodoc README-pulse
-		# install ALSA configuration files
-		# making PA to be used by alsa clients
-		insinto /usr/share/alsa
-		doins "${FILESDIR}"/pulse-default.conf
-		insinto /usr/share/alsa/alsa.conf.d
-		doins "${FILESDIR}"/51-pulseaudio-probe.conf
-		sed -i \
-			-e "s:/lib/:/$(get_libdir)/:" \
-			"${ED}"/usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf || die #410261
-	fi
-
-	prune_libtool_files --all
-}
-
-pkg_postinst() {
-	if use pulseaudio; then
-		einfo "The PulseAudio device is now set as the default device if the"
-		einfo "PulseAudio server is found to be running. Any custom"
-		einfo "configuration in /etc/asound.conf or ~/.asoundrc for this"
-		einfo "purpose should now be unnecessary."
-	fi
-}
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.0.27.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.0.27.ebuild
deleted file mode 100644
index 7bdb1c17c855..000000000000
--- a/media-plugins/alsa-plugins/alsa-plugins-1.0.27.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/alsa-plugins-1.0.27.ebuild,v 1.10 2014/02/15 10:22:50 hattya Exp $
-
-EAPI=5
-inherit autotools eutils flag-o-matic multilib
-
-DESCRIPTION="ALSA extra plugins"
-HOMEPAGE="http://www.alsa-project.org/"
-SRC_URI="mirror://alsaproject/plugins/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux"
-IUSE="debug ffmpeg jack libsamplerate pulseaudio speex"
-
-RDEPEND=">=media-libs/alsa-lib-${PV}
-	ffmpeg? ( virtual/ffmpeg )
-	jack? ( >=media-sound/jack-audio-connection-kit-0.98 )
-	libsamplerate? ( media-libs/libsamplerate )
-	pulseaudio? ( media-sound/pulseaudio )
-	speex? ( media-libs/speex )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.0.19-missing-avutil.patch \
-		"${FILESDIR}"/${PN}-1.0.23-automagic.patch \
-		"${FILESDIR}"/${PN}-1.0.27-ffmpeg-version-check.patch
-
-	epatch_user
-
-	# For some reasons the polyp/pulse plugin does fail with alsaplayer with a
-	# failed assert. As the code works just fine with asserts disabled, for now
-	# disable them waiting for a better solution.
-	sed -i \
-		-e '/AM_CFLAGS/s:-Wall:-DNDEBUG -Wall:' \
-		pulse/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	use debug || append-cppflags -DNDEBUG
-
-	local myspeex=no
-	use speex && myspeex=lib
-
-	econf \
-		$(use_enable ffmpeg avcodec) \
-		$(use_enable jack) \
-		$(use_enable libsamplerate samplerate) \
-		$(use_enable pulseaudio) \
-		--with-speex=${myspeex}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	cd doc
-	dodoc upmix.txt vdownmix.txt README-pcm-oss
-	use jack && dodoc README-jack
-	use libsamplerate && dodoc samplerate.txt
-	use ffmpeg && dodoc lavcrate.txt a52.txt
-
-	if use pulseaudio; then
-		dodoc README-pulse
-		# install ALSA configuration files
-		# making PA to be used by alsa clients
-		insinto /usr/share/alsa
-		doins "${FILESDIR}"/pulse-default.conf
-		insinto /usr/share/alsa/alsa.conf.d
-		doins "${FILESDIR}"/51-pulseaudio-probe.conf
-		sed -i \
-			-e "s:/lib/:/$(get_libdir)/:" \
-			"${ED}"/usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf || die #410261
-	fi
-
-	prune_libtool_files --all
-}
-
-pkg_postinst() {
-	if use pulseaudio; then
-		einfo "The PulseAudio device is now set as the default device if the"
-		einfo "PulseAudio server is found to be running. Any custom"
-		einfo "configuration in /etc/asound.conf or ~/.asoundrc for this"
-		einfo "purpose should now be unnecessary."
-	fi
-}
diff --git a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.25-avcodec54.patch b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.25-avcodec54.patch
deleted file mode 100644
index f9e33340af74..000000000000
--- a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.25-avcodec54.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: alsa-plugins-1.0.25/a52/pcm_a52.c
-===================================================================
---- alsa-plugins-1.0.25.orig/a52/pcm_a52.c
-+++ alsa-plugins-1.0.25/a52/pcm_a52.c
-@@ -444,13 +444,13 @@ static int a52_prepare(snd_pcm_ioplug_t
- #if LIBAVCODEC_VERSION_MAJOR > 52 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 3)
- 	switch (io->channels) {
- 	case 2:
--		rec->avctx->channel_layout = CH_LAYOUT_STEREO;
-+		rec->avctx->channel_layout = AV_CH_LAYOUT_STEREO;
- 		break;
- 	case 4:
--		rec->avctx->channel_layout = CH_LAYOUT_QUAD;
-+		rec->avctx->channel_layout = AV_CH_LAYOUT_QUAD;
- 		break;
- 	case 6:
--		rec->avctx->channel_layout = CH_LAYOUT_5POINT1;
-+		rec->avctx->channel_layout = AV_CH_LAYOUT_5POINT1;
- 		break;
- 	default:
- 		break;
-@@ -702,7 +702,9 @@ SND_PCM_PLUGIN_DEFINE_FUNC(a52)
- 	rec->channels = channels;
- 	rec->format = format;
- 
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54,0,0)
- 	avcodec_init();
-+#endif
- 	avcodec_register_all();
- 
- 	rec->codec = avcodec_find_encoder_by_name("ac3_fixed");
diff --git a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.26-libav9.patch b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.26-libav9.patch
deleted file mode 100644
index dfd75dfc0c8d..000000000000
--- a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.26-libav9.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Author: Reinhard Tartler <siretart@ubuntu.com>
-Description: Update to newer libav API - compatible to libav 0.8 and libav 9
-
-Index: alsa-plugins-1.0.26/a52/pcm_a52.c
-===================================================================
---- alsa-plugins-1.0.26.orig/a52/pcm_a52.c	2013-04-22 20:29:05.107102697 +0200
-+++ alsa-plugins-1.0.26/a52/pcm_a52.c	2013-04-22 20:34:12.985107208 +0200
-@@ -25,6 +25,8 @@
- #include <alsa/asoundlib.h>
- #include <alsa/pcm_external.h>
- #include <alsa/pcm_plugin.h>
-+#include <libavutil/audioconvert.h>
-+#include <libavutil/mem.h>
- #include AVCODEC_HEADER
- 
- struct a52_ctx {
-@@ -429,7 +431,7 @@
- 
- 	a52_free(rec);
- 
--	rec->avctx = avcodec_alloc_context();
-+	rec->avctx = avcodec_alloc_context3(rec->codec);
- 	if (! rec->avctx)
- 		return -ENOMEM;
- 
-@@ -457,7 +459,7 @@
- 	}
- #endif
- 
--	if (avcodec_open(rec->avctx, rec->codec) < 0)
-+	if (avcodec_open2(rec->avctx, rec->codec, NULL) < 0)
- 		return -EINVAL;
- 
- 	rec->inbuf = malloc(rec->avctx->frame_size * 2 * io->channels);