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.1.7-r1.ebuild | 102 | ||||
| -rw-r--r-- | media-plugins/alsa-plugins/alsa-plugins-1.1.8.ebuild (renamed from media-plugins/alsa-plugins/alsa-plugins-1.1.7.ebuild) | 2 | ||||
| -rw-r--r-- | media-plugins/alsa-plugins/files/alsa-plugins-1.1.7-double_free_fix.patch | 34 |
4 files changed, 141 insertions, 2 deletions
diff --git a/media-plugins/alsa-plugins/Manifest b/media-plugins/alsa-plugins/Manifest index 44c4303e3356..6403b01d0964 100644 --- a/media-plugins/alsa-plugins/Manifest +++ b/media-plugins/alsa-plugins/Manifest @@ -2,11 +2,14 @@ AUX 51-pulseaudio-probe.conf 437 BLAKE2B 5eb7afb4bef1e647cfa1c3e9d6417000c0e74f2 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 alsa-plugins-1.1.7-double_free_fix.patch 876 BLAKE2B 782924142a0523ae800b1f55af7b625a0a96f6de07a1c81820c23a98441a066987ccfa35e07c681a48209c5b90b7b1cca3f64e63a4a2d72c818d9d25cc0c235f SHA512 62a21886273d4be05e1094b674b13296dd629ce9aa0deddec3ba4cda9a0a4b00e931aa80be969b3e5dee24c0c649137a23b97bebed15260ee614bf24dcfbe257 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.7.tar.bz2 369866 BLAKE2B 8305f17a7e72e159f1710168cc3a4f0c7deb870c813a8a48b335911717422ac584b6846b047a29880448bdc0597a80881b87e5df1ff018a1e174aea490d3e9df SHA512 c3bb22ec3c5a167fb246cfc94131d53800e321b486ab743c3395a9d91dee0ff9703f6e4a2feaea5a4ee42a7e486d835d48ab880c784c5c34bb4eb5e9ded06d8e +DIST alsa-plugins-1.1.8.tar.bz2 375346 BLAKE2B 65c161ee375e7aed85dbe918a39bc2aa4818bbcfbaadf405f5f0170d9944ff55b5a9da3690e3cd78bd7ffff74ecf235f49cfc3a5dfe18b627c5a9cb0dc1eb207 SHA512 bb1a4411921ec332f47b43515f6d3b4c03a01568854950b9b5c3f0d8172d9a0c4a5b3652bc64c62eae5ea3aaa5d95fe3d32c0a213fe99adf490a9807bcb58ecd EBUILD alsa-plugins-1.1.1-r1.ebuild 2698 BLAKE2B 3fac1377af069760efcc93fe6daa55a3d821742e7ffd5c0976dc0f3a066151ff087d20a65803aa59f253f27f8077d20345da879f92fd3dc28398440e31b3d148 SHA512 9df4f03ae71fe97423bdb37cd28755873a915f210ce92f5f394e15bcecd6662f321acff20b9f212fdb06b63337a7f58d2fb25a6c18eac2be3c5820bc21394860 EBUILD alsa-plugins-1.1.6.ebuild 2871 BLAKE2B 9237177da7962b41c133f03ce43551bade96df33cb8308c72f8e48515e5b74585682220754b2dd0e1cff539e3c2e93aff5be0deff0c08b000af018f89492c133 SHA512 bd24fb484361cdda38ed6f9819a3cf9a66a9ae7fae060818f958168353a199abfc88cf67bc48de3b7ccc7cd5ba36d680c67f85297d5aa0d17600dc29c72b8309 -EBUILD alsa-plugins-1.1.7.ebuild 2820 BLAKE2B 7b75a11208b7d17639c95d97c4146482f724f15b4f10faa597bc98e4b92c81315bec24f1732b16786cca8b226a6e130e124405347f1393769d622931f2675a7c SHA512 e99dfe0dd098ffb7debdfaf29eca29688f7a9c0e82c3c05dd2b48a61339b622d53a37bc1fc22dc2dd46cbec12df3155d0cc706517efa3447eae4fb26f14967fd +EBUILD alsa-plugins-1.1.7-r1.ebuild 2875 BLAKE2B 69390fa6e62ddfb8a415ab06e3ec2fa37851fa0b7a6e02ed3e9ee96291e8d82a09902c8e78068f36ebea1521af07429e603ec0c6e62acd97f9538f97bf148153 SHA512 bd2e1ca77192e0f551a41bbc0cff271284e8be137833a3056b47692dabbbc50ce317217eb6bd66b68cd33df675d86edec8480ccb72cc05e0545decf415037335 +EBUILD alsa-plugins-1.1.8.ebuild 2820 BLAKE2B 3c92ee1ea5de3c66cb58cd94a3b65bbcf1889503b0cb4e040f4d0022c2d173a8d0e138ad8d274110ba73feb4381c3dd5d3ab1baca0cd27822491866266c9ec9d SHA512 ad4be26e27881675e4381b7d5b0f34c54704a96c3b5e00e6e7d31d8004199d34210d4f74b3e5b1d2c577022edc09a7cf9060bad0597ea95790b69aa7e1e416ca MISC metadata.xml 512 BLAKE2B 2fa80544d70890c99164643bc1706b8c2e5f3d50c991e781e68441072366b1b89d0082507bf1c27d11d95bcd1c7d508f09ce0b193bd7d4ca77f27a2bdf9e24c8 SHA512 fce90766306d36d97ae40cbebf7b788f6f11766afc6d9680f563271ea184373ae20480b99b6e60edc74d9bfb222acd1d11c50163a31520f073a00bba9050e361 diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.1.7-r1.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.1.7-r1.ebuild new file mode 100644 index 000000000000..f97cc166249b --- /dev/null +++ b/media-plugins/alsa-plugins/alsa-plugins-1.1.7-r1.ebuild @@ -0,0 +1,102 @@ +# 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="mirror://alsaproject/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" + +PATCHES=( + "${FILESDIR}"/${P}-double_free_fix.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 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 + 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/alsa-plugins-1.1.7.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.1.8.ebuild index 2eff3aacc81b..0e6f55c85fa1 100644 --- a/media-plugins/alsa-plugins/alsa-plugins-1.1.7.ebuild +++ b/media-plugins/alsa-plugins/alsa-plugins-1.1.8.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 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 000000000000..9b3a81599b39 --- /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 + |