* [gentoo-commits] repo/gentoo:master commit in: media-plugins/alsa-plugins/, media-plugins/alsa-plugins/files/
@ 2018-02-18 14:35 Lars Wendler
0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2018-02-18 14:35 UTC (permalink / raw
To: gentoo-commits
commit: d6a2771f2db6112320635e3f270b087179b173e1
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 18 13:28:08 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Feb 18 14:35:22 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6a2771f
media-plugins/alsa-plugins: Revbump to add a couple of USE flags.
Added the following list of USE flags:
- arcam_av: control plugin for ARCAM AV receiver
- mix: upmix and vdownmix plugins
- oss: OSS plugin
- usb_stream: usb stream plugin
The speex USE flag now also controls the speexdsp configure flag.
Closes: https://bugs.gentoo.org/630856
Package-Manager: Portage-2.3.24, Repoman-2.3.6
.../alsa-plugins/alsa-plugins-1.1.5-r1.ebuild | 108 +++++++++++++++++++++
.../alsa-plugins-1.1.5-optional_plugins.patch | 30 ++++++
media-plugins/alsa-plugins/metadata.xml | 17 ++--
3 files changed, 149 insertions(+), 6 deletions(-)
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.1.5-r1.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.1.5-r1.ebuild
new file mode 100644
index 00000000000..a575c75b6a2
--- /dev/null
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.1.5-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic ltprune 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}]
+ )
+ <media-libs/speex-1.2.0[${MULTILIB_USEDEP}]
+ )
+ media-libs/speex:=[${MULTILIB_USEDEP}]
+ )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.1.5-optional_plugins.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 avcodec)
+ $(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 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
+ # 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
+
+ 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.1.5-optional_plugins.patch b/media-plugins/alsa-plugins/files/alsa-plugins-1.1.5-optional_plugins.patch
new file mode 100644
index 00000000000..3ede79860f6
--- /dev/null
+++ b/media-plugins/alsa-plugins/files/alsa-plugins-1.1.5-optional_plugins.patch
@@ -0,0 +1,30 @@
+Alsa upstream added a couple of configure options to disable some plugins but
+forgot to reflect these changes in Makefile.am.
+
+--- alsa-plugins-1.1.5/Makefile.am
++++ alsa-plugins-1.1.5/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 @@
+ 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
diff --git a/media-plugins/alsa-plugins/metadata.xml b/media-plugins/alsa-plugins/metadata.xml
index 36b45c593d0..64c8bdc7718 100644
--- a/media-plugins/alsa-plugins/metadata.xml
+++ b/media-plugins/alsa-plugins/metadata.xml
@@ -1,10 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
-<email>alsa-bugs@gentoo.org</email>
-</maintainer>
-<upstream>
-<remote-id type="cpe">cpe:/a:alsa-project:alsa-plugins</remote-id>
-</upstream>
+ <maintainer type="project">
+ <email>alsa-bugs@gentoo.org</email>
+ </maintainer>
+ <use>
+ <flag name="arcam_av">Enables Arcam AV control plugin</flag>
+ <flag name="mix">Enables upmix and vdownmix plugin</flag>
+ <flag name="usb_stream">Enables usb_stream plugin</flag>
+ </use>
+ <upstream>
+ <remote-id type="cpe">cpe:/a:alsa-project:alsa-plugins</remote-id>
+ </upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-plugins/alsa-plugins/, media-plugins/alsa-plugins/files/
@ 2022-05-01 19:54 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-05-01 19:54 UTC (permalink / raw
To: gentoo-commits
commit: f24dec544560c7e8d7f495ef7872f72e15a5c678
Author: Igor V. Kovalenko <igor.v.kovalenko <AT> gmail <DOT> com>
AuthorDate: Sat Apr 30 19:11:50 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 1 19:54:17 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f24dec54
media-plugins/alsa-plugins: Clean up unnecessary sed
Drop remaining sed from #410261 and change installed conf file instead.
Bug: https://bugs.gentoo.org/410261
Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/25271
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-plugins/alsa-plugins/alsa-plugins-1.2.2.ebuild | 7 +------
media-plugins/alsa-plugins/alsa-plugins-1.2.5.ebuild | 7 +------
media-plugins/alsa-plugins/alsa-plugins-1.2.6.ebuild | 5 -----
media-plugins/alsa-plugins/files/51-pulseaudio-probe.conf | 2 +-
4 files changed, 3 insertions(+), 18 deletions(-)
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.2.2.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.2.2.ebuild
index e5d2ab885c4d..b6e088bd7f06 100644
--- a/media-plugins/alsa-plugins/alsa-plugins-1.2.2.ebuild
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -78,11 +78,6 @@ multilib_src_install_all() {
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
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.2.5.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.2.5.ebuild
index a11e006b4711..3b7332e08747 100644
--- a/media-plugins/alsa-plugins/alsa-plugins-1.2.5.ebuild
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -78,11 +78,6 @@ multilib_src_install_all() {
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
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.2.6.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.2.6.ebuild
index 9fa566182fda..9a24661c71e9 100644
--- a/media-plugins/alsa-plugins/alsa-plugins-1.2.6.ebuild
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.2.6.ebuild
@@ -78,11 +78,6 @@ multilib_src_install_all() {
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
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"
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-plugins/alsa-plugins/, media-plugins/alsa-plugins/files/
@ 2022-09-10 13:30 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-09-10 13:30 UTC (permalink / raw
To: gentoo-commits
commit: 042cf55e5ef19eaadb16e10d8a463aea64e85ac4
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 10 13:21:05 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 10 13:29:55 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=042cf55e
media-plugins/alsa-plugins: fix implicit function declaration
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../alsa-plugins/alsa-plugins-1.2.7.1-r1.ebuild | 110 +++++++++++++++++++++
.../alsa-plugins-1.2.7.1-missing-include.patch | 21 ++++
2 files changed, 131 insertions(+)
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.2.7.1-r1.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.2.7.1-r1.ebuild
new file mode 100644
index 000000000000..a842162cd5fc
--- /dev/null
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.2.7.1-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic 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 ~loong ~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-libs/libpulse[${MULTILIB_USEDEP}] )
+ speex? (
+ >=media-libs/speex-1.2.0:=[${MULTILIB_USEDEP}]
+ media-libs/speexdsp[${MULTILIB_USEDEP}]
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.2.7.1-missing-include.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 \
+ -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() {
+ # Needed to workaround parallel build failure
+ # bug #835920
+ dodir /usr/$(get_libdir)/alsa-lib
+
+ default
+}
+
+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 #670960
+ dosym ../../../usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf \
+ /etc/alsa/conf.d/51-pulseaudio-probe.conf
+ 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/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>
+
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-09-10 13:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-01 19:54 [gentoo-commits] repo/gentoo:master commit in: media-plugins/alsa-plugins/, media-plugins/alsa-plugins/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2022-09-10 13:30 Sam James
2018-02-18 14:35 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox