diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2011-04-16 10:19:30 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-04-16 10:19:30 +0000 |
commit | 1adc5986c600626f052b5af50742412d90ba59a4 (patch) | |
tree | 360e76a968d349cb25f3bab691de6b0cf29a4e80 /media-plugins | |
parent | Add bug number (diff) | |
download | historical-1adc5986c600626f052b5af50742412d90ba59a4.tar.gz historical-1adc5986c600626f052b5af50742412d90ba59a4.tar.bz2 historical-1adc5986c600626f052b5af50742412d90ba59a4.zip |
old
Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64
Diffstat (limited to 'media-plugins')
10 files changed, 4 insertions, 482 deletions
diff --git a/media-plugins/alsa-plugins/Manifest b/media-plugins/alsa-plugins/Manifest index 83e54b956209..6616be3751e1 100644 --- a/media-plugins/alsa-plugins/Manifest +++ b/media-plugins/alsa-plugins/Manifest @@ -1,25 +1,13 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 -AUX alsa-plugins-1.0.14_rc1-init-ffmpeg.patch 393 RMD160 2c39a3bc0860cebd86542f3afe60f061146b4efa SHA1 ac1839723063fcf3286d1ddf1bd291ba6c0b1220 SHA256 6dfabe2b373e702ebd617754e4a4a32d4fccd1e35c47b280136fe49c2faa8b1e -AUX alsa-plugins-1.0.17-automagic.patch 2409 RMD160 9a4f13962e395de52c9b1b5c4d38e2f7d5f5b97d SHA1 e389bfbdb2d0d50f577e36a7cf00b58b752a2621 SHA256 5272c5f0d86d577f517d0652a4b7eee9977adb25aefa71d0a8690e5bc1607df0 AUX alsa-plugins-1.0.19-missing-avutil.patch 489 RMD160 d32cfe36584809e4aa979a2ee12d4059607c710a SHA1 2a3e565e9e630fbadef45fe1643d78bb83d4be2b SHA256 8b3f3469043f0cf9d313f6a0869080f711e5c0635085f7951a7510b1ddb8168a -AUX alsa-plugins-1.0.19-speex.patch 2741 RMD160 60df99a4085979c313ffc69b2444d7acd81d0ea2 SHA1 294ceb536f66dd81b09ecdae436780439a3d6e2d SHA256 2768121c051d4ddd1581b8a5790369136591538550d2ca48c0f32816c03310f4 -AUX alsa-plugins-1.0.20-automagic.patch 343 RMD160 62e4ace9f1413fc61aa5193a7ff6052e1d898fd5 SHA1 e81137ffaf7e28c22609aa851995dbc6a59d4f29 SHA256 e9fbdf06516a49bd64fe3011b9bcbcf2723befc6f71a231b95cb3c5008e4f213 AUX alsa-plugins-1.0.21-automagic.patch 343 RMD160 fdc54ada82c96919c027fd6468ae707eb0ace945 SHA1 aa22f83603c908159231100e7ba1d64965720b30 SHA256 d1342b93f7f1ad61ceb01e52b4d37bf2de418609bc737ba851c1a64cb1d639d5 -AUX alsa-plugins-1.0.22-automagic.patch 343 RMD160 fdc54ada82c96919c027fd6468ae707eb0ace945 SHA1 aa22f83603c908159231100e7ba1d64965720b30 SHA256 d1342b93f7f1ad61ceb01e52b4d37bf2de418609bc737ba851c1a64cb1d639d5 AUX alsa-plugins-1.0.23-automagic.patch 346 RMD160 59875c0f8372c16e38a232b05a9681c5d9b463ae SHA1 b05aca9232383e21c79915d096aafe357c9cab08 SHA256 fe30d4011c06c37a84ff74f467f37d3c6e7a43c01b436de49addf9a36f794840 -AUX ffmpeg-headers.patch 2016 RMD160 2a0e21f32de08172912d14ab007db1af46bf4e96 SHA1 dc1e77310c76c135798669cb36f880beae6cb249 SHA256 9badd3be64569e92b45353175e4db1e977cf7c5c18d1fb489405fd3c94bb1e45 AUX pulse-alsa.conf 435 RMD160 4de093dbba575a3c1fa15fec4a0614fc2d064916 SHA1 579ad8059e1f0a772add0469f6408a1a9b71b253 SHA256 375c30b3c3df309c219695af901cbc829e287fe1cec39880ca6a1255d7f8d9ef AUX pulse.conf 433 RMD160 6fa0c0dc8a33d4cd757a70e69b20d47bba2c7afa SHA1 4ec0c6521cb126b29f00f82555d92b78dfccfe10 SHA256 bdea4e706b353c4baca34583f0bab1b01b1bdee091d72c263102e531d6b0bf57 -DIST alsa-plugins-1.0.20.tar.bz2 324365 RMD160 e966530c7bf0d2c437d31e9fde49bcb5f4aaff78 SHA1 dc9972416e9b50e6a5cc4f31abd0fb668efba937 SHA256 210ceedcb84bf3030e9f362d55b734312632ce72e348bd758536ec62a37aac97 -DIST alsa-plugins-1.0.21.tar.bz2 325828 RMD160 853416f1c78c9c2b99ba5f2ed0c36df88f21a387 SHA1 dae6f4dd4aa8638aded472cf503eb2c2e5f69730 SHA256 b89c0c4c14dadb3c15cf87a1963bfae3d6aae62d4530a0ab7df1b714ab42dad4 -DIST alsa-plugins-1.0.22.tar.bz2 326266 RMD160 d7540360fc06f531344f735339bd17cad98e140d SHA1 e9bc0cba71a4b66f39d7af5f3638a5667fc76ff2 SHA256 19cd2728a6b91a5ee5ee7a838a7a9bd22824219789716e995e2b24b1dd28b23d DIST alsa-plugins-1.0.23.tar.bz2 326504 RMD160 3e5e06ae42d2b5b17e48926bc53e2e8273c5ea3a SHA1 67db533dba1a055cccc035963fbeeff1532dbffa SHA256 5c1b2791ad33ef01f0f4f040004c931310da05e45aaa8d4146024c586f2b3183 DIST alsa-plugins-1.0.24.tar.bz2 329502 RMD160 70f14c04805a2c1ac34a23e507d6ffd031c12bad SHA1 3f8680de2e3f14ee74027f7e070b3fe416e19dd4 SHA256 fa8e12eb2dfeac083f117c03b3708a017531426ba542a8a729e4801d37861263 -EBUILD alsa-plugins-1.0.20.ebuild 2169 RMD160 1ec04c1524a7dd0d528f0391d1f0f9016fa9da9e SHA1 d37115ab80c2b1e62dd42663de34c11ef68ebaf0 SHA256 f5beef998e23a6fb762254f6f8eab8e4bcbf47f0ce5ca0d4cf93ad24c294b7a6 -EBUILD alsa-plugins-1.0.21.ebuild 2165 RMD160 7069962793943893f44fffa5905aececb2e903a5 SHA1 dca75c4b2cb95e50478a20cccb187ac122bfe2d9 SHA256 771e9277f1fac5c5b23ef96d9a01cc2af891d9f6c2e624ca0a5d38872152815b -EBUILD alsa-plugins-1.0.22.ebuild 2174 RMD160 d1e78b661a4afa5145c94cbe11fec77d5250974a SHA1 f147ec35da28db47c87c9ed161a458643bffbf09 SHA256 a4b58c2adc576ae2e383f014862c896d53f173efccdd8a629e0aecf17d8084f0 EBUILD alsa-plugins-1.0.23-r1.ebuild 2320 RMD160 1c14db87209338526713859a4343da1e0ea44a77 SHA1 6c81f7b88d622046cf8313c591bef13a4b66dfb0 SHA256 5a1371df7deaad80677f31fea379714a0c0e97c9660f9efab62addd86ef4b955 EBUILD alsa-plugins-1.0.24.ebuild 2325 RMD160 5ee30c8502581d6b999daa558d46503ff86ad204 SHA1 6a7f391fb8e3415b37bb640f59cb6771ec871e56 SHA256 b61c2effdc763ce810c1f756c37620fdc9fd864a36659cfa1c24f98fae5dddef MISC ChangeLog 20246 RMD160 019282498186153666db8374787499b2e3ceda6b SHA1 0273ee06dc7e1e473d2ee483d3a62a4f6326fb13 SHA256 85c691197390cae3e8fa51e7c6a4db97379f6d97bae3dfe1a66d4cc3c7836207 @@ -27,7 +15,7 @@ MISC metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb SHA1 1b895 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk2iETwACgkQHB6c3gNBRYcWzACfaj3x/5uUZje7X1s0O4szUje6 -ESAAoJ1dQzqy6dJtBksG/C0dm5Otke2O -=eDrA +iF4EAREIAAYFAk2pbU0ACgkQXkR9YqOcLPFvDgD/f5kqKMdfIF160ZbZFslAvid4 +MQ2VDhek6BvKLehNk/UBAIX0BzfRO28H4XSNN01dsNVvxq43ksjCPT9MbRZC+nNI +=jMuE -----END PGP SIGNATURE----- diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.0.20.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.0.20.ebuild deleted file mode 100644 index b573d36970b5..000000000000 --- a/media-plugins/alsa-plugins/alsa-plugins-1.0.20.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2011 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.20.ebuild,v 1.12 2011/04/10 20:21:10 scarabeus Exp $ - -EAPI=2 - -MY_P="${P/_/}" - -inherit autotools flag-o-matic - -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" -IUSE="debug ffmpeg jack libsamplerate pulseaudio speex" - -RDEPEND=">=media-libs/alsa-lib-${PV}[alsa_pcm_plugins_ioplug] - ffmpeg? ( virtual/ffmpeg - media-libs/alsa-lib[alsa_pcm_plugins_rate,alsa_pcm_plugins_plug] ) - jack? ( >=media-sound/jack-audio-connection-kit-0.98 ) - libsamplerate? ( - media-libs/libsamplerate - media-libs/alsa-lib[alsa_pcm_plugins_rate,alsa_pcm_plugins_plug] ) - pulseaudio? ( media-sound/pulseaudio ) - speex? ( media-libs/speex - media-libs/alsa-lib[alsa_pcm_plugins_rate,alsa_pcm_plugins_plug] ) - !media-plugins/alsa-jack" - -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -S="${WORKDIR}/${MY_P}" - -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:' \ - "${S}/pulse/Makefile.am" - - # Bug #256119 - epatch "${FILESDIR}"/${PN}-1.0.19-missing-avutil.patch - - # Bug #278352 - epatch "${FILESDIR}"/${P}-automagic.patch - - eautoreconf -} - -src_configure() { - use debug || append-flags -DNDEBUG - - local myspeex - - if use speex; then - myspeex=lib - else - myspeex=no - fi - - econf \ - --disable-dependency-tracking \ - $(use_enable ffmpeg avcodec) \ - $(use_enable jack) \ - $(use_enable libsamplerate samplerate) \ - $(use_enable pulseaudio) \ - --with-speex=${myspeex} -} - -src_install() { - emake DESTDIR="${D}" install - - cd "${S}/doc" - dodoc upmix.txt vdownmix.txt README-pcm-oss - use jack && dodoc README-jack - use libsamplerate && dodoc samplerate.txt - use pulseaudio && dodoc README-pulse - use ffmpeg && dodoc lavcrate.txt a52.txt -} diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.0.21.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.0.21.ebuild deleted file mode 100644 index 626de36a8910..000000000000 --- a/media-plugins/alsa-plugins/alsa-plugins-1.0.21.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2011 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.21.ebuild,v 1.10 2011/04/10 20:21:10 scarabeus Exp $ - -EAPI=2 - -MY_P="${P/_/}" - -inherit autotools flag-o-matic - -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" -IUSE="debug ffmpeg jack libsamplerate pulseaudio speex" - -RDEPEND=">=media-libs/alsa-lib-${PV}[alsa_pcm_plugins_ioplug] - ffmpeg? ( virtual/ffmpeg - media-libs/alsa-lib[alsa_pcm_plugins_rate,alsa_pcm_plugins_plug] ) - jack? ( >=media-sound/jack-audio-connection-kit-0.98 ) - libsamplerate? ( - media-libs/libsamplerate - media-libs/alsa-lib[alsa_pcm_plugins_rate,alsa_pcm_plugins_plug] ) - pulseaudio? ( media-sound/pulseaudio ) - speex? ( media-libs/speex - media-libs/alsa-lib[alsa_pcm_plugins_rate,alsa_pcm_plugins_plug] ) - !media-plugins/alsa-jack" - -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -S="${WORKDIR}/${MY_P}" - -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:' \ - "${S}/pulse/Makefile.am" - - # Bug #256119 - epatch "${FILESDIR}"/${PN}-1.0.19-missing-avutil.patch - - # Bug #278352 - epatch "${FILESDIR}"/${P}-automagic.patch - - eautoreconf -} - -src_configure() { - use debug || append-flags -DNDEBUG - - local myspeex - - if use speex; then - myspeex=lib - else - myspeex=no - fi - - econf \ - --disable-dependency-tracking \ - $(use_enable ffmpeg avcodec) \ - $(use_enable jack) \ - $(use_enable libsamplerate samplerate) \ - $(use_enable pulseaudio) \ - --with-speex=${myspeex} -} - -src_install() { - emake DESTDIR="${D}" install - - cd "${S}/doc" - dodoc upmix.txt vdownmix.txt README-pcm-oss - use jack && dodoc README-jack - use libsamplerate && dodoc samplerate.txt - use pulseaudio && dodoc README-pulse - use ffmpeg && dodoc lavcrate.txt a52.txt -} diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.0.22.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.0.22.ebuild deleted file mode 100644 index b9af9732d9cd..000000000000 --- a/media-plugins/alsa-plugins/alsa-plugins-1.0.22.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2011 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.22.ebuild,v 1.2 2011/04/10 20:21:10 scarabeus Exp $ - -EAPI=2 - -MY_P="${P/_/}" - -inherit autotools flag-o-matic - -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" -IUSE="debug ffmpeg jack libsamplerate pulseaudio speex" - -RDEPEND=">=media-libs/alsa-lib-${PV}[alsa_pcm_plugins_ioplug] - ffmpeg? ( virtual/ffmpeg - media-libs/alsa-lib[alsa_pcm_plugins_rate,alsa_pcm_plugins_plug] ) - jack? ( >=media-sound/jack-audio-connection-kit-0.98 ) - libsamplerate? ( - media-libs/libsamplerate - media-libs/alsa-lib[alsa_pcm_plugins_rate,alsa_pcm_plugins_plug] ) - pulseaudio? ( media-sound/pulseaudio ) - speex? ( media-libs/speex - media-libs/alsa-lib[alsa_pcm_plugins_rate,alsa_pcm_plugins_plug] ) - !media-plugins/alsa-jack" - -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -S="${WORKDIR}/${MY_P}" - -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:' \ - "${S}/pulse/Makefile.am" - - # Bug #256119 - epatch "${FILESDIR}"/${PN}-1.0.19-missing-avutil.patch - - # Bug #278352 - epatch "${FILESDIR}"/${P}-automagic.patch - - eautoreconf -} - -src_configure() { - use debug || append-flags -DNDEBUG - - local myspeex - - if use speex; then - myspeex=lib - else - myspeex=no - fi - - econf \ - --disable-dependency-tracking \ - $(use_enable ffmpeg avcodec) \ - $(use_enable jack) \ - $(use_enable libsamplerate samplerate) \ - $(use_enable pulseaudio) \ - --with-speex=${myspeex} -} - -src_install() { - emake DESTDIR="${D}" install - - cd "${S}/doc" - dodoc upmix.txt vdownmix.txt README-pcm-oss - use jack && dodoc README-jack - use libsamplerate && dodoc samplerate.txt - use pulseaudio && dodoc README-pulse - use ffmpeg && dodoc lavcrate.txt a52.txt -} diff --git a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.14_rc1-init-ffmpeg.patch b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.14_rc1-init-ffmpeg.patch deleted file mode 100644 index c0bc1be37cc9..000000000000 --- a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.14_rc1-init-ffmpeg.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: alsa-plugins-1.0.14rc1/a52/pcm_a52.c -=================================================================== ---- alsa-plugins-1.0.14rc1.orig/a52/pcm_a52.c -+++ alsa-plugins-1.0.14rc1/a52/pcm_a52.c -@@ -421,6 +421,8 @@ static int a52_prepare(snd_pcm_ioplug_t - { - struct a52_ctx *rec = io->private_data; - -+ avcodec_init(); -+ - a52_free(rec); - - rec->avctx = avcodec_alloc_context(); diff --git a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.17-automagic.patch b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.17-automagic.patch deleted file mode 100644 index 410fd9213569..000000000000 --- a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.17-automagic.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff -ur alsa-plugins-1.0.17.orig/configure.in alsa-plugins-1.0.17/configure.in ---- alsa-plugins-1.0.17.orig/configure.in 2008-07-30 22:01:02.000000000 -0400 -+++ alsa-plugins-1.0.17/configure.in 2008-07-30 22:04:59.000000000 -0400 -@@ -15,13 +15,25 @@ - AC_CHECK_LIB(asound, snd_pcm_ioplug_create,, - AC_ERROR([*** libasound has no external plugin SDK]), -ldl) - --PKG_CHECK_MODULES(JACK, jack >= 0.98, [HAVE_JACK=yes], [HAVE_JACK=no]) -+AC_ARG_ENABLE([jack], -+ AC_HELP_STRING([--disable-jack], [Disable building of JACK plugin])) -+if test "x$enable_jack" != "xno"; then -+ PKG_CHECK_MODULES(JACK, jack >= 0.98, [HAVE_JACK=yes], [HAVE_JACK=no]) -+fi - AM_CONDITIONAL(HAVE_JACK, test x$HAVE_JACK = xyes) - --PKG_CHECK_MODULES(pulseaudio, [libpulse >= 0.9.2], [HAVE_PULSE=yes], [HAVE_PULSE=no]) -+AC_ARG_ENABLE([pulseaudio], -+ AC_HELP_STRING([--disable-pulseaudio], [Disable building of pulseaudio plugin])) -+if test "x$enable_pulseaudio" != "xno"; then -+ PKG_CHECK_MODULES(pulseaudio, [libpulse >= 0.9.2], [HAVE_PULSE=yes], [HAVE_PULSE=no]) -+fi - AM_CONDITIONAL(HAVE_PULSE, test x$HAVE_PULSE = xyes) - --PKG_CHECK_MODULES(samplerate, [samplerate], [HAVE_SAMPLERATE=yes], [HAVE_SAMPLERATE=no]) -+AC_ARG_ENABLE([samplerate], -+ AC_HELP_STRING([--disable-samplerate], [Disable building of samplerate plugin])) -+if test "x$enable_samplerate" != "xno"; then -+ PKG_CHECK_MODULES(samplerate, [samplerate], [HAVE_SAMPLERATE=yes], [HAVE_SAMPLERATE=no]) -+fi - AM_CONDITIONAL(HAVE_SAMPLERATE, test x$HAVE_SAMPLERATE = xyes) - - AC_ARG_ENABLE([maemo-plugin], -@@ -45,6 +57,8 @@ - fi - fi - -+AC_ARG_ENABLE([avcodec], -+ AC_HELP_STRING([--disable-avcodec], [Disable building of avcodec code (a52 plugin)])) - AC_ARG_WITH([avcodec-includedir], - AS_HELP_STRING([--with-avcodec-includedir=dir], - [AVcodec include directory]), -@@ -60,9 +74,11 @@ - AC_SUBST(AVCODEC_CFLAGS) - AVCODEC_LIBS="$AVCODEC_LIBS -lavcodec" - AC_SUBST(AVCODEC_LIBS) --AC_CHECK_LIB([avcodec], [avcodec_open], [HAVE_AVCODEC=yes], [HAVE_AVCODEC=no]) --if test x$HAVE_AVCODEC = xyes; then -- AC_CHECK_HEADER([ffmpeg/avcodec.h], [], [HAVE_AVCODEC=no]) -+if test "x$enable_avcodec" != "xno"; then -+ AC_CHECK_LIB([avcodec], [avcodec_open], [HAVE_AVCODEC=yes], [HAVE_AVCODEC=no]) -+ if test x$HAVE_AVCODEC = xyes; then -+ AC_CHECK_HEADER([ffmpeg/avcodec.h], [], [HAVE_AVCODEC=no]) -+ fi - fi - AM_CONDITIONAL(HAVE_AVCODEC, test x$HAVE_AVCODEC = xyes) - CFLAGS="$CFLAGS_saved" diff --git a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.19-speex.patch b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.19-speex.patch deleted file mode 100644 index 5f339a3e1e81..000000000000 --- a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.19-speex.patch +++ /dev/null @@ -1,73 +0,0 @@ -From: Takashi Iwai <tiwai@suse.de> -Date: Wed, 21 Jan 2009 15:53:36 +0000 (+0100) -Subject: Fix build of pph plugin with speex-1.2rc1 -X-Git-Tag: v1.0.20~10 -X-Git-Url: http://git.alsa-project.org/?p=alsa-plugins.git;a=commitdiff_plain;h=ba7cd8e0a04798479f851741ec29fef97889aa39;hp=c547b535a20a0909c17cb6dd14e5e364b2ae0fe9 - -Fix build of pph plugin with speex-1.2rc1 - -The resampler code is moved to libspeexdsp instead of libspeex. - -Signed-off-by: Takashi Iwai <tiwai@suse.de> ---- - -diff --git a/configure.in b/configure.in -index 837934f..ce95b5d 100644 ---- a/configure.in -+++ b/configure.in -@@ -106,16 +106,18 @@ AC_SUBST(AVCODEC_CFLAGS) - AC_SUBST(AVCODEC_LIBS) - AC_SUBST(AVCODEC_HEADER) - --USE_LIBSPEEX="" -+PKG_CHECK_MODULES(speexdsp, [speexdsp >= 1.2], [HAVE_SPEEXDSP="yes"], [HAVE_SPEEXDSP=""]) -+AM_CONDITIONAL(HAVE_SPEEXDSP, test "$HAVE_SPEEXDSP" = "yes") -+ - AC_ARG_WITH([speex], - AS_HELP_STRING([--with-speex={builtin|lib|no}], - [build speex resampler (built-in code, link with external lib, or no build)]), - [PPH=$withval], [PPH="lib"]) - -+USE_LIBSPEEX="" - if test "$PPH" = "lib"; then -- PKG_CHECK_MODULES(speex, [speex >= 1.2], [USE_LIBSPEEX="yes"], [USE_LIBSPEEX=""]) -- if test "$USE_LIBSPEEX" = "yes"; then -- AC_CHECK_LIB([speex], [speex_resampler_init], -+ if test "$HAVE_SPEEXDSP" = "yes"; then -+ AC_CHECK_LIB([speexdsp], [speex_resampler_init], - [USE_LIBSPEEX="yes"], [USE_LIBSPEEX=""]) - fi - if test "$USE_LIBSPEEX" = "yes"; then -@@ -197,6 +199,6 @@ if test "$HAVE_AVCODEC" = "yes"; then - fi - echo "Speex rate plugin: $PPH" - if test "$PPH" = "lib"; then -- echo " speex_CFLAGS: $speex_CFLAGS" -- echo " speex_LIBS: $speex_LIBS" -+ echo " speexdsp_CFLAGS: $speexdsp_CFLAGS" -+ echo " speexdsp_LIBS: $speexdsp_LIBS" - fi -diff --git a/pph/Makefile.am b/pph/Makefile.am -index d24176c..551e5bd 100644 ---- a/pph/Makefile.am -+++ b/pph/Makefile.am -@@ -2,15 +2,16 @@ asound_module_rate_speexrate_LTLIBRARIES = libasound_module_rate_speexrate.la - - asound_module_rate_speexratedir = @ALSA_PLUGIN_DIR@ - --AM_CFLAGS = -DVAR_ARRAYS -DRANDOM_PREFIX=alsa_lib -DOUTSIDE_SPEEX -Wall -g @ALSA_CFLAGS@ -+AM_CFLAGS = -DVAR_ARRAYS -Wall -g @ALSA_CFLAGS@ - AM_LDFLAGS = -module -avoid-version -export-dynamic -no-undefined $(LDFLAGS_NOUNDEFINED) - - libasound_module_rate_speexrate_la_SOURCES = rate_speexrate.c - libasound_module_rate_speexrate_la_LIBADD = @ALSA_LIBS@ - if USE_LIBSPEEX --AM_CFLAGS += @speex_CFLAGS@ --libasound_module_rate_speexrate_la_LIBADD += @speex_LIBS@ -+AM_CFLAGS += @speexdsp_CFLAGS@ -+libasound_module_rate_speexrate_la_LIBADD += @speexdsp_LIBS@ - else -+AM_CFLAGS += -DRANDOM_PREFIX=alsa_lib -DOUTSIDE_SPEEX - libasound_module_rate_speexrate_la_SOURCES += resample.c - libasound_module_rate_speexrate_la_LIBADD += -lm - endif diff --git a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.20-automagic.patch b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.20-automagic.patch deleted file mode 100644 index 512ccc755e06..000000000000 --- a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.20-automagic.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur alsa-plugins-1.0.20.orig/Makefile.am alsa-plugins-1.0.20/Makefile.am ---- alsa-plugins-1.0.20.orig/Makefile.am 2009-05-06 10:07:28.000000000 +0300 -+++ alsa-plugins-1.0.20/Makefile.am 2009-08-01 18:23:26.000000000 +0300 -@@ -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.22-automagic.patch b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.22-automagic.patch deleted file mode 100644 index f7d9e7dc437a..000000000000 --- a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.22-automagic.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur alsa-plugins-1.0.21.orig/Makefile.am alsa-plugins-1.0.21/Makefile.am ---- alsa-plugins-1.0.21.orig/Makefile.am 2009-05-06 10:07:28.000000000 +0300 -+++ alsa-plugins-1.0.21/Makefile.am 2009-08-01 18:23:26.000000000 +0300 -@@ -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/ffmpeg-headers.patch b/media-plugins/alsa-plugins/files/ffmpeg-headers.patch deleted file mode 100644 index 86026d48d54c..000000000000 --- a/media-plugins/alsa-plugins/files/ffmpeg-headers.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -ru alsa-plugins-1.0.17.orig/a52/pcm_a52.c alsa-plugins-1.0.17/a52/pcm_a52.c ---- alsa-plugins-1.0.17.orig/a52/pcm_a52.c 2008-08-06 18:28:39.000000000 +0200 -+++ alsa-plugins-1.0.17/a52/pcm_a52.c 2008-08-06 18:28:54.000000000 +0200 -@@ -18,6 +18,7 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -+#include "config.h" - #include <stdio.h> - #include <string.h> - #define __USE_XOPEN -@@ -25,7 +26,11 @@ - #include <alsa/asoundlib.h> - #include <alsa/pcm_external.h> - #include <alsa/pcm_plugin.h> -+#ifdef HAVE_FFMPEG_AVCODEC_H - #include <ffmpeg/avcodec.h> -+#elif defined(HAVE_LIBAVCODEC_AVCODEC_H) -+#include <libavcodec/avcodec.h> -+#endif - - struct a52_ctx { - snd_pcm_ioplug_t io; -diff -ru alsa-plugins-1.0.17.orig/configure.in alsa-plugins-1.0.17/configure.in ---- alsa-plugins-1.0.17.orig/configure.in 2008-08-06 18:28:39.000000000 +0200 -+++ alsa-plugins-1.0.17/configure.in 2008-08-06 18:31:00.000000000 +0200 -@@ -77,7 +77,7 @@ - if test "x$enable_avcodec" != "xno"; then - AC_CHECK_LIB([avcodec], [avcodec_open], [HAVE_AVCODEC=yes], [HAVE_AVCODEC=no]) - if test x$HAVE_AVCODEC = xyes; then -- AC_CHECK_HEADER([ffmpeg/avcodec.h], [], [HAVE_AVCODEC=no]) -+ AC_CHECK_HEADERS([ffmpeg/avcodec.h], , [AC_CHECK_HEADERS([libavcodec/avcodec.h], , [HAVE_AVCODEC=no])]) - fi - fi - AM_CONDITIONAL(HAVE_AVCODEC, test x$HAVE_AVCODEC = xyes) -diff -ru alsa-plugins-1.0.17.orig/rate-lavc/rate_lavcrate.c alsa-plugins-1.0.17/rate-lavc/rate_lavcrate.c ---- alsa-plugins-1.0.17.orig/rate-lavc/rate_lavcrate.c 2008-08-06 18:28:39.000000000 +0200 -+++ alsa-plugins-1.0.17/rate-lavc/rate_lavcrate.c 2008-08-06 18:28:54.000000000 +0200 -@@ -16,10 +16,15 @@ - * Lesser General Public License for more details. - */ - -+#include "config.h" - #include <stdio.h> - #include <alsa/asoundlib.h> - #include <alsa/pcm_rate.h> -+#ifdef HAVE_FFMPEG_AVCODEC_H - #include <ffmpeg/avcodec.h> -+#elif defined(HAVE_LIBAVCODEC_AVCODEC_H) -+#include <libavcodec/avcodec.h> -+#endif - #include "gcd.h" - - static int filter_size = 16; |