diff options
Diffstat (limited to 'media-plugins/alsa-plugins')
| -rw-r--r-- | media-plugins/alsa-plugins/Manifest | 3 | ||||
| -rw-r--r-- | media-plugins/alsa-plugins/alsa-plugins-1.2.5.ebuild | 100 | ||||
| -rw-r--r-- | media-plugins/alsa-plugins/alsa-plugins-1.2.7.1-r1.ebuild (renamed from media-plugins/alsa-plugins/alsa-plugins-1.2.2.ebuild) | 34 | ||||
| -rw-r--r-- | media-plugins/alsa-plugins/files/51-pulseaudio-probe.conf | 2 | ||||
| -rw-r--r-- | media-plugins/alsa-plugins/files/alsa-plugins-1.2.7.1-missing-include.patch | 21 | ||||
| -rw-r--r-- | media-plugins/alsa-plugins/metadata.xml | 1 |
6 files changed, 46 insertions, 115 deletions
diff --git a/media-plugins/alsa-plugins/Manifest b/media-plugins/alsa-plugins/Manifest index b245ef83d604..31f23b89d99b 100644 --- a/media-plugins/alsa-plugins/Manifest +++ b/media-plugins/alsa-plugins/Manifest @@ -1,2 +1 @@ -DIST alsa-plugins-1.2.2.tar.bz2 406494 BLAKE2B 64148e3e6fcf651a2ac62b6b5f3cc915fe6718d35fea53da08f6f4b1a5ff06ba29e69b8cd2a95e3b9edf3880570b1d0b9267239f705043dab592c27fdd150ef3 SHA512 25a7dfaa64be024447d889b5cde668f1308d197f54880548a82d50beb4ac0dbff33b415da1e26dc5229408c934247a9bd38acfb0f82ca388deac0d77ab3cdadb -DIST alsa-plugins-1.2.5.tar.bz2 406134 BLAKE2B a1bb2f187c92a2999722e22775baf2c1fc4240162bb71f454c60359ef61b46934ff8ecd5af97589bafe2c7f737530cf5a4dcc139af7ed001d8dfe24bf3ae045c SHA512 32aa475ec4af040861c2bfb01eac71042242d2109d3c5102d0111f3327e3f6c9031c32cbb50eb4b6568a6bd9408691a047a39972f09d6087e31ec11f19ddc9cf +DIST alsa-plugins-1.2.7.1.tar.bz2 408801 BLAKE2B 6f7aa503eda879cd273f36a16eec702b4da9267a60835cb5acbbfe355a83b7ffa3e93eb6483c9946c1d0bcd845a8f574470e7b84c66f793d0d0c6c9883ad52ee SHA512 437c05a7e0175594768fd6a9a6d1a158bb4a01a7de6a42c2bd468d9381e01b64d385ddfac7d87baf84fe13cb4e65dc24da643940f416d4b191c528728822d964 diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.2.5.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.2.5.ebuild deleted file mode 100644 index a11e006b4711..000000000000 --- a/media-plugins/alsa-plugins/alsa-plugins-1.2.5.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2021 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="https://alsa-project.org/wiki/Main_Page" -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 ~riscv ~sparc ~x86 ~amd64-linux" -IUSE="arcam_av debug ffmpeg jack libsamplerate +mix oss pulseaudio speex +usb_stream" - -RDEPEND=" - >=media-libs/alsa-lib-${PV}:=[${MULTILIB_USEDEP}] - ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] ) - 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" - -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 \ - -e '/AM_CFLAGS/s:-Wall:-DNDEBUG -Wall:' \ - -i pulse/Makefile.am || die - - eautoreconf -} - -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 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 \ - -e "s:/usr/lib/alsa-lib/::" \ - -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}" -type f \( -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.2.2.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.2.7.1-r1.ebuild index e5d2ab885c4d..418a9a31f64d 100644 --- a/media-plugins/alsa-plugins/alsa-plugins-1.2.2.ebuild +++ b/media-plugins/alsa-plugins/alsa-plugins-1.2.7.1-r1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -inherit autotools flag-o-matic multilib multilib-minimal +EAPI=8 + +inherit autotools flag-o-matic multilib-minimal DESCRIPTION="ALSA extra plugins" HOMEPAGE="https://alsa-project.org/wiki/Main_Page" @@ -10,7 +11,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 ~riscv sparc x86 ~amd64-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux" IUSE="arcam_av debug ffmpeg jack libsamplerate +mix oss pulseaudio speex +usb_stream" RDEPEND=" @@ -18,7 +19,7 @@ RDEPEND=" ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] ) jack? ( virtual/jack[${MULTILIB_USEDEP}] ) libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[${MULTILIB_USEDEP}] ) - pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) + pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] ) speex? ( >=media-libs/speex-1.2.0:=[${MULTILIB_USEDEP}] media-libs/speexdsp[${MULTILIB_USEDEP}] @@ -27,6 +28,10 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" +PATCHES=( + "${FILESDIR}"/${PN}-1.2.7.1-missing-include.patch +) + src_prepare() { default @@ -61,6 +66,14 @@ multilib_src_configure() { ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" } +multilib_src_install() { + # Needed to workaround parallel build failure + # bug #835920 + dodir /usr/$(get_libdir)/alsa-lib + + default +} + multilib_src_install_all() { einstalldocs @@ -76,18 +89,15 @@ multilib_src_install_all() { # 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 \ - -e "s:/usr/lib/alsa-lib/::" \ - -i "${ED}"/usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf || die #410261 + # bug #670960 dosym ../../../usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf \ - /etc/alsa/conf.d/51-pulseaudio-probe.conf #670960 + /etc/alsa/conf.d/51-pulseaudio-probe.conf fi - find "${ED}" -type f \( -name '*.a' -o -name '*.la' \) -delete || die + find "${ED}" -type f -name '*.la' -delete || die } pkg_postinst() { diff --git a/media-plugins/alsa-plugins/files/51-pulseaudio-probe.conf b/media-plugins/alsa-plugins/files/51-pulseaudio-probe.conf index c2272c85b072..68f3f994025f 100644 --- a/media-plugins/alsa-plugins/files/51-pulseaudio-probe.conf +++ b/media-plugins/alsa-plugins/files/51-pulseaudio-probe.conf @@ -2,7 +2,7 @@ # default output for applications using alsa when pulseaudio is running. hook_func.pulse_load_if_running { - lib "/usr/lib/alsa-lib/libasound_module_conf_pulse.so" + lib "libasound_module_conf_pulse.so" func "conf_pulse_hook_load_if_running" } diff --git a/media-plugins/alsa-plugins/files/alsa-plugins-1.2.7.1-missing-include.patch b/media-plugins/alsa-plugins/files/alsa-plugins-1.2.7.1-missing-include.patch new file mode 100644 index 000000000000..51217b6a7130 --- /dev/null +++ b/media-plugins/alsa-plugins/files/alsa-plugins-1.2.7.1-missing-include.patch @@ -0,0 +1,21 @@ +https://github.com/alsa-project/alsa-plugins/pull/47 + +From 2c760e55d86b145754866c24c22dbcd6ad3ab897 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 23 Aug 2022 15:21:16 -0700 +Subject: [PATCH] arcam_av.c: Include missing string.h + +bzero() function needs this header to be included + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/arcam-av/arcam_av.c ++++ b/arcam-av/arcam_av.c +@@ -27,6 +27,7 @@ + #include <signal.h> + #include <stddef.h> + #include <stdio.h> ++#include <string.h> + #include <termios.h> + #include <unistd.h> + + diff --git a/media-plugins/alsa-plugins/metadata.xml b/media-plugins/alsa-plugins/metadata.xml index a5c370da6274..b7ef9877f6fb 100644 --- a/media-plugins/alsa-plugins/metadata.xml +++ b/media-plugins/alsa-plugins/metadata.xml @@ -11,5 +11,6 @@ </use> <upstream> <remote-id type="cpe">cpe:/a:alsa-project:alsa-plugins</remote-id> + <remote-id type="github">alsa-project/alsa-plugins</remote-id> </upstream> </pkgmetadata> |