From 62ea30da405a104eb337ca2b95666ba82f2a95cd Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Mon, 26 Nov 2012 00:09:18 +0100 Subject: [PATCH] [media-plugins/alsa-plugins] version bump to 1.0.26 --- media-plugins/alsa-plugins/Manifest | 26 +---- .../alsa-plugins/alsa-plugins-1.0.26.ebuild | 105 ++++++++++++++++++ .../files/alsa-plugins-1.0.25-avcodec54.patch | 31 ++++++ 3 files changed, 140 insertions(+), 22 deletions(-) create mode 100644 media-plugins/alsa-plugins/alsa-plugins-1.0.26.ebuild create mode 100644 media-plugins/alsa-plugins/files/alsa-plugins-1.0.25-avcodec54.patch diff --git a/media-plugins/alsa-plugins/Manifest b/media-plugins/alsa-plugins/Manifest index a47192935..a0a8c192a 100644 --- a/media-plugins/alsa-plugins/Manifest +++ b/media-plugins/alsa-plugins/Manifest @@ -1,22 +1,4 @@ -AUX 51-pulseaudio-probe.conf 419 RMD160 e6edee566f1051ee05485f12318af571aafece40 SHA1 78e4316e7838183d9d61f3df330aa55b6a003277 SHA256 3f62a5f666274b8bdeac1cb03a576dc9a5bcb72966b42b37a5ebed46f60a4ad8 -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-default.conf 196 RMD160 8d6eda7a28dab00200fff54e2915c7a45ab1aa2f SHA1 ab25eb9d11357e220cbcf542f2ba384b9ebb29ac SHA256 331ddca02bf9324f924baa7ab14460d8878f1db917e509bfc8c314938c53c26f -AUX pulse.conf 415 RMD160 4636ffab972792c6a82bd33b4a8e711744e90ff3 SHA1 65e95649cb2faceb1e6e0fd94572538fd0cf2b5e SHA256 cf84d66f31c86d8ea242ac563f607e9307cba66ac9f58227c0b9ea543fbfcd96 -AUX pulse/pulse-alsa.conf 435 RMD160 4de093dbba575a3c1fa15fec4a0614fc2d064916 SHA1 579ad8059e1f0a772add0469f6408a1a9b71b253 SHA256 375c30b3c3df309c219695af901cbc829e287fe1cec39880ca6a1255d7f8d9ef -AUX pulse/pulse.conf 433 RMD160 6fa0c0dc8a33d4cd757a70e69b20d47bba2c7afa SHA1 4ec0c6521cb126b29f00f82555d92b78dfccfe10 SHA256 bdea4e706b353c4baca34583f0bab1b01b1bdee091d72c263102e531d6b0bf57 -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 -DIST alsa-plugins-1.0.25.tar.bz2 331568 RMD160 757f19af4d86557568188e481391b77f36ab320e SHA1 ab66de081c5b0137943658a2991ba3d5efe91573 SHA256 a0e374fd6d5ee9683473a5b6e73dadde61d54851065ed670d6627d344b565aab -EBUILD alsa-plugins-1.0.23-r3.ebuild 2640 RMD160 494de7d7480605511709fad3c13ead33c96e5250 SHA1 20356248fa1a92b8f84bf0c28d7f168d48710ab9 SHA256 34ef8832e4d8abed12cc1b822df8c3324154f0e666c5af4064de10ce426f1f39 -EBUILD alsa-plugins-1.0.24.ebuild 2671 RMD160 d1b3b94a2ed7dfd9ee4926598d21d083e2ec5687 SHA1 9a119ca6a89fcd608eb4f2172a322d1ea1f6a165 SHA256 26778c1062e7026a251368fb70f3e157cbfe2a4cd28fe5278c729083982b1f61 -EBUILD alsa-plugins-1.0.25-r1.ebuild 2940 RMD160 8d814df78582173e1ef499848bc18ab8d0872f1d SHA1 618674f7310bd0d22c18c75736a4dd60ae5c1c16 SHA256 90c554f2e9154a34b2e969cb98123d0a64b66814b711278521cf605a0b270288 -MISC metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb SHA1 1b895fe6cae4b8eab08ba1a6a1212baf4b4b4105 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054 +DIST alsa-plugins-1.0.23.tar.bz2 326504 SHA256 5c1b2791ad33ef01f0f4f040004c931310da05e45aaa8d4146024c586f2b3183 +DIST alsa-plugins-1.0.24.tar.bz2 329502 SHA256 fa8e12eb2dfeac083f117c03b3708a017531426ba542a8a729e4801d37861263 +DIST alsa-plugins-1.0.25.tar.bz2 331568 SHA256 a0e374fd6d5ee9683473a5b6e73dadde61d54851065ed670d6627d344b565aab +DIST alsa-plugins-1.0.26.tar.bz2 361017 SHA256 03515134d2009db4dfb2769e0ab0e1fb517c8140ffdfd64a984be968e81c9f1f SHA512 3307e3712e2a8a418db9430889cf0b328d09d083d6b9a59b64b59515fc6d6262c3a8b7d32bcdb8f2cb21a0c52072a7264fb4a3066cdc2cf1bd7c8654c7a15919 WHIRLPOOL 1b32dd78b8ce3b0dadba8e0283d7e909bd4c8ca6f2106687315f182d1fe5a27bd627028f3e4ceb3fed42fa638a257c6ebe1846657236e95ed87e81e8566f7494 diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.0.26.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.0.26.ebuild new file mode 100644 index 000000000..d05863497 --- /dev/null +++ b/media-plugins/alsa-plugins/alsa-plugins-1.0.26.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/alsa-plugins-1.0.26.ebuild,v 1.2 2012/09/24 02:16:56 vapier Exp $ + +EAPI=4 + +MY_P=${P/_/} + +inherit autotools eutils base flag-o-matic multilib + +DESCRIPTION="ALSA extra plugins" +HOMEPAGE="http://www.alsa-project.org/" +SRC_URI="mirror://alsaproject/plugins/${MY_P}.tar.bz2" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux" +IUSE="debug ffmpeg jack libsamplerate pulseaudio speex" + +RDEPEND=">=media-libs/alsa-lib-${PV} + ffmpeg? ( virtual/ffmpeg ) + jack? ( >=media-sound/jack-audio-connection-kit-0.98 ) + libsamplerate? ( media-libs/libsamplerate ) + pulseaudio? ( media-sound/pulseaudio ) + speex? ( media-libs/speex )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-1.0.19-missing-avutil.patch + "${FILESDIR}"/${PN}-1.0.23-automagic.patch + "${FILESDIR}"/${PN}-1.0.25-avcodec54.patch +) + +S=${WORKDIR}/${MY_P} + +src_prepare() { + base_src_prepare + + # For some reasons the polyp/pulse plugin does fail with alsaplayer with a + # failed assert. As the code works just fine with asserts disabled, for now + # disable them waiting for a better solution. + sed -i \ + -e '/AM_CFLAGS/s:-Wall:-DNDEBUG -Wall:' \ + pulse/Makefile.am || die + + eautoreconf +} + +src_configure() { + use debug || append-cppflags -DNDEBUG + + local myspeex=no + use speex && myspeex=lib + + econf \ + $(use_enable ffmpeg avcodec) \ + $(use_enable jack) \ + $(use_enable libsamplerate samplerate) \ + $(use_enable pulseaudio) \ + --with-speex=${myspeex} +} + +src_install() { + emake DESTDIR="${D}" install + + cd doc + dodoc upmix.txt vdownmix.txt README-pcm-oss + use jack && dodoc README-jack + use libsamplerate && dodoc samplerate.txt + use ffmpeg && dodoc lavcrate.txt a52.txt + + if use pulseaudio; then + dodoc README-pulse + # install ALSA configuration files + # making PA to be used by alsa clients + insinto /usr/share/alsa + doins "${FILESDIR}"/pulse-default.conf + insinto /usr/share/alsa/alsa.conf.d + doins "${FILESDIR}"/51-pulseaudio-probe.conf + + # since our ebuild works in multilib environments + # we reference PA lib using just the soname (and not + # the full path). This means we have to provide + # proper LDPATHs. + local ldpath="" + for libdir in $(get_all_libdirs); do + ldpath="${ldpath}:/usr/${libdir}/alsa-lib" + done + ldpath="${ldpath:1}" + echo "LDPATH=\"${ldpath}\"" > "${S}/40-alsa-plugin-pulse" + doenvd "${S}/40-alsa-plugin-pulse" + fi + + prune_libtool_files --all +} + +pkg_postinst() { + if use pulseaudio; then + einfo "The PulseAudio device is now set as the default device if the" + einfo "PulseAudio server is found to be running. Any custom" + einfo "configuration in /etc/asound.conf or ~/.asoundrc for this" + einfo "purpose should now be unnecessary." + fi +} diff --git a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.25-avcodec54.patch b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.25-avcodec54.patch new file mode 100644 index 000000000..f9e33340a --- /dev/null +++ b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.25-avcodec54.patch @@ -0,0 +1,31 @@ +Index: alsa-plugins-1.0.25/a52/pcm_a52.c +=================================================================== +--- alsa-plugins-1.0.25.orig/a52/pcm_a52.c ++++ alsa-plugins-1.0.25/a52/pcm_a52.c +@@ -444,13 +444,13 @@ static int a52_prepare(snd_pcm_ioplug_t + #if LIBAVCODEC_VERSION_MAJOR > 52 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 3) + switch (io->channels) { + case 2: +- rec->avctx->channel_layout = CH_LAYOUT_STEREO; ++ rec->avctx->channel_layout = AV_CH_LAYOUT_STEREO; + break; + case 4: +- rec->avctx->channel_layout = CH_LAYOUT_QUAD; ++ rec->avctx->channel_layout = AV_CH_LAYOUT_QUAD; + break; + case 6: +- rec->avctx->channel_layout = CH_LAYOUT_5POINT1; ++ rec->avctx->channel_layout = AV_CH_LAYOUT_5POINT1; + break; + default: + break; +@@ -702,7 +702,9 @@ SND_PCM_PLUGIN_DEFINE_FUNC(a52) + rec->channels = channels; + rec->format = format; + ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54,0,0) + avcodec_init(); ++#endif + avcodec_register_all(); + + rec->codec = avcodec_find_encoder_by_name("ac3_fixed");