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,
