* [gentoo-commits] repo/gentoo:master commit in: media-plugins/alsa-plugins/files/, media-plugins/alsa-plugins/
@ 2015-09-14 15:50 Alexis Ballier
0 siblings, 0 replies; 6+ messages in thread
From: Alexis Ballier @ 2015-09-14 15:50 UTC (permalink / raw
To: gentoo-commits
commit: 610b59b8f9b471f8548a7b09162792e1acca5d31
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 14 15:50:06 2015 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon Sep 14 15:50:17 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=610b59b8
media-plugins/alsa-plugins: fix build with ffmpeg git master.
Package-Manager: portage-2.2.20.1
.../alsa-plugins/alsa-plugins-1.0.29-r1.ebuild | 1 +
.../files/alsa-plugins-1.0.29-ffmpeg29.patch | 30 ++++++++++++++++++++++
2 files changed, 31 insertions(+)
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.0.29-r1.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.0.29-r1.ebuild
index 4e2b087..667bf33 100644
--- a/media-plugins/alsa-plugins/alsa-plugins-1.0.29-r1.ebuild
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.0.29-r1.ebuild
@@ -35,6 +35,7 @@ DEPEND="${RDEPEND}
src_prepare() {
epatch "${FILESDIR}"/${PN}-1.0.23-automagic.patch
epatch "${FILESDIR}"/${PN}-1.0.28-libav10.patch
+ has_version '>=media-video/ffmpeg-2.8' && epatch "${FILESDIR}"/${PN}-1.0.29-ffmpeg29.patch
epatch_user
diff --git a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.29-ffmpeg29.patch b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.29-ffmpeg29.patch
new file mode 100644
index 0000000..efd3783
--- /dev/null
+++ b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.29-ffmpeg29.patch
@@ -0,0 +1,30 @@
+Index: alsa-plugins-1.0.29/a52/pcm_a52.c
+===================================================================
+--- alsa-plugins-1.0.29.orig/a52/pcm_a52.c
++++ alsa-plugins-1.0.29/a52/pcm_a52.c
+@@ -39,7 +39,6 @@
+ #endif
+
+ #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 34, 0)
+-#include <libavutil/audioconvert.h>
+ #include <libavutil/mem.h>
+ #define USE_AVCODEC_FRAME
+ #endif
+@@ -513,7 +512,7 @@ static void a52_free(struct a52_ctx *rec
+ rec->inbuf = NULL;
+ }
+ #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 28, 0)
+- avcodec_free_frame(&rec->frame);
++ av_frame_free(&rec->frame);
+ #else
+ av_freep(&rec->frame);
+ #endif
+@@ -557,7 +556,7 @@ static int alloc_input_buffer(snd_pcm_io
+ {
+ struct a52_ctx *rec = io->private_data;
+ #ifdef USE_AVCODEC_FRAME
+- rec->frame = avcodec_alloc_frame();
++ rec->frame = av_frame_alloc();
+ if (!rec->frame)
+ return -ENOMEM;
+ if (av_samples_alloc(rec->frame->data, rec->frame->linesize,
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-plugins/alsa-plugins/files/, media-plugins/alsa-plugins/
@ 2016-03-31 20:30 Lars Wendler
0 siblings, 0 replies; 6+ messages in thread
From: Lars Wendler @ 2016-03-31 20:30 UTC (permalink / raw
To: gentoo-commits
commit: e392df817efea77c0776de780ea4bdbf03de6382
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 31 20:05:17 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Mar 31 20:30:05 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e392df81
media-plugins/alsa-plugins: Removed old.
Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
media-plugins/alsa-plugins/Manifest | 2 -
.../alsa-plugins/alsa-plugins-1.0.27-r1.ebuild | 92 --------------------
.../alsa-plugins/alsa-plugins-1.0.27-r3.ebuild | 99 ----------------------
.../alsa-plugins/alsa-plugins-1.0.28.ebuild | 94 --------------------
.../files/alsa-plugins-1.0.19-missing-avutil.patch | 11 ---
.../alsa-plugins-1.0.27-ffmpeg-version-check.patch | 13 ---
.../files/alsa-plugins-1.0.27-ffmpeg.patch | 38 ---------
7 files changed, 349 deletions(-)
diff --git a/media-plugins/alsa-plugins/Manifest b/media-plugins/alsa-plugins/Manifest
index 700a00d..007f533 100644
--- a/media-plugins/alsa-plugins/Manifest
+++ b/media-plugins/alsa-plugins/Manifest
@@ -1,5 +1,3 @@
-DIST alsa-plugins-1.0.27.tar.bz2 363593 SHA256 0bbd0c37c2dd7baf16363afb2e58169ffb0f9c0a70031b3b6235594630f3ab35 SHA512 73c2010b66022429bc664bdab1c03694dfd669260dea569e32496bc6e10a11a0da2dd87db6a661ab1376f3aa59f1df8a84cb48ff1d20bb064756c655203f9993 WHIRLPOOL 4487734e0377c880a46df6f7fa53d86a7c38fa3d4bd35e06d128c0ec2b99c789ed64674b59003d8bd0abce2db53301234e467d235532ea145ddb150919cb49af
-DIST alsa-plugins-1.0.28.tar.bz2 366023 SHA256 426f8af1a07ee9d8c06449524d1f0bd59a06e0331a51aa3d59d343a7c6d03120 SHA512 c79cf22f426f500c704c947af602604c62a76a026c9b945589d1ca83dff16de23cec2f1c29c9713e42736092aa0d0389e514ca2ca646f8e4770c8aa8320725cc WHIRLPOOL 9cb54e2a30a3f682aa23acb6317f267ffb3cd47eceb959fbce73c8db3ba7c8af420b91b91cce865f0aaf0c60b2920f51972640aff8413c871d0709fa7f4f90a6
DIST alsa-plugins-1.0.29.tar.bz2 366077 SHA256 325d85cac285f632b83e0191ae3f348bad03c1f007b937042f164abb81ea6532 SHA512 6bc7d417ee5deb00a6e36864778deb4675a186951747cc799386288704f0d22a5c3d7011b6091602378d02ee79c4696ebb879140cebea392bd68937c8640898a WHIRLPOOL 987c348b536b03b36c2e7f9bff733e5309961b6f052d6a76f1372eb231d9af92191c113d0a577221809b0fcc4bc9614f278afb10472bd1606822aab468210af3
DIST alsa-plugins-1.1.0.tar.bz2 366296 SHA256 3b83c329953bef99f5fe25ae04ec4a455fe6514939f3b45a5321966652b2c9ee SHA512 5ed31ce1b6d11232d464d3cdef6015403840edbf2154266a479c2fde12ef4506e1f20c0f405ccee9cc39aec80be3bc41b10798a4475494ba56c6b4d69637fdc9 WHIRLPOOL 32c8460ed27a6a554f983e476e09847940e152cbc7b8cf0909243d312091560b1b25360249e3edeae50a46c5990f216cfd17915ec539812a5c473406705c2e73
DIST alsa-plugins-1.1.1.tar.bz2 366193 SHA256 8ea4d1e082c36528a896a2581e5eb62d4dc2683238e353050d0d624e65f901f1 SHA512 9dd277cb5cce144ce4e5e0010cebcba0f8634c783e7bcd80ce6d04b198d6de5150a2764df3087a39a468b5fb7c4578de2e252095568e811dedaa5e7ffdbeb7c9 WHIRLPOOL 20f36afcb01dfe47172b6470fea929ffb267e0b7a78ac4ca8c2031b33faa6fe15bd0608d9963e053366ac6bf3b2f540d776537c8547418a0d2b80b5c0366a76f
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.0.27-r1.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.0.27-r1.ebuild
deleted file mode 100644
index 32e81d4..0000000
--- a/media-plugins/alsa-plugins/alsa-plugins-1.0.27-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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}"/${P}-{ffmpeg,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
- # bug #410261, comment 5+
- # seems to work fine without any path
- sed -i \
- -e "s:/usr/lib/alsa-lib/::" \
- "${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-r3.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.0.27-r3.ebuild
deleted file mode 100644
index f6644a9..0000000
--- a/media-plugins/alsa-plugins/alsa-plugins-1.0.27-r3.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils flag-o-matic multilib multilib-minimal
-
-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"
-
-# TODO: handle USE=ffmpeg once it is converted
-
-RDEPEND=">=media-libs/alsa-lib-${PV}:=[${MULTILIB_USEDEP}]
- ffmpeg? ( virtual/ffmpeg )
- jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
- libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[${MULTILIB_USEDEP}] )
- pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
- speex? ( >=media-libs/speex-1.2_rc1-r1:=[${MULTILIB_USEDEP}] )
- abi_x86_32? (
- !<app-emulation/emul-linux-x86-soundlibs-20140406-r1
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32]
- )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-1.0.19-missing-avutil.patch \
- "${FILESDIR}"/${PN}-1.0.23-automagic.patch \
- "${FILESDIR}"/${P}-{ffmpeg,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
-}
-
-multilib_src_configure() {
- use debug || append-cppflags -DNDEBUG
-
- local myspeex=no
- use speex && myspeex=lib
-
- ECONF_SOURCE=${S} \
- econf \
- $(multilib_native_use_enable ffmpeg avcodec) \
- $(use_enable jack) \
- $(use_enable libsamplerate samplerate) \
- $(use_enable pulseaudio) \
- --with-speex=${myspeex}
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- cd doc || die
- 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
- # bug #410261, comment 5+
- # seems to work fine without any path
- sed -i \
- -e "s:/usr/lib/alsa-lib/::" \
- "${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.28.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.0.28.ebuild
deleted file mode 100644
index cf86cb6..0000000
--- a/media-plugins/alsa-plugins/alsa-plugins-1.0.28.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils flag-o-matic multilib multilib-minimal
-
-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}:=[${MULTILIB_USEDEP}]
- ffmpeg? ( virtual/ffmpeg[${MULTILIB_USEDEP}] )
- jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
- libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[${MULTILIB_USEDEP}] )
- pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
- speex? ( >=media-libs/speex-1.2_rc1-r1:=[${MULTILIB_USEDEP}] )
- abi_x86_32? (
- !<app-emulation/emul-linux-x86-soundlibs-20140406-r1
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32]
- )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_prepare() {
-: epatch "${FILESDIR}"/${PN}-1.0.23-automagic.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
-}
-
-multilib_src_configure() {
- use debug || append-cppflags -DNDEBUG
-
- local myspeex=no
- use speex && myspeex=lib
-
- ECONF_SOURCE=${S} \
- econf \
- $(use_enable ffmpeg avcodec) \
- $(use_enable jack) \
- $(use_enable libsamplerate samplerate) \
- $(use_enable pulseaudio) \
- --with-speex=${myspeex}
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- cd doc || die
- 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
- # bug #410261, comment 5+
- # seems to work fine without any path
- sed -i \
- -e "s:/usr/lib/alsa-lib/::" \
- "${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.19-missing-avutil.patch b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.19-missing-avutil.patch
deleted file mode 100644
index 12acbbc..0000000
--- a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.19-missing-avutil.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in_old 2009-01-26 21:46:07.000000000 +0100
-+++ configure.in 2009-01-26 21:47:25.000000000 +0100
-@@ -67,7 +67,7 @@
- AS_HELP_STRING([--disable-avcodec], [Don't build plugins depending on avcodec (a52)]))
-
- if test "x$enable_avcodec" != "xno"; then
-- PKG_CHECK_MODULES(AVCODEC, [libavcodec], [HAVE_AVCODEC=yes], [HAVE_AVCODEC=no])
-+ PKG_CHECK_MODULES(AVCODEC, [libavcodec libavutil], [HAVE_AVCODEC=yes], [HAVE_AVCODEC=no])
- fi
-
- if test "x$HAVE_AVCODEC" = "xno"; then
diff --git a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.27-ffmpeg-version-check.patch b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.27-ffmpeg-version-check.patch
deleted file mode 100644
index 6b9b698..0000000
--- a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.27-ffmpeg-version-check.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: alsa-plugins-1.0.27/a52/pcm_a52.c
-===================================================================
---- alsa-plugins-1.0.27.orig/a52/pcm_a52.c
-+++ alsa-plugins-1.0.27/a52/pcm_a52.c
-@@ -27,7 +27,7 @@
- #include <alsa/pcm_plugin.h>
- #include AVCODEC_HEADER
-
--#if LIBAVCODEC_VERSION_MAJOR >= 53 && LIBAVCODEC_VERSION_MINOR >= 34
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53,34,0)
- #include <libavutil/audioconvert.h>
- #include <libavutil/mem.h>
- #define USE_AVCODEC_FRAME
diff --git a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.27-ffmpeg.patch b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.27-ffmpeg.patch
deleted file mode 100644
index 56f51e3..0000000
--- a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.27-ffmpeg.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 367e208954711fabe159070d242927246ed821cd Mon Sep 17 00:00:00 2001
-From: Anton Khirnov <anton@khirnov.net>
-Date: Thu, 9 Jan 2014 21:14:17 +0100
-Subject: [PATCH] a52: switch to AV_CODEC_ID identifiers
-
-Fixes build with latest libavcodec versions.
-
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
----
- a52/pcm_a52.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/a52/pcm_a52.c b/a52/pcm_a52.c
-index 359608f..b467ec8 100644
---- a/a52/pcm_a52.c
-+++ b/a52/pcm_a52.c
-@@ -58,6 +58,9 @@
- #endif
- #endif
-
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 25, 0)
-+#define AV_CODEC_ID_AC3 CODEC_ID_AC3
-+#endif
-
- struct a52_ctx {
- snd_pcm_ioplug_t io;
-@@ -916,7 +919,7 @@ SND_PCM_PLUGIN_DEFINE_FUNC(a52)
- if (rec->codec == NULL)
- rec->codec = avcodec_find_encoder_by_name("ac3");
- if (rec->codec == NULL)
-- rec->codec = avcodec_find_encoder(CODEC_ID_AC3);
-+ rec->codec = avcodec_find_encoder(AV_CODEC_ID_AC3);
- if (rec->codec == NULL) {
- SNDERR("Cannot find codec engine");
- err = -EINVAL;
---
-1.7.11.7
-
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-plugins/alsa-plugins/files/, media-plugins/alsa-plugins/
@ 2017-05-18 11:44 Lars Wendler
0 siblings, 0 replies; 6+ messages in thread
From: Lars Wendler @ 2017-05-18 11:44 UTC (permalink / raw
To: gentoo-commits
commit: 83743e167f12cd4959d4c026dbbba60adf2e4119
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu May 18 11:40:18 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu May 18 11:40:18 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83743e16
media-plugins/alsa-plugins: Removed old.
Package-Manager: Portage-2.3.5, Repoman-2.3.2
media-plugins/alsa-plugins/Manifest | 1 -
.../alsa-plugins/alsa-plugins-1.0.29-r1.ebuild | 100 ---------------------
.../alsa-plugins/alsa-plugins-1.0.29.ebuild | 94 -------------------
.../files/alsa-plugins-1.0.29-ffmpeg29.patch | 30 -------
4 files changed, 225 deletions(-)
diff --git a/media-plugins/alsa-plugins/Manifest b/media-plugins/alsa-plugins/Manifest
index 92e04dc0f53..fbbb011fc56 100644
--- a/media-plugins/alsa-plugins/Manifest
+++ b/media-plugins/alsa-plugins/Manifest
@@ -1,3 +1,2 @@
-DIST alsa-plugins-1.0.29.tar.bz2 366077 SHA256 325d85cac285f632b83e0191ae3f348bad03c1f007b937042f164abb81ea6532 SHA512 6bc7d417ee5deb00a6e36864778deb4675a186951747cc799386288704f0d22a5c3d7011b6091602378d02ee79c4696ebb879140cebea392bd68937c8640898a WHIRLPOOL 987c348b536b03b36c2e7f9bff733e5309961b6f052d6a76f1372eb231d9af92191c113d0a577221809b0fcc4bc9614f278afb10472bd1606822aab468210af3
DIST alsa-plugins-1.1.1.tar.bz2 366193 SHA256 8ea4d1e082c36528a896a2581e5eb62d4dc2683238e353050d0d624e65f901f1 SHA512 9dd277cb5cce144ce4e5e0010cebcba0f8634c783e7bcd80ce6d04b198d6de5150a2764df3087a39a468b5fb7c4578de2e252095568e811dedaa5e7ffdbeb7c9 WHIRLPOOL 20f36afcb01dfe47172b6470fea929ffb267e0b7a78ac4ca8c2031b33faa6fe15bd0608d9963e053366ac6bf3b2f540d776537c8547418a0d2b80b5c0366a76f
DIST alsa-plugins-1.1.4.tar.bz2 366931 SHA256 530d1c3bdaeb058f2a03607a33b9e16ee5369bfd30a96bc09bd2c69b4ddd1a8a SHA512 edbc9dd762e2500ce6f820d81fcd8d2577506afcea0b33a32cece95f8d6651840f4f8a55664f274d735ab3effa13cdbfc0331690c37a64a9ad050c15dc77cac6 WHIRLPOOL 38229f5d194ee0ef47b00d1464ed5392fbdb33f8d63a9b8dbdf26e39db3d096314fbe1f9220566a30aa905ec38607ebeb042611c3defd0f93543075d23382e45
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.0.29-r1.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.0.29-r1.ebuild
deleted file mode 100644
index 98fcaf6236d..00000000000
--- a/media-plugins/alsa-plugins/alsa-plugins-1.0.29-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic multilib multilib-minimal
-
-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 libav libsamplerate pulseaudio speex"
-
-RDEPEND="
- >=media-libs/alsa-lib-${PV}:=[${MULTILIB_USEDEP}]
- ffmpeg? (
- libav? ( media-video/libav:= )
- !libav? ( media-video/ffmpeg:0= )
- )
- jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
- libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[${MULTILIB_USEDEP}] )
- pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
- speex? ( >=media-libs/speex-1.2_rc1-r1:=[${MULTILIB_USEDEP}] )
- abi_x86_32? (
- !<app-emulation/emul-linux-x86-soundlibs-20140406-r1
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32]
- )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.0.23-automagic.patch
- epatch "${FILESDIR}"/${PN}-1.0.28-libav10.patch
- has_version '>=media-video/ffmpeg-2.8' && epatch "${FILESDIR}"/${PN}-1.0.29-ffmpeg29.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
-}
-
-multilib_src_configure() {
- use debug || append-cppflags -DNDEBUG
-
- local myspeex=no
- use speex && myspeex=lib
-
- ECONF_SOURCE=${S} \
- econf \
- $(use_enable ffmpeg avcodec) \
- $(use_enable jack) \
- $(use_enable libsamplerate samplerate) \
- $(use_enable pulseaudio) \
- --with-speex=${myspeex}
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- cd doc || die
- 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
- # bug #410261, comment 5+
- # seems to work fine without any path
- sed -i \
- -e "s:/usr/lib/alsa-lib/::" \
- "${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.29.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.0.29.ebuild
deleted file mode 100644
index 7a5ef3b989b..00000000000
--- a/media-plugins/alsa-plugins/alsa-plugins-1.0.29.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic multilib multilib-minimal
-
-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}:=[${MULTILIB_USEDEP}]
- ffmpeg? ( virtual/ffmpeg[${MULTILIB_USEDEP}] )
- jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
- libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[${MULTILIB_USEDEP}] )
- pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
- speex? ( >=media-libs/speex-1.2_rc1-r1:=[${MULTILIB_USEDEP}] )
- abi_x86_32? (
- !<app-emulation/emul-linux-x86-soundlibs-20140406-r1
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32]
- )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.0.23-automagic.patch
- epatch "${FILESDIR}"/${PN}-1.0.28-libav10.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
-}
-
-multilib_src_configure() {
- use debug || append-cppflags -DNDEBUG
-
- local myspeex=no
- use speex && myspeex=lib
-
- ECONF_SOURCE=${S} \
- econf \
- $(use_enable ffmpeg avcodec) \
- $(use_enable jack) \
- $(use_enable libsamplerate samplerate) \
- $(use_enable pulseaudio) \
- --with-speex=${myspeex}
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- cd doc || die
- 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
- # bug #410261, comment 5+
- # seems to work fine without any path
- sed -i \
- -e "s:/usr/lib/alsa-lib/::" \
- "${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.29-ffmpeg29.patch b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.29-ffmpeg29.patch
deleted file mode 100644
index efd37839f32..00000000000
--- a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.29-ffmpeg29.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: alsa-plugins-1.0.29/a52/pcm_a52.c
-===================================================================
---- alsa-plugins-1.0.29.orig/a52/pcm_a52.c
-+++ alsa-plugins-1.0.29/a52/pcm_a52.c
-@@ -39,7 +39,6 @@
- #endif
-
- #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 34, 0)
--#include <libavutil/audioconvert.h>
- #include <libavutil/mem.h>
- #define USE_AVCODEC_FRAME
- #endif
-@@ -513,7 +512,7 @@ static void a52_free(struct a52_ctx *rec
- rec->inbuf = NULL;
- }
- #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 28, 0)
-- avcodec_free_frame(&rec->frame);
-+ av_frame_free(&rec->frame);
- #else
- av_freep(&rec->frame);
- #endif
-@@ -557,7 +556,7 @@ static int alloc_input_buffer(snd_pcm_io
- {
- struct a52_ctx *rec = io->private_data;
- #ifdef USE_AVCODEC_FRAME
-- rec->frame = avcodec_alloc_frame();
-+ rec->frame = av_frame_alloc();
- if (!rec->frame)
- return -ENOMEM;
- if (av_samples_alloc(rec->frame->data, rec->frame->linesize,
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-plugins/alsa-plugins/files/, media-plugins/alsa-plugins/
@ 2019-01-04 17:47 Lars Wendler
0 siblings, 0 replies; 6+ messages in thread
From: Lars Wendler @ 2019-01-04 17:47 UTC (permalink / raw
To: gentoo-commits
commit: c34bd91f35dce053ca34d24712c227c0db833f5e
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 4 17:47:13 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Jan 4 17:47:13 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c34bd91f
media-plugins/alsa-plugins: Fixed a double free issue.
Closes: https://bugs.gentoo.org/673792
Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
...s-1.1.7.ebuild => alsa-plugins-1.1.7-r1.ebuild} | 6 +++-
.../files/alsa-plugins-1.1.7-double_free_fix.patch | 34 ++++++++++++++++++++++
2 files changed, 39 insertions(+), 1 deletion(-)
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.1.7.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.1.7-r1.ebuild
similarity index 96%
rename from media-plugins/alsa-plugins/alsa-plugins-1.1.7.ebuild
rename to media-plugins/alsa-plugins/alsa-plugins-1.1.7-r1.ebuild
index 2eff3aacc81..f97cc166249 100644
--- a/media-plugins/alsa-plugins/alsa-plugins-1.1.7.ebuild
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.1.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -30,6 +30,10 @@ RDEPEND="
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
+PATCHES=(
+ "${FILESDIR}"/${P}-double_free_fix.patch
+)
+
src_prepare() {
default
diff --git a/media-plugins/alsa-plugins/files/alsa-plugins-1.1.7-double_free_fix.patch b/media-plugins/alsa-plugins/files/alsa-plugins-1.1.7-double_free_fix.patch
new file mode 100644
index 00000000000..9b3a81599b3
--- /dev/null
+++ b/media-plugins/alsa-plugins/files/alsa-plugins-1.1.7-double_free_fix.patch
@@ -0,0 +1,34 @@
+From a4e7e1282c57a2f4e83afe9a4008042d8b4c5bb9 Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Tue, 23 Oct 2018 09:32:46 +0200
+Subject: [PATCH] a52_close: set slave to NULL to avoid double pcm free in
+ open fcn
+
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+ a52/pcm_a52.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/a52/pcm_a52.c b/a52/pcm_a52.c
+index e431fd0..b005bc2 100644
+--- a/a52/pcm_a52.c
++++ b/a52/pcm_a52.c
+@@ -654,10 +654,13 @@ static int a52_poll_revents(snd_pcm_ioplug_t *io, struct pollfd *pfd,
+ static int a52_close(snd_pcm_ioplug_t *io)
+ {
+ struct a52_ctx *rec = io->private_data;
++ snd_pcm_t *slave = rec->slave;
+
+ a52_free(rec);
+- if (rec->slave)
+- return snd_pcm_close(rec->slave);
++ if (slave) {
++ rec->slave = NULL;
++ return snd_pcm_close(slave);
++ }
+ return 0;
+ }
+
+--
+1.7.11.7
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-plugins/alsa-plugins/files/, media-plugins/alsa-plugins/
@ 2019-11-16 13:06 Lars Wendler
0 siblings, 0 replies; 6+ messages in thread
From: Lars Wendler @ 2019-11-16 13:06 UTC (permalink / raw
To: gentoo-commits
commit: ccbb4cdfc9d895f5f4f2b4f80ec14ac06c61e2a7
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 16 13:01:44 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Nov 16 13:06:19 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccbb4cdf
media-plugins/alsa-plugins: Removed old
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
media-plugins/alsa-plugins/Manifest | 1 -
.../alsa-plugins/alsa-plugins-1.1.6.ebuild | 102 ---------------------
.../alsa-plugins-1.1.5-optional_plugins.patch | 46 ----------
3 files changed, 149 deletions(-)
diff --git a/media-plugins/alsa-plugins/Manifest b/media-plugins/alsa-plugins/Manifest
index 3b93b095b1d..22a326647a9 100644
--- a/media-plugins/alsa-plugins/Manifest
+++ b/media-plugins/alsa-plugins/Manifest
@@ -1,5 +1,4 @@
DIST alsa-plugins-1.1.1.tar.bz2 366193 BLAKE2B 02892b0c241cf34d3bfce6cf580dbb6bedbce9253c3e57f04d3093a6cbb1d5b5e9b92566945962b875de20ba3e556e9c1fc4bb4e970502e3c03fc821e5e264fe SHA512 9dd277cb5cce144ce4e5e0010cebcba0f8634c783e7bcd80ce6d04b198d6de5150a2764df3087a39a468b5fb7c4578de2e252095568e811dedaa5e7ffdbeb7c9
-DIST alsa-plugins-1.1.6.tar.bz2 367485 BLAKE2B efe8b8447db4f68761060e4f48c86c76f821fd7795d8edec0c8f5a03f7406a422f630f012433ac12c3af3222b7b587820a92e937c80dba6bb8766deb854b9706 SHA512 f01633cd7166a2fba4c5b4d5d786b5a2122f6a810f5b5b7209c42033759d116a4515174e7ee57973d5de716be88a246d733dc5a2daf92b72377c274b04db401b
DIST alsa-plugins-1.1.8.tar.bz2 375346 BLAKE2B 65c161ee375e7aed85dbe918a39bc2aa4818bbcfbaadf405f5f0170d9944ff55b5a9da3690e3cd78bd7ffff74ecf235f49cfc3a5dfe18b627c5a9cb0dc1eb207 SHA512 bb1a4411921ec332f47b43515f6d3b4c03a01568854950b9b5c3f0d8172d9a0c4a5b3652bc64c62eae5ea3aaa5d95fe3d32c0a213fe99adf490a9807bcb58ecd
DIST alsa-plugins-1.1.9.tar.bz2 406127 BLAKE2B 10bf3e96289a88edabfa3018d33ab4666982fe409eb41c486e6b9eee0dde87e926f3241c31e240b3bab114c8ab2c6d6bab92dd6192bceb467a01fcb6adc44b8e SHA512 1969dfe8f2bb4283e81a18da73d2f7f86d8788d1a8764d7195b4830b2f4704c208eacb50a1e26e20c9fe57e7d5bb06a004112d84cc86b4682b4180d2fec4d5d9
DIST alsa-plugins-1.2.1.tar.bz2 406309 BLAKE2B 2ac26ad87fcdcc4452ec32b2b437d3be4308f13ce2a8e24150f319805b6d684edc6be9e51654f27c1a5bbc01a7caa9eb70250be405dc6921ecd93ee417f24cdf SHA512 a49ef9290b66855112e301a5fd5a0932f13a50254e164f3340f2b342a36469532ee783beabfe5e95870dbf4cd81ca1e8d0415d94c8c7ee963133fb3c343721de
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.1.6.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.1.6.ebuild
deleted file mode 100644
index 64eb75cc803..00000000000
--- a/media-plugins/alsa-plugins/alsa-plugins-1.1.6.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic multilib multilib-minimal
-
-DESCRIPTION="ALSA extra plugins"
-HOMEPAGE="http://www.alsa-project.org/"
-SRC_URI="https://www.alsa-project.org/files/pub/plugins/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux"
-IUSE="arcam_av debug ffmpeg jack libav libsamplerate +mix oss pulseaudio speex +usb_stream"
-
-RDEPEND="
- >=media-libs/alsa-lib-${PV}:=[${MULTILIB_USEDEP}]
- ffmpeg? (
- libav? ( media-video/libav:= )
- !libav? ( media-video/ffmpeg:0= )
- )
- jack? ( virtual/jack[${MULTILIB_USEDEP}] )
- libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[${MULTILIB_USEDEP}] )
- pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
- speex? (
- >=media-libs/speex-1.2.0:=[${MULTILIB_USEDEP}]
- media-libs/speexdsp[${MULTILIB_USEDEP}]
- )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.1.5-optional_plugins.patch"
-)
-
-src_prepare() {
- default
-
- # 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
-}
-
-multilib_src_configure() {
- use debug || append-cppflags -DNDEBUG
-
- local myeconfargs=(
- --with-speex="$(usex speex lib no)"
- $(use_enable arcam_av arcamav)
- $(use_enable ffmpeg avcodec)
- $(use_enable jack)
- $(use_enable libsamplerate samplerate)
- $(use_enable mix)
- $(use_enable oss)
- $(use_enable pulseaudio)
- $(use_enable speex speexdsp)
- $(use_enable usb_stream usbstream)
- )
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- cd doc || die
- 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
- # bug #410261, comment 5+
- # seems to work fine without any path
- sed -i \
- -e "s:/usr/lib/alsa-lib/::" \
- "${ED%/}"/usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf || die #410261
- fi
-
- find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-}
-
-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.1.5-optional_plugins.patch b/media-plugins/alsa-plugins/files/alsa-plugins-1.1.5-optional_plugins.patch
deleted file mode 100644
index cb232b2da6f..00000000000
--- a/media-plugins/alsa-plugins/files/alsa-plugins-1.1.5-optional_plugins.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 565cfc8800c2e7a122f6574f67a7da8f1165e34d Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Sun, 18 Feb 2018 16:00:39 +0100
-Subject: [PATCH] Makefile.am: Add missing code for enhanced configure option
- of alsa plugins
-
-Commit 1201e158fb00bf15c353d088c94c1cb3eff9653c added the pieces for
-configure but did not do the same for Makefile.
-As result all plugins were still built regardless of corresponding
---disable-* option being called with configure.
----
- Makefile.am | 14 +++++++++++++-
- 1 file changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 69cfe0d..76cefef 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,4 +1,4 @@
--SUBDIRS = oss mix usb_stream arcam-av doc
-+SUBDIRS = doc
- if HAVE_JACK
- SUBDIRS += jack
- endif
-@@ -20,6 +20,18 @@ endif
- if HAVE_SPEEXDSP
- SUBDIRS += speex
- endif
-+if HAVE_OSS
-+SUBDIRS += oss
-+endif
-+if HAVE_MIX
-+SUBDIRS += mix
-+endif
-+if HAVE_USBSTREAM
-+SUBDIRS += usb_stream
-+endif
-+if HAVE_ARCAMAV
-+SUBDIRS += arcam-av
-+endif
-
- EXTRA_DIST = gitcompile version COPYING.GPL m4/attributes.m4
- AUTOMAKE_OPTIONS = foreign
---
-2.16.2
-
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-plugins/alsa-plugins/files/, media-plugins/alsa-plugins/
@ 2020-02-20 15:49 Lars Wendler
0 siblings, 0 replies; 6+ messages in thread
From: Lars Wendler @ 2020-02-20 15:49 UTC (permalink / raw
To: gentoo-commits
commit: a33c9086ce400e80dba0944c142460fda822f640
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 20 15:42:05 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Feb 20 15:49:32 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a33c9086
media-plugins/alsa-plugins: Removed old
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
media-plugins/alsa-plugins/Manifest | 1 -
.../alsa-plugins/alsa-plugins-1.1.1-r1.ebuild | 100 ------
.../alsa-plugins/alsa-plugins-1.1.9-r1.ebuild | 103 -------
.../files/alsa-plugins-1.0.23-automagic.patch | 12 -
.../files/alsa-plugins-1.0.28-libav10.patch | 338 ---------------------
5 files changed, 554 deletions(-)
diff --git a/media-plugins/alsa-plugins/Manifest b/media-plugins/alsa-plugins/Manifest
index f307fab4030..9d8379446d6 100644
--- a/media-plugins/alsa-plugins/Manifest
+++ b/media-plugins/alsa-plugins/Manifest
@@ -1,4 +1,3 @@
-DIST alsa-plugins-1.1.1.tar.bz2 366193 BLAKE2B 02892b0c241cf34d3bfce6cf580dbb6bedbce9253c3e57f04d3093a6cbb1d5b5e9b92566945962b875de20ba3e556e9c1fc4bb4e970502e3c03fc821e5e264fe SHA512 9dd277cb5cce144ce4e5e0010cebcba0f8634c783e7bcd80ce6d04b198d6de5150a2764df3087a39a468b5fb7c4578de2e252095568e811dedaa5e7ffdbeb7c9
DIST alsa-plugins-1.1.8.tar.bz2 375346 BLAKE2B 65c161ee375e7aed85dbe918a39bc2aa4818bbcfbaadf405f5f0170d9944ff55b5a9da3690e3cd78bd7ffff74ecf235f49cfc3a5dfe18b627c5a9cb0dc1eb207 SHA512 bb1a4411921ec332f47b43515f6d3b4c03a01568854950b9b5c3f0d8172d9a0c4a5b3652bc64c62eae5ea3aaa5d95fe3d32c0a213fe99adf490a9807bcb58ecd
DIST alsa-plugins-1.1.9.tar.bz2 406127 BLAKE2B 10bf3e96289a88edabfa3018d33ab4666982fe409eb41c486e6b9eee0dde87e926f3241c31e240b3bab114c8ab2c6d6bab92dd6192bceb467a01fcb6adc44b8e SHA512 1969dfe8f2bb4283e81a18da73d2f7f86d8788d1a8764d7195b4830b2f4704c208eacb50a1e26e20c9fe57e7d5bb06a004112d84cc86b4682b4180d2fec4d5d9
DIST alsa-plugins-1.2.1.tar.bz2 406309 BLAKE2B 2ac26ad87fcdcc4452ec32b2b437d3be4308f13ce2a8e24150f319805b6d684edc6be9e51654f27c1a5bbc01a7caa9eb70250be405dc6921ecd93ee417f24cdf SHA512 a49ef9290b66855112e301a5fd5a0932f13a50254e164f3340f2b342a36469532ee783beabfe5e95870dbf4cd81ca1e8d0415d94c8c7ee963133fb3c343721de
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.1.1-r1.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.1.1-r1.ebuild
deleted file mode 100644
index ea2912e9c1b..00000000000
--- a/media-plugins/alsa-plugins/alsa-plugins-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils flag-o-matic ltprune multilib multilib-minimal
-
-DESCRIPTION="ALSA extra plugins"
-HOMEPAGE="http://www.alsa-project.org/"
-SRC_URI="https://www.alsa-project.org/files/pub/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 libav libsamplerate pulseaudio speex"
-
-RDEPEND="
- >=media-libs/alsa-lib-${PV}:=[${MULTILIB_USEDEP}]
- ffmpeg? (
- libav? ( media-video/libav:= )
- !libav? ( media-video/ffmpeg:0= )
- )
- jack? ( virtual/jack[${MULTILIB_USEDEP}] )
- libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[${MULTILIB_USEDEP}] )
- pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
- speex? (
- >=media-libs/speex-1.2.0:=[${MULTILIB_USEDEP}]
- media-libs/speexdsp[${MULTILIB_USEDEP}]
- )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.0.23-automagic.patch"
- "${FILESDIR}/${PN}-1.0.28-libav10.patch"
-)
-
-src_prepare() {
- default
-
- # 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
-}
-
-multilib_src_configure() {
- use debug || append-cppflags -DNDEBUG
-
- local myspeex=no
- use speex && myspeex=lib
-
- ECONF_SOURCE=${S} \
- econf \
- $(use_enable ffmpeg avcodec) \
- $(use_enable jack) \
- $(use_enable libsamplerate samplerate) \
- $(use_enable pulseaudio) \
- --with-speex=${myspeex}
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- cd doc || die
- 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
- # bug #410261, comment 5+
- # seems to work fine without any path
- sed -i \
- -e "s:/usr/lib/alsa-lib/::" \
- "${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.1.9-r1.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.1.9-r1.ebuild
deleted file mode 100644
index fba448266fc..00000000000
--- a/media-plugins/alsa-plugins/alsa-plugins-1.1.9-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic multilib multilib-minimal
-
-DESCRIPTION="ALSA extra plugins"
-HOMEPAGE="http://www.alsa-project.org/"
-SRC_URI="https://www.alsa-project.org/files/pub/plugins/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux"
-IUSE="arcam_av debug ffmpeg jack libav libsamplerate +mix oss pulseaudio speex +usb_stream"
-
-RDEPEND="
- >=media-libs/alsa-lib-${PV}:=[${MULTILIB_USEDEP}]
- ffmpeg? (
- libav? ( media-video/libav:= )
- !libav? ( media-video/ffmpeg:0= )
- )
- jack? ( virtual/jack[${MULTILIB_USEDEP}] )
- libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[${MULTILIB_USEDEP}] )
- pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
- speex? (
- >=media-libs/speex-1.2.0:=[${MULTILIB_USEDEP}]
- media-libs/speexdsp[${MULTILIB_USEDEP}]
- )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
- default
-
- # 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
-}
-
-multilib_src_configure() {
- use debug || append-cppflags -DNDEBUG
-
- local myeconfargs=(
- # default does not contain $prefix: bug #673464
- --with-alsalconfdir="${EPREFIX}"/etc/alsa/conf.d
-
- --with-speex="$(usex speex lib no)"
- $(use_enable arcam_av arcamav)
- $(use_enable ffmpeg libav)
- $(use_enable jack)
- $(use_enable libsamplerate samplerate)
- $(use_enable mix)
- $(use_enable oss)
- $(use_enable pulseaudio)
- $(use_enable speex speexdsp)
- $(use_enable usb_stream usbstream)
- )
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- cd doc || die
- dodoc upmix.txt vdownmix.txt README-pcm-oss
- use jack && dodoc README-jack
- use libsamplerate && dodoc samplerate.txt
- use ffmpeg && dodoc lavrate.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
- # bug #410261, comment 5+
- # seems to work fine without any path
- sed -i \
- -e "s:/usr/lib/alsa-lib/::" \
- "${ED}"/usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf || die #410261
- dosym ../../../usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf \
- /etc/alsa/conf.d/51-pulseaudio-probe.conf #670960
- fi
-
- find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-}
-
-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.23-automagic.patch b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.23-automagic.patch
deleted file mode 100644
index 8e62f20a143..00000000000
--- a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.23-automagic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr alsa-plugins-1.0.23.ORIg//Makefile.am alsa-plugins-1.0.23/Makefile.am
---- alsa-plugins-1.0.23.ORIg//Makefile.am 2010-04-16 23:38:58.546243512 +0100
-+++ alsa-plugins-1.0.23/Makefile.am 2010-04-16 23:39:20.049278487 +0100
-@@ -17,7 +17,7 @@
- if HAVE_PPH
- SUBDIRS += pph
- endif
--if HAVE_SPEEXDSP
-+if USE_LIBSPEEX
- SUBDIRS += speex
- endif
-
diff --git a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.28-libav10.patch b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.28-libav10.patch
deleted file mode 100644
index 9718369782b..00000000000
--- a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.28-libav10.patch
+++ /dev/null
@@ -1,338 +0,0 @@
-https://bugs.gentoo.org/539680
-
-From: Luca Barbato <lu_zero@gentoo.org>
-Description: lavr: Add a libavresample based rate plugin
-Date: Mon, 14 Apr 2014 10:01:07 +0200
-
-Provide lavcrate compatibility.
-
-Index: alsa-plugins-1.0.28/configure.ac
-===================================================================
---- alsa-plugins-1.0.28.orig/configure.ac
-+++ alsa-plugins-1.0.28/configure.ac
-@@ -66,7 +66,7 @@ if test "$use_maemo_rm" = "yes"; then
- fi
-
- AC_ARG_ENABLE([avcodec],
-- AS_HELP_STRING([--disable-avcodec], [Don't build plugins depending on avcodec (a52)]))
-+ AS_HELP_STRING([--disable-avcodec], [Do not build plugins depending on avcodec (a52)]))
-
- if test "x$enable_avcodec" != "xno"; then
- PKG_CHECK_MODULES(AVCODEC, [libavcodec libavutil], [HAVE_AVCODEC=yes], [HAVE_AVCODEC=no])
-@@ -101,6 +101,10 @@ if test $HAVE_AVCODEC = yes; then
- if test -z "$AVCODEC_HEADER"; then
- HAVE_AVCODEC=no
- fi
-+ SAVE_LIBS=$LIBS
-+ LIBS="$LIBS $AVCODEC_LIBS"
-+ AC_CHECK_FUNCS([av_resample_init])
-+ LIBS=$SAVE_LIBS
- fi
-
- AM_CONDITIONAL(HAVE_AVCODEC, test x$HAVE_AVCODEC = xyes)
-@@ -108,6 +112,18 @@ AC_SUBST(AVCODEC_CFLAGS)
- AC_SUBST(AVCODEC_LIBS)
- AC_SUBST(AVCODEC_HEADER)
-
-+AC_ARG_ENABLE([avresample],
-+ AS_HELP_STRING([--disable-avresample], [Do not build plugins depending on avcodec (lavrate)]))
-+
-+if test "x$enable_avresample" != "xno"; then
-+ PKG_CHECK_MODULES(AVRESAMPLE, [libavresample libavutil], [HAVE_AVRESAMPLE=yes], [HAVE_AVRESAMPLE=no])
-+fi
-+
-+AM_CONDITIONAL(HAVE_AVRESAMPLE, test x$HAVE_AVCODEC = xyes)
-+AC_SUBST(AVRESAMPLE_CFLAGS)
-+AC_SUBST(AVRESAMPLE_LIBS)
-+AC_SUBST(AVRESAMPLE_HEADER)
-+
- PKG_CHECK_MODULES(speexdsp, [speexdsp >= 1.2], [HAVE_SPEEXDSP="yes"], [HAVE_SPEEXDSP=""])
- AM_CONDITIONAL(HAVE_SPEEXDSP, test "$HAVE_SPEEXDSP" = "yes")
-
-@@ -181,7 +197,7 @@ AC_OUTPUT([
- mix/Makefile
- rate/Makefile
- a52/Makefile
-- rate-lavc/Makefile
-+ rate-lavr/Makefile
- maemo/Makefile
- doc/Makefile
- usb_stream/Makefile
-Index: alsa-plugins-1.0.28/Makefile.am
-===================================================================
---- alsa-plugins-1.0.28.orig/Makefile.am
-+++ alsa-plugins-1.0.28/Makefile.am
-@@ -9,8 +9,14 @@ if HAVE_SAMPLERATE
- SUBDIRS += rate
- endif
- if HAVE_AVCODEC
-+SUBDIRS += a52
-+if !HAVE_AVRESAMPLE
- SUBDIRS += a52 rate-lavc
- endif
-+endif
-+if HAVE_AVRESAMPLE
-+SUBDIRS += rate-lavr
-+endif
- if HAVE_MAEMO_PLUGIN
- SUBDIRS += maemo
- endif
-Index: alsa-plugins-1.0.28/rate-lavr/Makefile.am
-===================================================================
---- /dev/null
-+++ alsa-plugins-1.0.28/rate-lavr/Makefile.am
-@@ -0,0 +1,22 @@
-+asound_module_rate_lavr_LTLIBRARIES = libasound_module_rate_lavr.la
-+
-+asound_module_rate_lavrdir = @ALSA_PLUGIN_DIR@
-+
-+AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ @AVRESAMPLE_CFLAGS@
-+AM_LDFLAGS = -module -avoid-version -export-dynamic -no-undefined $(LDFLAGS_NOUNDEFINED)
-+
-+libasound_module_rate_lavr_la_SOURCES = rate_lavr.c
-+libasound_module_rate_lavr_la_LIBADD = @ALSA_LIBS@ @AVRESAMPLE_LIBS@
-+
-+
-+install-exec-hook:
-+ rm -f $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_lavcrate*.so
-+ $(LN_S) libasound_module_rate_lavr.so $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_lavcrate.so
-+ $(LN_S) libasound_module_rate_lavr.so $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_lavcrate_higher.so
-+ $(LN_S) libasound_module_rate_lavr.so $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_lavcrate_high.so
-+ $(LN_S) libasound_module_rate_lavr.so $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_lavcrate_fast.so
-+ $(LN_S) libasound_module_rate_lavr.so $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_lavcrate_faster.so
-+
-+uninstall-hook:
-+ rm -f $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_lavcrate*.so
-+ rm -f $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_lavr*.so
-Index: alsa-plugins-1.0.28/rate-lavr/rate_lavr.c
-===================================================================
---- /dev/null
-+++ alsa-plugins-1.0.28/rate-lavr/rate_lavr.c
-@@ -0,0 +1,227 @@
-+/*
-+ * Rate converter plugin using libavresample
-+ * Copyright (c) 2014 by Anton Khirnov
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ */
-+
-+#include <stdio.h>
-+#include <alsa/asoundlib.h>
-+#include <alsa/pcm_rate.h>
-+
-+#include <libavresample/avresample.h>
-+#include <libavutil/channel_layout.h>
-+#include <libavutil/opt.h>
-+#include <libavutil/mathematics.h>
-+#include <libavutil/samplefmt.h>
-+
-+
-+static int filter_size = 16;
-+static int phase_shift = 10; /* auto-adjusts */
-+static double cutoff = 0; /* auto-adjusts */
-+
-+struct rate_src {
-+ AVAudioResampleContext *avr;
-+
-+ int in_rate;
-+ int out_rate;
-+ unsigned int channels;
-+};
-+
-+static snd_pcm_uframes_t input_frames(void *obj, snd_pcm_uframes_t frames)
-+{
-+ return frames;
-+}
-+
-+static snd_pcm_uframes_t output_frames(void *obj, snd_pcm_uframes_t frames)
-+{
-+ return frames;
-+}
-+
-+static void pcm_src_free(void *obj)
-+{
-+ struct rate_src *rate = obj;
-+ avresample_free(&rate->avr);
-+}
-+
-+static int pcm_src_init(void *obj, snd_pcm_rate_info_t *info)
-+{
-+ struct rate_src *rate = obj;
-+ int i, ir, or;
-+
-+ if (!rate->avr || rate->channels != info->channels) {
-+ int ret;
-+
-+ pcm_src_free(rate);
-+ rate->channels = info->channels;
-+ ir = rate->in_rate = info->in.rate;
-+ or = rate->out_rate = info->out.rate;
-+ i = av_gcd(or, ir);
-+ if (or > ir) {
-+ phase_shift = or/i;
-+ } else {
-+ phase_shift = ir/i;
-+ }
-+ if (cutoff <= 0.0) {
-+ cutoff = 1.0 - 1.0/filter_size;
-+ if (cutoff < 0.80)
-+ cutoff = 0.80;
-+ }
-+
-+ rate->avr = avresample_alloc_context();
-+ if (!rate->avr)
-+ return -ENOMEM;
-+
-+ av_opt_set_int(rate->avr, "in_sample_rate", info->in.rate, 0);
-+ av_opt_set_int(rate->avr, "out_sample_rate", info->out.rate, 0);
-+ av_opt_set_int(rate->avr, "in_sample_format", AV_SAMPLE_FMT_S16, 0);
-+ av_opt_set_int(rate->avr, "out_sample_format", AV_SAMPLE_FMT_S16, 0);
-+ av_opt_set_int(rate->avr, "in_channel_layout", av_get_default_channel_layout(rate->channels), 0);
-+ av_opt_set_int(rate->avr, "out_channel_layout", av_get_default_channel_layout(rate->channels), 0);
-+
-+ av_opt_set_int(rate->avr, "filter_size", filter_size, 0);
-+ av_opt_set_int(rate->avr, "phase_shift", phase_shift, 0);
-+ av_opt_set_double(rate->avr, "cutoff", cutoff, 0);
-+
-+ ret = avresample_open(rate->avr);
-+ if (ret < 0) {
-+ avresample_free(&rate->avr);
-+ return -EINVAL;
-+ }
-+ }
-+
-+ return 0;
-+}
-+
-+static int pcm_src_adjust_pitch(void *obj, snd_pcm_rate_info_t *info)
-+{
-+ struct rate_src *rate = obj;
-+
-+ if (info->out.rate != rate->out_rate || info->in.rate != rate->in_rate)
-+ pcm_src_init(obj, info);
-+ return 0;
-+}
-+
-+static void pcm_src_reset(void *obj)
-+{
-+ struct rate_src *rate = obj;
-+
-+ if (rate->avr) {
-+ avresample_close(rate->avr);
-+ avresample_open(rate->avr);
-+ }
-+}
-+
-+static void pcm_src_convert_s16(void *obj, int16_t *dst, unsigned int
-+ dst_frames, const int16_t *src, unsigned int src_frames)
-+{
-+ struct rate_src *rate = obj;
-+ int consumed = 0, chans=rate->channels, ret=0, i;
-+ int total_in = avresample_get_delay(rate->avr) + src_frames;
-+
-+ ret = avresample_convert(rate->avr, &dst, dst_frames * chans * 2, dst_frames,
-+ &src, src_frames * chans * 2, src_frames);
-+
-+ avresample_set_compensation(rate->avr,
-+ total_in - src_frames > filter_size ? 0 : 1, src_frames);
-+}
-+
-+static void pcm_src_close(void *obj)
-+{
-+ pcm_src_free(obj);
-+}
-+
-+#if SND_PCM_RATE_PLUGIN_VERSION >= 0x010002
-+static int get_supported_rates(void *obj, unsigned int *rate_min,
-+ unsigned int *rate_max)
-+{
-+ *rate_min = *rate_max = 0; /* both unlimited */
-+ return 0;
-+}
-+
-+static void dump(void *obj, snd_output_t *out)
-+{
-+ snd_output_printf(out, "Converter: libavr\n");
-+}
-+#endif
-+
-+static snd_pcm_rate_ops_t pcm_src_ops = {
-+ .close = pcm_src_close,
-+ .init = pcm_src_init,
-+ .free = pcm_src_free,
-+ .adjust_pitch = pcm_src_adjust_pitch,
-+ .convert_s16 = pcm_src_convert_s16,
-+ .input_frames = input_frames,
-+ .output_frames = output_frames,
-+#if SND_PCM_RATE_PLUGIN_VERSION >= 0x010002
-+ .version = SND_PCM_RATE_PLUGIN_VERSION,
-+ .get_supported_rates = get_supported_rates,
-+ .dump = dump,
-+#endif
-+};
-+
-+int pcm_src_open(unsigned int version, void **objp, snd_pcm_rate_ops_t *ops)
-+
-+{
-+ struct rate_src *rate;
-+
-+#if SND_PCM_RATE_PLUGIN_VERSION < 0x010002
-+ if (version != SND_PCM_RATE_PLUGIN_VERSION) {
-+ fprintf(stderr, "Invalid rate plugin version %x\n", version);
-+ return -EINVAL;
-+ }
-+#endif
-+ rate = calloc(1, sizeof(*rate));
-+ if (!rate)
-+ return -ENOMEM;
-+
-+ *objp = rate;
-+ rate->avr = NULL;
-+#if SND_PCM_RATE_PLUGIN_VERSION >= 0x010002
-+ if (version == 0x010001)
-+ memcpy(ops, &pcm_src_ops, sizeof(snd_pcm_rate_old_ops_t));
-+ else
-+#endif
-+ *ops = pcm_src_ops;
-+ return 0;
-+}
-+
-+int SND_PCM_RATE_PLUGIN_ENTRY(lavcrate)(unsigned int version, void **objp,
-+ snd_pcm_rate_ops_t *ops)
-+{
-+ return pcm_src_open(version, objp, ops);
-+}
-+int SND_PCM_RATE_PLUGIN_ENTRY(lavcrate_higher)(unsigned int version,
-+ void **objp, snd_pcm_rate_ops_t *ops)
-+{
-+ filter_size = 64;
-+ return pcm_src_open(version, objp, ops);
-+}
-+int SND_PCM_RATE_PLUGIN_ENTRY(lavcrate_high)(unsigned int version,
-+ void **objp, snd_pcm_rate_ops_t *ops)
-+{
-+ filter_size = 32;
-+ return pcm_src_open(version, objp, ops);
-+}
-+int SND_PCM_RATE_PLUGIN_ENTRY(lavcrate_fast)(unsigned int version,
-+ void **objp, snd_pcm_rate_ops_t *ops)
-+{
-+ filter_size = 8;
-+ return pcm_src_open(version, objp, ops);
-+}
-+int SND_PCM_RATE_PLUGIN_ENTRY(lavcrate_faster)(unsigned int version,
-+ void **objp, snd_pcm_rate_ops_t *ops)
-+{
-+ filter_size = 4;
-+ return pcm_src_open(version, objp, ops);
-+}
-+
-+
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-02-20 15:49 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-14 15:50 [gentoo-commits] repo/gentoo:master commit in: media-plugins/alsa-plugins/files/, media-plugins/alsa-plugins/ Alexis Ballier
-- strict thread matches above, loose matches on Subject: below --
2016-03-31 20:30 Lars Wendler
2017-05-18 11:44 Lars Wendler
2019-01-04 17:47 Lars Wendler
2019-11-16 13:06 Lars Wendler
2020-02-20 15:49 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox