diff options
Diffstat (limited to 'media-plugins/alsa-plugins')
-rw-r--r-- | media-plugins/alsa-plugins/Manifest | 5 | ||||
-rw-r--r-- | media-plugins/alsa-plugins/alsa-plugins-1.2.1.ebuild (renamed from media-plugins/alsa-plugins/alsa-plugins-1.1.6.ebuild) | 31 | ||||
-rw-r--r-- | media-plugins/alsa-plugins/files/alsa-plugins-1.1.5-optional_plugins.patch | 46 |
3 files changed, 18 insertions, 64 deletions
diff --git a/media-plugins/alsa-plugins/Manifest b/media-plugins/alsa-plugins/Manifest index 1e77086004fb..e855e9da6e14 100644 --- a/media-plugins/alsa-plugins/Manifest +++ b/media-plugins/alsa-plugins/Manifest @@ -1,15 +1,14 @@ AUX 51-pulseaudio-probe.conf 437 BLAKE2B 5eb7afb4bef1e647cfa1c3e9d6417000c0e74f2722d07a55e63e3a1ad36507bb15c970507450fcc29b51b8cfb77a1a15d8a68a9b1e5dca3279f5b2df85e731f8 SHA512 325c323ad4dcf03a4cf2528d6f5d6a0769c3e3d7bcf09c6fc11fb9cb61bef2cec1e8ad5073c07b6865ffdec4c32165cd80a7c856d13d538ff8320be1c83f9af7 AUX alsa-plugins-1.0.23-automagic.patch 346 BLAKE2B d544fdbf01229404342ae84c81ec72cccbb5def2593bbd323e464300bf04e95ba9f52a24e365b786d44d361a55165841121990f319801574c81e46ef0a111a7e SHA512 e10f990a0138d83af93bbcb8848a588ed0a1dc643452352b75ca56e243979b69a07a1b6685dbd4c5ff6e32a3d2e98fcb3c0f5da35ff5645c0cae490ece3c710c AUX alsa-plugins-1.0.28-libav10.patch 10113 BLAKE2B 880c8e9781ab19afcd724c408c5291948b4ef028935915c13134c03dae393e0a7e9a258fa91905a1a7a663a276d2a53cde6be3477bd5ed5d0e3b6ea2ae38767d SHA512 b0a169c300e3cb21ee76a6773ccc1f6d69c0e9af604d6bf24669a561e038cf670bac20c5eff5ac48b33f3f36de81d99895b6a43c8310b2609e9b2bfce42cc0bc -AUX alsa-plugins-1.1.5-optional_plugins.patch 1123 BLAKE2B 453d9455741c118bde8ac697cc3d5b8b1404eb93d842e7a05193175261cdcd30d34e0cc7a8bd90aeb402799c60bce81dd42dcac2bd3b085b3385ba9e06cc2859 SHA512 9659eca8a071cdb2cbae6f1ec6fc0b447a45858a5464023f1dc5c36fda8053572d6a2a8cff629e8c2768b8a61e9f15d6d7cf420ab1aad1b3773084b7ed959c5e AUX pulse-default.conf 196 BLAKE2B 4293e2ba9b4c87c35e3bdfe45781f86af733341c8bada5a78b38d08c59c5774e5679487e877d11fb7866b2ed7d9f9441552f864e9c2b9e42119eda62e1459ae8 SHA512 c64f73a46c9f50704d4b2bef09d95ce3bc2352da1437750f49974ab8e6f60d5467d5d94ab0e1490deea5f2b1f67b20aa60a10c502e7d6e049649bca4208f7c1e 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 EBUILD alsa-plugins-1.1.1-r1.ebuild 2716 BLAKE2B 6e4e45f7b9ebe382dedb7e8bf50c1867b66d8bf0c6a647647a5f3de2af414c053e00277d80f4828a95680c115b9e6c2d9a973352d3814868b7b0628fd154dbb0 SHA512 7e8e4a8dfd0eaff522f8bb3b8c3ff625cac0299529fd5005485c00d575f6cbc06240659eba0d4451c8fcf33ea2ccbd7416d6d38a0a8f41a8c5b88c4aad44861a -EBUILD alsa-plugins-1.1.6.ebuild 2888 BLAKE2B 53010a3af9bea06d72a2cd29003ef79f9c660d006b35f1c722b1ad6d5042d5fb49275e1d3eec1d75fd2451463dc1521c217e91163cd041a2920e6c8400f74898 SHA512 5b942533f326be2cc4a08a3f8b3b75725538562a4b52c7eca6a1b995c59ba96a302aeda9c3ebe925ed151cd1f2baa52c238e928ee7235766ba393ac5483da603 EBUILD alsa-plugins-1.1.8.ebuild 2830 BLAKE2B a6dc6799d8a9619bd493c96c399660172e02a2a21ec8b39f48eb34c950cef825cb739ef9b255b1d10765a886eb522efed865dc3ea79307cd0fc739077e52db20 SHA512 f764fba4d8385d22362b2e30c05f4b35d3bd5e204e02b79757a07c7b9c7ee96d0e76c572086ee5a0064568ac8fc1ffccea69c634d6c3f5781c63e69857e72b7b EBUILD alsa-plugins-1.1.9-r1.ebuild 3065 BLAKE2B b29d856bd528e96937fa542e7a7864b1e6aef29fac712ed50d32c770db1d7d1e010bcb98c4982465f4a899cb97f09de005337801a7275955f2a823bf73bb0e38 SHA512 ea192a0fb2e89ccbc09d04aa4a5c845a09cf9200b6f93c4a36497985b0472f6863d41312043b4e055e8f7ec1fc7f3bf3647ab6e0cdd8f2b91ed8ff618bc77817 EBUILD alsa-plugins-1.1.9.ebuild 2939 BLAKE2B 9eb1977b1d9250e44c42efe066105b8c9b4570d24d54287091f1973900667968f0e7f29f357bea33f45ed7a9e45901d07c618d0782248c166bf41c8f28bb3c61 SHA512 3c098be52919086a259966982e19dc7dd8fd8c174ed40de7d0d1b1e121e579c49fa4f3af280f22810c2e3bb93921e154e1abcfc92da3529c1e7033db996908d2 +EBUILD alsa-plugins-1.2.1.ebuild 3070 BLAKE2B eb69d3fce1991b49bfdacb6b212bfdfc2c00982b9e4595e86ec0fd7e97eb28d6f9ea8a5d8afbcf1086231ad8900508dc9d843dcd7f373bb65706a2ff93e40609 SHA512 6bfc0711d3a5020c25cc69a91a0ccaf62850e890c531047d72d3c686f3aed20b80155e1b552c613a86b72fbca7078547bdc87fc4ec50087e2454af3ef6f26048 MISC metadata.xml 512 BLAKE2B 2fa80544d70890c99164643bc1706b8c2e5f3d50c991e781e68441072366b1b89d0082507bf1c27d11d95bcd1c7d508f09ce0b193bd7d4ca77f27a2bdf9e24c8 SHA512 fce90766306d36d97ae40cbebf7b788f6f11766afc6d9680f563271ea184373ae20480b99b6e60edc74d9bfb222acd1d11c50163a31520f073a00bba9050e361 diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.1.6.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.2.1.ebuild index 64eb75cc803b..c320568f707e 100644 --- a/media-plugins/alsa-plugins/alsa-plugins-1.1.6.ebuild +++ b/media-plugins/alsa-plugins/alsa-plugins-1.2.1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools flag-o-matic multilib multilib-minimal DESCRIPTION="ALSA extra plugins" @@ -10,7 +10,7 @@ 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" +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=" @@ -27,12 +27,8 @@ RDEPEND=" media-libs/speexdsp[${MULTILIB_USEDEP}] ) " -DEPEND="${RDEPEND} - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/${PN}-1.1.5-optional_plugins.patch" -) +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" src_prepare() { default @@ -40,9 +36,9 @@ 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 \ + sed \ -e '/AM_CFLAGS/s:-Wall:-DNDEBUG -Wall:' \ - pulse/Makefile.am || die + -i pulse/Makefile.am || die eautoreconf } @@ -51,9 +47,12 @@ 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 avcodec) + $(use_enable ffmpeg libav) $(use_enable jack) $(use_enable libsamplerate samplerate) $(use_enable mix) @@ -72,7 +71,7 @@ multilib_src_install_all() { 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 + use ffmpeg && dodoc lavrate.txt a52.txt if use pulseaudio; then dodoc README-pulse @@ -84,12 +83,14 @@ multilib_src_install_all() { doins "${FILESDIR}"/51-pulseaudio-probe.conf # bug #410261, comment 5+ # seems to work fine without any path - sed -i \ + sed \ -e "s:/usr/lib/alsa-lib/::" \ - "${ED%/}"/usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf || die #410261 + -i "${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 + find "${ED}" -type f \( -name '*.a' -o -name '*.la' \) -delete || die } pkg_postinst() { 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 cb232b2da6fb..000000000000 --- 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 - |