1 |
commit: d6a2771f2db6112320635e3f270b087179b173e1 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 18 13:28:08 2018 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 18 14:35:22 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6a2771f |
7 |
|
8 |
media-plugins/alsa-plugins: Revbump to add a couple of USE flags. |
9 |
|
10 |
Added the following list of USE flags: |
11 |
|
12 |
- arcam_av: control plugin for ARCAM AV receiver |
13 |
- mix: upmix and vdownmix plugins |
14 |
- oss: OSS plugin |
15 |
- usb_stream: usb stream plugin |
16 |
|
17 |
The speex USE flag now also controls the speexdsp configure flag. |
18 |
|
19 |
Closes: https://bugs.gentoo.org/630856 |
20 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
21 |
|
22 |
.../alsa-plugins/alsa-plugins-1.1.5-r1.ebuild | 108 +++++++++++++++++++++ |
23 |
.../alsa-plugins-1.1.5-optional_plugins.patch | 30 ++++++ |
24 |
media-plugins/alsa-plugins/metadata.xml | 17 ++-- |
25 |
3 files changed, 149 insertions(+), 6 deletions(-) |
26 |
|
27 |
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 |
28 |
new file mode 100644 |
29 |
index 00000000000..a575c75b6a2 |
30 |
--- /dev/null |
31 |
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.1.5-r1.ebuild |
32 |
@@ -0,0 +1,108 @@ |
33 |
+# Copyright 1999-2018 Gentoo Foundation |
34 |
+# Distributed under the terms of the GNU General Public License v2 |
35 |
+ |
36 |
+EAPI=6 |
37 |
+inherit autotools flag-o-matic ltprune multilib multilib-minimal |
38 |
+ |
39 |
+DESCRIPTION="ALSA extra plugins" |
40 |
+HOMEPAGE="http://www.alsa-project.org/" |
41 |
+SRC_URI="mirror://alsaproject/plugins/${P}.tar.bz2" |
42 |
+ |
43 |
+LICENSE="GPL-2 LGPL-2.1" |
44 |
+SLOT="0" |
45 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux" |
46 |
+IUSE="arcam_av debug ffmpeg jack libav libsamplerate +mix oss pulseaudio speex +usb_stream" |
47 |
+ |
48 |
+RDEPEND=" |
49 |
+ >=media-libs/alsa-lib-${PV}:=[${MULTILIB_USEDEP}] |
50 |
+ ffmpeg? ( |
51 |
+ libav? ( media-video/libav:= ) |
52 |
+ !libav? ( media-video/ffmpeg:0= ) |
53 |
+ ) |
54 |
+ jack? ( virtual/jack[${MULTILIB_USEDEP}] ) |
55 |
+ libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[${MULTILIB_USEDEP}] ) |
56 |
+ pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) |
57 |
+ speex? ( |
58 |
+ || ( |
59 |
+ ( |
60 |
+ >=media-libs/speex-1.2.0[${MULTILIB_USEDEP}] |
61 |
+ media-libs/speexdsp[${MULTILIB_USEDEP}] |
62 |
+ ) |
63 |
+ <media-libs/speex-1.2.0[${MULTILIB_USEDEP}] |
64 |
+ ) |
65 |
+ media-libs/speex:=[${MULTILIB_USEDEP}] |
66 |
+ ) |
67 |
+" |
68 |
+DEPEND="${RDEPEND} |
69 |
+ virtual/pkgconfig" |
70 |
+ |
71 |
+PATCHES=( |
72 |
+ "${FILESDIR}/${PN}-1.1.5-optional_plugins.patch" |
73 |
+) |
74 |
+ |
75 |
+src_prepare() { |
76 |
+ default |
77 |
+ |
78 |
+ # For some reasons the polyp/pulse plugin does fail with alsaplayer with a |
79 |
+ # failed assert. As the code works just fine with asserts disabled, for now |
80 |
+ # disable them waiting for a better solution. |
81 |
+ sed -i \ |
82 |
+ -e '/AM_CFLAGS/s:-Wall:-DNDEBUG -Wall:' \ |
83 |
+ pulse/Makefile.am || die |
84 |
+ |
85 |
+ eautoreconf |
86 |
+} |
87 |
+ |
88 |
+multilib_src_configure() { |
89 |
+ use debug || append-cppflags -DNDEBUG |
90 |
+ |
91 |
+ local myeconfargs=( |
92 |
+ --with-speex="$(usex speex lib no)" |
93 |
+ $(use_enable arcam_av arcamav) |
94 |
+ $(use_enable ffmpeg avcodec) |
95 |
+ $(use_enable jack) |
96 |
+ $(use_enable libsamplerate samplerate) |
97 |
+ $(use_enable mix) |
98 |
+ $(use_enable oss) |
99 |
+ $(use_enable pulseaudio) |
100 |
+ $(use_enable speex speexdsp) |
101 |
+ $(use_enable usb_stream usbstream) |
102 |
+ ) |
103 |
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
104 |
+} |
105 |
+ |
106 |
+multilib_src_install_all() { |
107 |
+ einstalldocs |
108 |
+ |
109 |
+ cd doc || die |
110 |
+ dodoc upmix.txt vdownmix.txt README-pcm-oss |
111 |
+ use jack && dodoc README-jack |
112 |
+ use libsamplerate && dodoc samplerate.txt |
113 |
+ use ffmpeg && dodoc lavcrate.txt a52.txt |
114 |
+ |
115 |
+ if use pulseaudio; then |
116 |
+ dodoc README-pulse |
117 |
+ # install ALSA configuration files |
118 |
+ # making PA to be used by alsa clients |
119 |
+ insinto /usr/share/alsa |
120 |
+ doins "${FILESDIR}"/pulse-default.conf |
121 |
+ insinto /usr/share/alsa/alsa.conf.d |
122 |
+ doins "${FILESDIR}"/51-pulseaudio-probe.conf |
123 |
+ # bug #410261, comment 5+ |
124 |
+ # seems to work fine without any path |
125 |
+ sed -i \ |
126 |
+ -e "s:/usr/lib/alsa-lib/::" \ |
127 |
+ "${ED%/}"/usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf || die #410261 |
128 |
+ fi |
129 |
+ |
130 |
+ prune_libtool_files --all |
131 |
+} |
132 |
+ |
133 |
+pkg_postinst() { |
134 |
+ if use pulseaudio; then |
135 |
+ einfo "The PulseAudio device is now set as the default device if the" |
136 |
+ einfo "PulseAudio server is found to be running. Any custom" |
137 |
+ einfo "configuration in /etc/asound.conf or ~/.asoundrc for this" |
138 |
+ einfo "purpose should now be unnecessary." |
139 |
+ fi |
140 |
+} |
141 |
|
142 |
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 |
143 |
new file mode 100644 |
144 |
index 00000000000..3ede79860f6 |
145 |
--- /dev/null |
146 |
+++ b/media-plugins/alsa-plugins/files/alsa-plugins-1.1.5-optional_plugins.patch |
147 |
@@ -0,0 +1,30 @@ |
148 |
+Alsa upstream added a couple of configure options to disable some plugins but |
149 |
+forgot to reflect these changes in Makefile.am. |
150 |
+ |
151 |
+--- alsa-plugins-1.1.5/Makefile.am |
152 |
++++ alsa-plugins-1.1.5/Makefile.am |
153 |
+@@ -1,4 +1,4 @@ |
154 |
+-SUBDIRS = oss mix usb_stream arcam-av doc |
155 |
++SUBDIRS = doc |
156 |
+ if HAVE_JACK |
157 |
+ SUBDIRS += jack |
158 |
+ endif |
159 |
+@@ -20,6 +20,18 @@ |
160 |
+ if HAVE_SPEEXDSP |
161 |
+ SUBDIRS += speex |
162 |
+ endif |
163 |
++if HAVE_OSS |
164 |
++SUBDIRS += oss |
165 |
++endif |
166 |
++if HAVE_MIX |
167 |
++SUBDIRS += mix |
168 |
++endif |
169 |
++if HAVE_USBSTREAM |
170 |
++SUBDIRS += usb_stream |
171 |
++endif |
172 |
++if HAVE_ARCAMAV |
173 |
++SUBDIRS += arcam-av |
174 |
++endif |
175 |
+ |
176 |
+ EXTRA_DIST = gitcompile version COPYING.GPL m4/attributes.m4 |
177 |
+ AUTOMAKE_OPTIONS = foreign |
178 |
|
179 |
diff --git a/media-plugins/alsa-plugins/metadata.xml b/media-plugins/alsa-plugins/metadata.xml |
180 |
index 36b45c593d0..64c8bdc7718 100644 |
181 |
--- a/media-plugins/alsa-plugins/metadata.xml |
182 |
+++ b/media-plugins/alsa-plugins/metadata.xml |
183 |
@@ -1,10 +1,15 @@ |
184 |
<?xml version="1.0" encoding="UTF-8"?> |
185 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
186 |
<pkgmetadata> |
187 |
-<maintainer type="project"> |
188 |
-<email>alsa-bugs@g.o</email> |
189 |
-</maintainer> |
190 |
-<upstream> |
191 |
-<remote-id type="cpe">cpe:/a:alsa-project:alsa-plugins</remote-id> |
192 |
-</upstream> |
193 |
+ <maintainer type="project"> |
194 |
+ <email>alsa-bugs@g.o</email> |
195 |
+ </maintainer> |
196 |
+ <use> |
197 |
+ <flag name="arcam_av">Enables Arcam AV control plugin</flag> |
198 |
+ <flag name="mix">Enables upmix and vdownmix plugin</flag> |
199 |
+ <flag name="usb_stream">Enables usb_stream plugin</flag> |
200 |
+ </use> |
201 |
+ <upstream> |
202 |
+ <remote-id type="cpe">cpe:/a:alsa-project:alsa-plugins</remote-id> |
203 |
+ </upstream> |
204 |
</pkgmetadata> |