Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-plugins/alsa-plugins/files/, media-plugins/alsa-plugins/
Date: Thu, 31 Mar 2016 20:30:17
Message-Id: 1459456205.e392df817efea77c0776de780ea4bdbf03de6382.polynomial-c@gentoo
1 commit: e392df817efea77c0776de780ea4bdbf03de6382
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Mar 31 20:05:17 2016 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Mar 31 20:30:05 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e392df81
7
8 media-plugins/alsa-plugins: Removed old.
9
10 Package-Manager: portage-2.2.28
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 media-plugins/alsa-plugins/Manifest | 2 -
14 .../alsa-plugins/alsa-plugins-1.0.27-r1.ebuild | 92 --------------------
15 .../alsa-plugins/alsa-plugins-1.0.27-r3.ebuild | 99 ----------------------
16 .../alsa-plugins/alsa-plugins-1.0.28.ebuild | 94 --------------------
17 .../files/alsa-plugins-1.0.19-missing-avutil.patch | 11 ---
18 .../alsa-plugins-1.0.27-ffmpeg-version-check.patch | 13 ---
19 .../files/alsa-plugins-1.0.27-ffmpeg.patch | 38 ---------
20 7 files changed, 349 deletions(-)
21
22 diff --git a/media-plugins/alsa-plugins/Manifest b/media-plugins/alsa-plugins/Manifest
23 index 700a00d..007f533 100644
24 --- a/media-plugins/alsa-plugins/Manifest
25 +++ b/media-plugins/alsa-plugins/Manifest
26 @@ -1,5 +1,3 @@
27 -DIST alsa-plugins-1.0.27.tar.bz2 363593 SHA256 0bbd0c37c2dd7baf16363afb2e58169ffb0f9c0a70031b3b6235594630f3ab35 SHA512 73c2010b66022429bc664bdab1c03694dfd669260dea569e32496bc6e10a11a0da2dd87db6a661ab1376f3aa59f1df8a84cb48ff1d20bb064756c655203f9993 WHIRLPOOL 4487734e0377c880a46df6f7fa53d86a7c38fa3d4bd35e06d128c0ec2b99c789ed64674b59003d8bd0abce2db53301234e467d235532ea145ddb150919cb49af
28 -DIST alsa-plugins-1.0.28.tar.bz2 366023 SHA256 426f8af1a07ee9d8c06449524d1f0bd59a06e0331a51aa3d59d343a7c6d03120 SHA512 c79cf22f426f500c704c947af602604c62a76a026c9b945589d1ca83dff16de23cec2f1c29c9713e42736092aa0d0389e514ca2ca646f8e4770c8aa8320725cc WHIRLPOOL 9cb54e2a30a3f682aa23acb6317f267ffb3cd47eceb959fbce73c8db3ba7c8af420b91b91cce865f0aaf0c60b2920f51972640aff8413c871d0709fa7f4f90a6
29 DIST alsa-plugins-1.0.29.tar.bz2 366077 SHA256 325d85cac285f632b83e0191ae3f348bad03c1f007b937042f164abb81ea6532 SHA512 6bc7d417ee5deb00a6e36864778deb4675a186951747cc799386288704f0d22a5c3d7011b6091602378d02ee79c4696ebb879140cebea392bd68937c8640898a WHIRLPOOL 987c348b536b03b36c2e7f9bff733e5309961b6f052d6a76f1372eb231d9af92191c113d0a577221809b0fcc4bc9614f278afb10472bd1606822aab468210af3
30 DIST alsa-plugins-1.1.0.tar.bz2 366296 SHA256 3b83c329953bef99f5fe25ae04ec4a455fe6514939f3b45a5321966652b2c9ee SHA512 5ed31ce1b6d11232d464d3cdef6015403840edbf2154266a479c2fde12ef4506e1f20c0f405ccee9cc39aec80be3bc41b10798a4475494ba56c6b4d69637fdc9 WHIRLPOOL 32c8460ed27a6a554f983e476e09847940e152cbc7b8cf0909243d312091560b1b25360249e3edeae50a46c5990f216cfd17915ec539812a5c473406705c2e73
31 DIST alsa-plugins-1.1.1.tar.bz2 366193 SHA256 8ea4d1e082c36528a896a2581e5eb62d4dc2683238e353050d0d624e65f901f1 SHA512 9dd277cb5cce144ce4e5e0010cebcba0f8634c783e7bcd80ce6d04b198d6de5150a2764df3087a39a468b5fb7c4578de2e252095568e811dedaa5e7ffdbeb7c9 WHIRLPOOL 20f36afcb01dfe47172b6470fea929ffb267e0b7a78ac4ca8c2031b33faa6fe15bd0608d9963e053366ac6bf3b2f540d776537c8547418a0d2b80b5c0366a76f
32
33 diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.0.27-r1.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.0.27-r1.ebuild
34 deleted file mode 100644
35 index 32e81d4..0000000
36 --- a/media-plugins/alsa-plugins/alsa-plugins-1.0.27-r1.ebuild
37 +++ /dev/null
38 @@ -1,92 +0,0 @@
39 -# Copyright 1999-2014 Gentoo Foundation
40 -# Distributed under the terms of the GNU General Public License v2
41 -# $Id$
42 -
43 -EAPI=5
44 -inherit autotools eutils flag-o-matic multilib
45 -
46 -DESCRIPTION="ALSA extra plugins"
47 -HOMEPAGE="http://www.alsa-project.org/"
48 -SRC_URI="mirror://alsaproject/plugins/${P}.tar.bz2"
49 -
50 -LICENSE="GPL-2 LGPL-2.1"
51 -SLOT="0"
52 -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux"
53 -IUSE="debug ffmpeg jack libsamplerate pulseaudio speex"
54 -
55 -RDEPEND=">=media-libs/alsa-lib-${PV}:=
56 - ffmpeg? ( virtual/ffmpeg )
57 - jack? ( >=media-sound/jack-audio-connection-kit-0.98 )
58 - libsamplerate? ( media-libs/libsamplerate:= )
59 - pulseaudio? ( media-sound/pulseaudio )
60 - speex? ( media-libs/speex:= )"
61 -DEPEND="${RDEPEND}
62 - virtual/pkgconfig"
63 -
64 -src_prepare() {
65 - epatch \
66 - "${FILESDIR}"/${PN}-1.0.19-missing-avutil.patch \
67 - "${FILESDIR}"/${PN}-1.0.23-automagic.patch \
68 - "${FILESDIR}"/${P}-{ffmpeg,ffmpeg-version-check}.patch
69 -
70 - epatch_user
71 -
72 - # For some reasons the polyp/pulse plugin does fail with alsaplayer with a
73 - # failed assert. As the code works just fine with asserts disabled, for now
74 - # disable them waiting for a better solution.
75 - sed -i \
76 - -e '/AM_CFLAGS/s:-Wall:-DNDEBUG -Wall:' \
77 - pulse/Makefile.am || die
78 -
79 - eautoreconf
80 -}
81 -
82 -src_configure() {
83 - use debug || append-cppflags -DNDEBUG
84 -
85 - local myspeex=no
86 - use speex && myspeex=lib
87 -
88 - econf \
89 - $(use_enable ffmpeg avcodec) \
90 - $(use_enable jack) \
91 - $(use_enable libsamplerate samplerate) \
92 - $(use_enable pulseaudio) \
93 - --with-speex=${myspeex}
94 -}
95 -
96 -src_install() {
97 - emake DESTDIR="${D}" install
98 -
99 - cd doc
100 - dodoc upmix.txt vdownmix.txt README-pcm-oss
101 - use jack && dodoc README-jack
102 - use libsamplerate && dodoc samplerate.txt
103 - use ffmpeg && dodoc lavcrate.txt a52.txt
104 -
105 - if use pulseaudio; then
106 - dodoc README-pulse
107 - # install ALSA configuration files
108 - # making PA to be used by alsa clients
109 - insinto /usr/share/alsa
110 - doins "${FILESDIR}"/pulse-default.conf
111 - insinto /usr/share/alsa/alsa.conf.d
112 - doins "${FILESDIR}"/51-pulseaudio-probe.conf
113 - # bug #410261, comment 5+
114 - # seems to work fine without any path
115 - sed -i \
116 - -e "s:/usr/lib/alsa-lib/::" \
117 - "${ED}"/usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf || die #410261
118 - fi
119 -
120 - prune_libtool_files --all
121 -}
122 -
123 -pkg_postinst() {
124 - if use pulseaudio; then
125 - einfo "The PulseAudio device is now set as the default device if the"
126 - einfo "PulseAudio server is found to be running. Any custom"
127 - einfo "configuration in /etc/asound.conf or ~/.asoundrc for this"
128 - einfo "purpose should now be unnecessary."
129 - fi
130 -}
131
132 diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.0.27-r3.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.0.27-r3.ebuild
133 deleted file mode 100644
134 index f6644a9..0000000
135 --- a/media-plugins/alsa-plugins/alsa-plugins-1.0.27-r3.ebuild
136 +++ /dev/null
137 @@ -1,99 +0,0 @@
138 -# Copyright 1999-2014 Gentoo Foundation
139 -# Distributed under the terms of the GNU General Public License v2
140 -# $Id$
141 -
142 -EAPI=5
143 -inherit autotools eutils flag-o-matic multilib multilib-minimal
144 -
145 -DESCRIPTION="ALSA extra plugins"
146 -HOMEPAGE="http://www.alsa-project.org/"
147 -SRC_URI="mirror://alsaproject/plugins/${P}.tar.bz2"
148 -
149 -LICENSE="GPL-2 LGPL-2.1"
150 -SLOT="0"
151 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux"
152 -IUSE="debug ffmpeg jack libsamplerate pulseaudio speex"
153 -
154 -# TODO: handle USE=ffmpeg once it is converted
155 -
156 -RDEPEND=">=media-libs/alsa-lib-${PV}:=[${MULTILIB_USEDEP}]
157 - ffmpeg? ( virtual/ffmpeg )
158 - jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
159 - libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[${MULTILIB_USEDEP}] )
160 - pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
161 - speex? ( >=media-libs/speex-1.2_rc1-r1:=[${MULTILIB_USEDEP}] )
162 - abi_x86_32? (
163 - !<app-emulation/emul-linux-x86-soundlibs-20140406-r1
164 - !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32]
165 - )"
166 -DEPEND="${RDEPEND}
167 - virtual/pkgconfig"
168 -
169 -src_prepare() {
170 - epatch \
171 - "${FILESDIR}"/${PN}-1.0.19-missing-avutil.patch \
172 - "${FILESDIR}"/${PN}-1.0.23-automagic.patch \
173 - "${FILESDIR}"/${P}-{ffmpeg,ffmpeg-version-check}.patch
174 -
175 - epatch_user
176 -
177 - # For some reasons the polyp/pulse plugin does fail with alsaplayer with a
178 - # failed assert. As the code works just fine with asserts disabled, for now
179 - # disable them waiting for a better solution.
180 - sed -i \
181 - -e '/AM_CFLAGS/s:-Wall:-DNDEBUG -Wall:' \
182 - pulse/Makefile.am || die
183 -
184 - eautoreconf
185 -}
186 -
187 -multilib_src_configure() {
188 - use debug || append-cppflags -DNDEBUG
189 -
190 - local myspeex=no
191 - use speex && myspeex=lib
192 -
193 - ECONF_SOURCE=${S} \
194 - econf \
195 - $(multilib_native_use_enable ffmpeg avcodec) \
196 - $(use_enable jack) \
197 - $(use_enable libsamplerate samplerate) \
198 - $(use_enable pulseaudio) \
199 - --with-speex=${myspeex}
200 -}
201 -
202 -multilib_src_install_all() {
203 - einstalldocs
204 -
205 - cd doc || die
206 - dodoc upmix.txt vdownmix.txt README-pcm-oss
207 - use jack && dodoc README-jack
208 - use libsamplerate && dodoc samplerate.txt
209 - use ffmpeg && dodoc lavcrate.txt a52.txt
210 -
211 - if use pulseaudio; then
212 - dodoc README-pulse
213 - # install ALSA configuration files
214 - # making PA to be used by alsa clients
215 - insinto /usr/share/alsa
216 - doins "${FILESDIR}"/pulse-default.conf
217 - insinto /usr/share/alsa/alsa.conf.d
218 - doins "${FILESDIR}"/51-pulseaudio-probe.conf
219 - # bug #410261, comment 5+
220 - # seems to work fine without any path
221 - sed -i \
222 - -e "s:/usr/lib/alsa-lib/::" \
223 - "${ED}"/usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf || die #410261
224 - fi
225 -
226 - prune_libtool_files --all
227 -}
228 -
229 -pkg_postinst() {
230 - if use pulseaudio; then
231 - einfo "The PulseAudio device is now set as the default device if the"
232 - einfo "PulseAudio server is found to be running. Any custom"
233 - einfo "configuration in /etc/asound.conf or ~/.asoundrc for this"
234 - einfo "purpose should now be unnecessary."
235 - fi
236 -}
237
238 diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.0.28.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.0.28.ebuild
239 deleted file mode 100644
240 index cf86cb6..0000000
241 --- a/media-plugins/alsa-plugins/alsa-plugins-1.0.28.ebuild
242 +++ /dev/null
243 @@ -1,94 +0,0 @@
244 -# Copyright 1999-2014 Gentoo Foundation
245 -# Distributed under the terms of the GNU General Public License v2
246 -# $Id$
247 -
248 -EAPI=5
249 -inherit autotools eutils flag-o-matic multilib multilib-minimal
250 -
251 -DESCRIPTION="ALSA extra plugins"
252 -HOMEPAGE="http://www.alsa-project.org/"
253 -SRC_URI="mirror://alsaproject/plugins/${P}.tar.bz2"
254 -
255 -LICENSE="GPL-2 LGPL-2.1"
256 -SLOT="0"
257 -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux"
258 -IUSE="debug ffmpeg jack libsamplerate pulseaudio speex"
259 -
260 -RDEPEND=">=media-libs/alsa-lib-${PV}:=[${MULTILIB_USEDEP}]
261 - ffmpeg? ( virtual/ffmpeg[${MULTILIB_USEDEP}] )
262 - jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
263 - libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[${MULTILIB_USEDEP}] )
264 - pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
265 - speex? ( >=media-libs/speex-1.2_rc1-r1:=[${MULTILIB_USEDEP}] )
266 - abi_x86_32? (
267 - !<app-emulation/emul-linux-x86-soundlibs-20140406-r1
268 - !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32]
269 - )"
270 -DEPEND="${RDEPEND}
271 - virtual/pkgconfig"
272 -
273 -src_prepare() {
274 -: epatch "${FILESDIR}"/${PN}-1.0.23-automagic.patch
275 -
276 - epatch_user
277 -
278 - # For some reasons the polyp/pulse plugin does fail with alsaplayer with a
279 - # failed assert. As the code works just fine with asserts disabled, for now
280 - # disable them waiting for a better solution.
281 - sed -i \
282 - -e '/AM_CFLAGS/s:-Wall:-DNDEBUG -Wall:' \
283 - pulse/Makefile.am || die
284 -
285 - eautoreconf
286 -}
287 -
288 -multilib_src_configure() {
289 - use debug || append-cppflags -DNDEBUG
290 -
291 - local myspeex=no
292 - use speex && myspeex=lib
293 -
294 - ECONF_SOURCE=${S} \
295 - econf \
296 - $(use_enable ffmpeg avcodec) \
297 - $(use_enable jack) \
298 - $(use_enable libsamplerate samplerate) \
299 - $(use_enable pulseaudio) \
300 - --with-speex=${myspeex}
301 -}
302 -
303 -multilib_src_install_all() {
304 - einstalldocs
305 -
306 - cd doc || die
307 - dodoc upmix.txt vdownmix.txt README-pcm-oss
308 - use jack && dodoc README-jack
309 - use libsamplerate && dodoc samplerate.txt
310 - use ffmpeg && dodoc lavcrate.txt a52.txt
311 -
312 - if use pulseaudio; then
313 - dodoc README-pulse
314 - # install ALSA configuration files
315 - # making PA to be used by alsa clients
316 - insinto /usr/share/alsa
317 - doins "${FILESDIR}"/pulse-default.conf
318 - insinto /usr/share/alsa/alsa.conf.d
319 - doins "${FILESDIR}"/51-pulseaudio-probe.conf
320 - # bug #410261, comment 5+
321 - # seems to work fine without any path
322 - sed -i \
323 - -e "s:/usr/lib/alsa-lib/::" \
324 - "${ED}"/usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf || die #410261
325 - fi
326 -
327 - prune_libtool_files --all
328 -}
329 -
330 -pkg_postinst() {
331 - if use pulseaudio; then
332 - einfo "The PulseAudio device is now set as the default device if the"
333 - einfo "PulseAudio server is found to be running. Any custom"
334 - einfo "configuration in /etc/asound.conf or ~/.asoundrc for this"
335 - einfo "purpose should now be unnecessary."
336 - fi
337 -}
338
339 diff --git a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.19-missing-avutil.patch b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.19-missing-avutil.patch
340 deleted file mode 100644
341 index 12acbbc..0000000
342 --- a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.19-missing-avutil.patch
343 +++ /dev/null
344 @@ -1,11 +0,0 @@
345 ---- configure.in_old 2009-01-26 21:46:07.000000000 +0100
346 -+++ configure.in 2009-01-26 21:47:25.000000000 +0100
347 -@@ -67,7 +67,7 @@
348 - AS_HELP_STRING([--disable-avcodec], [Don't build plugins depending on avcodec (a52)]))
349 -
350 - if test "x$enable_avcodec" != "xno"; then
351 -- PKG_CHECK_MODULES(AVCODEC, [libavcodec], [HAVE_AVCODEC=yes], [HAVE_AVCODEC=no])
352 -+ PKG_CHECK_MODULES(AVCODEC, [libavcodec libavutil], [HAVE_AVCODEC=yes], [HAVE_AVCODEC=no])
353 - fi
354 -
355 - if test "x$HAVE_AVCODEC" = "xno"; then
356
357 diff --git a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.27-ffmpeg-version-check.patch b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.27-ffmpeg-version-check.patch
358 deleted file mode 100644
359 index 6b9b698..0000000
360 --- a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.27-ffmpeg-version-check.patch
361 +++ /dev/null
362 @@ -1,13 +0,0 @@
363 -Index: alsa-plugins-1.0.27/a52/pcm_a52.c
364 -===================================================================
365 ---- alsa-plugins-1.0.27.orig/a52/pcm_a52.c
366 -+++ alsa-plugins-1.0.27/a52/pcm_a52.c
367 -@@ -27,7 +27,7 @@
368 - #include <alsa/pcm_plugin.h>
369 - #include AVCODEC_HEADER
370 -
371 --#if LIBAVCODEC_VERSION_MAJOR >= 53 && LIBAVCODEC_VERSION_MINOR >= 34
372 -+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53,34,0)
373 - #include <libavutil/audioconvert.h>
374 - #include <libavutil/mem.h>
375 - #define USE_AVCODEC_FRAME
376
377 diff --git a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.27-ffmpeg.patch b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.27-ffmpeg.patch
378 deleted file mode 100644
379 index 56f51e3..0000000
380 --- a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.27-ffmpeg.patch
381 +++ /dev/null
382 @@ -1,38 +0,0 @@
383 -From 367e208954711fabe159070d242927246ed821cd Mon Sep 17 00:00:00 2001
384 -From: Anton Khirnov <anton@×××××××.net>
385 -Date: Thu, 9 Jan 2014 21:14:17 +0100
386 -Subject: [PATCH] a52: switch to AV_CODEC_ID identifiers
387 -
388 -Fixes build with latest libavcodec versions.
389 -
390 -Signed-off-by: Takashi Iwai <tiwai@××××.de>
391 ----
392 - a52/pcm_a52.c | 5 ++++-
393 - 1 file changed, 4 insertions(+), 1 deletion(-)
394 -
395 -diff --git a/a52/pcm_a52.c b/a52/pcm_a52.c
396 -index 359608f..b467ec8 100644
397 ---- a/a52/pcm_a52.c
398 -+++ b/a52/pcm_a52.c
399 -@@ -58,6 +58,9 @@
400 - #endif
401 - #endif
402 -
403 -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 25, 0)
404 -+#define AV_CODEC_ID_AC3 CODEC_ID_AC3
405 -+#endif
406 -
407 - struct a52_ctx {
408 - snd_pcm_ioplug_t io;
409 -@@ -916,7 +919,7 @@ SND_PCM_PLUGIN_DEFINE_FUNC(a52)
410 - if (rec->codec == NULL)
411 - rec->codec = avcodec_find_encoder_by_name("ac3");
412 - if (rec->codec == NULL)
413 -- rec->codec = avcodec_find_encoder(CODEC_ID_AC3);
414 -+ rec->codec = avcodec_find_encoder(AV_CODEC_ID_AC3);
415 - if (rec->codec == NULL) {
416 - SNDERR("Cannot find codec engine");
417 - err = -EINVAL;
418 ---
419 -1.7.11.7
420 -