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: Sat, 16 Nov 2019 13:06:31
Message-Id: 1573909579.ccbb4cdfc9d895f5f4f2b4f80ec14ac06c61e2a7.polynomial-c@gentoo
1 commit: ccbb4cdfc9d895f5f4f2b4f80ec14ac06c61e2a7
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Sat Nov 16 13:01:44 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Sat Nov 16 13:06:19 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccbb4cdf
7
8 media-plugins/alsa-plugins: Removed old
9
10 Package-Manager: Portage-2.3.79, Repoman-2.3.18
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 media-plugins/alsa-plugins/Manifest | 1 -
14 .../alsa-plugins/alsa-plugins-1.1.6.ebuild | 102 ---------------------
15 .../alsa-plugins-1.1.5-optional_plugins.patch | 46 ----------
16 3 files changed, 149 deletions(-)
17
18 diff --git a/media-plugins/alsa-plugins/Manifest b/media-plugins/alsa-plugins/Manifest
19 index 3b93b095b1d..22a326647a9 100644
20 --- a/media-plugins/alsa-plugins/Manifest
21 +++ b/media-plugins/alsa-plugins/Manifest
22 @@ -1,5 +1,4 @@
23 DIST alsa-plugins-1.1.1.tar.bz2 366193 BLAKE2B 02892b0c241cf34d3bfce6cf580dbb6bedbce9253c3e57f04d3093a6cbb1d5b5e9b92566945962b875de20ba3e556e9c1fc4bb4e970502e3c03fc821e5e264fe SHA512 9dd277cb5cce144ce4e5e0010cebcba0f8634c783e7bcd80ce6d04b198d6de5150a2764df3087a39a468b5fb7c4578de2e252095568e811dedaa5e7ffdbeb7c9
24 -DIST alsa-plugins-1.1.6.tar.bz2 367485 BLAKE2B efe8b8447db4f68761060e4f48c86c76f821fd7795d8edec0c8f5a03f7406a422f630f012433ac12c3af3222b7b587820a92e937c80dba6bb8766deb854b9706 SHA512 f01633cd7166a2fba4c5b4d5d786b5a2122f6a810f5b5b7209c42033759d116a4515174e7ee57973d5de716be88a246d733dc5a2daf92b72377c274b04db401b
25 DIST alsa-plugins-1.1.8.tar.bz2 375346 BLAKE2B 65c161ee375e7aed85dbe918a39bc2aa4818bbcfbaadf405f5f0170d9944ff55b5a9da3690e3cd78bd7ffff74ecf235f49cfc3a5dfe18b627c5a9cb0dc1eb207 SHA512 bb1a4411921ec332f47b43515f6d3b4c03a01568854950b9b5c3f0d8172d9a0c4a5b3652bc64c62eae5ea3aaa5d95fe3d32c0a213fe99adf490a9807bcb58ecd
26 DIST alsa-plugins-1.1.9.tar.bz2 406127 BLAKE2B 10bf3e96289a88edabfa3018d33ab4666982fe409eb41c486e6b9eee0dde87e926f3241c31e240b3bab114c8ab2c6d6bab92dd6192bceb467a01fcb6adc44b8e SHA512 1969dfe8f2bb4283e81a18da73d2f7f86d8788d1a8764d7195b4830b2f4704c208eacb50a1e26e20c9fe57e7d5bb06a004112d84cc86b4682b4180d2fec4d5d9
27 DIST alsa-plugins-1.2.1.tar.bz2 406309 BLAKE2B 2ac26ad87fcdcc4452ec32b2b437d3be4308f13ce2a8e24150f319805b6d684edc6be9e51654f27c1a5bbc01a7caa9eb70250be405dc6921ecd93ee417f24cdf SHA512 a49ef9290b66855112e301a5fd5a0932f13a50254e164f3340f2b342a36469532ee783beabfe5e95870dbf4cd81ca1e8d0415d94c8c7ee963133fb3c343721de
28
29 diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.1.6.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.1.6.ebuild
30 deleted file mode 100644
31 index 64eb75cc803..00000000000
32 --- a/media-plugins/alsa-plugins/alsa-plugins-1.1.6.ebuild
33 +++ /dev/null
34 @@ -1,102 +0,0 @@
35 -# Copyright 1999-2019 Gentoo Authors
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=6
39 -inherit autotools flag-o-matic multilib multilib-minimal
40 -
41 -DESCRIPTION="ALSA extra plugins"
42 -HOMEPAGE="http://www.alsa-project.org/"
43 -SRC_URI="https://www.alsa-project.org/files/pub/plugins/${P}.tar.bz2"
44 -
45 -LICENSE="GPL-2 LGPL-2.1"
46 -SLOT="0"
47 -KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux"
48 -IUSE="arcam_av debug ffmpeg jack libav libsamplerate +mix oss pulseaudio speex +usb_stream"
49 -
50 -RDEPEND="
51 - >=media-libs/alsa-lib-${PV}:=[${MULTILIB_USEDEP}]
52 - ffmpeg? (
53 - libav? ( media-video/libav:= )
54 - !libav? ( media-video/ffmpeg:0= )
55 - )
56 - jack? ( virtual/jack[${MULTILIB_USEDEP}] )
57 - libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[${MULTILIB_USEDEP}] )
58 - pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
59 - speex? (
60 - >=media-libs/speex-1.2.0:=[${MULTILIB_USEDEP}]
61 - media-libs/speexdsp[${MULTILIB_USEDEP}]
62 - )
63 -"
64 -DEPEND="${RDEPEND}
65 - virtual/pkgconfig"
66 -
67 -PATCHES=(
68 - "${FILESDIR}/${PN}-1.1.5-optional_plugins.patch"
69 -)
70 -
71 -src_prepare() {
72 - default
73 -
74 - # For some reasons the polyp/pulse plugin does fail with alsaplayer with a
75 - # failed assert. As the code works just fine with asserts disabled, for now
76 - # disable them waiting for a better solution.
77 - sed -i \
78 - -e '/AM_CFLAGS/s:-Wall:-DNDEBUG -Wall:' \
79 - pulse/Makefile.am || die
80 -
81 - eautoreconf
82 -}
83 -
84 -multilib_src_configure() {
85 - use debug || append-cppflags -DNDEBUG
86 -
87 - local myeconfargs=(
88 - --with-speex="$(usex speex lib no)"
89 - $(use_enable arcam_av arcamav)
90 - $(use_enable ffmpeg avcodec)
91 - $(use_enable jack)
92 - $(use_enable libsamplerate samplerate)
93 - $(use_enable mix)
94 - $(use_enable oss)
95 - $(use_enable pulseaudio)
96 - $(use_enable speex speexdsp)
97 - $(use_enable usb_stream usbstream)
98 - )
99 - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
100 -}
101 -
102 -multilib_src_install_all() {
103 - einstalldocs
104 -
105 - cd doc || die
106 - dodoc upmix.txt vdownmix.txt README-pcm-oss
107 - use jack && dodoc README-jack
108 - use libsamplerate && dodoc samplerate.txt
109 - use ffmpeg && dodoc lavcrate.txt a52.txt
110 -
111 - if use pulseaudio; then
112 - dodoc README-pulse
113 - # install ALSA configuration files
114 - # making PA to be used by alsa clients
115 - insinto /usr/share/alsa
116 - doins "${FILESDIR}"/pulse-default.conf
117 - insinto /usr/share/alsa/alsa.conf.d
118 - doins "${FILESDIR}"/51-pulseaudio-probe.conf
119 - # bug #410261, comment 5+
120 - # seems to work fine without any path
121 - sed -i \
122 - -e "s:/usr/lib/alsa-lib/::" \
123 - "${ED%/}"/usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf || die #410261
124 - fi
125 -
126 - find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
127 -}
128 -
129 -pkg_postinst() {
130 - if use pulseaudio; then
131 - einfo "The PulseAudio device is now set as the default device if the"
132 - einfo "PulseAudio server is found to be running. Any custom"
133 - einfo "configuration in /etc/asound.conf or ~/.asoundrc for this"
134 - einfo "purpose should now be unnecessary."
135 - fi
136 -}
137
138 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
139 deleted file mode 100644
140 index cb232b2da6f..00000000000
141 --- a/media-plugins/alsa-plugins/files/alsa-plugins-1.1.5-optional_plugins.patch
142 +++ /dev/null
143 @@ -1,46 +0,0 @@
144 -From 565cfc8800c2e7a122f6574f67a7da8f1165e34d Mon Sep 17 00:00:00 2001
145 -From: Lars Wendler <polynomial-c@g.o>
146 -Date: Sun, 18 Feb 2018 16:00:39 +0100
147 -Subject: [PATCH] Makefile.am: Add missing code for enhanced configure option
148 - of alsa plugins
149 -
150 -Commit 1201e158fb00bf15c353d088c94c1cb3eff9653c added the pieces for
151 -configure but did not do the same for Makefile.
152 -As result all plugins were still built regardless of corresponding
153 ---disable-* option being called with configure.
154 ----
155 - Makefile.am | 14 +++++++++++++-
156 - 1 file changed, 13 insertions(+), 1 deletion(-)
157 -
158 -diff --git a/Makefile.am b/Makefile.am
159 -index 69cfe0d..76cefef 100644
160 ---- a/Makefile.am
161 -+++ b/Makefile.am
162 -@@ -1,4 +1,4 @@
163 --SUBDIRS = oss mix usb_stream arcam-av doc
164 -+SUBDIRS = doc
165 - if HAVE_JACK
166 - SUBDIRS += jack
167 - endif
168 -@@ -20,6 +20,18 @@ endif
169 - if HAVE_SPEEXDSP
170 - SUBDIRS += speex
171 - endif
172 -+if HAVE_OSS
173 -+SUBDIRS += oss
174 -+endif
175 -+if HAVE_MIX
176 -+SUBDIRS += mix
177 -+endif
178 -+if HAVE_USBSTREAM
179 -+SUBDIRS += usb_stream
180 -+endif
181 -+if HAVE_ARCAMAV
182 -+SUBDIRS += arcam-av
183 -+endif
184 -
185 - EXTRA_DIST = gitcompile version COPYING.GPL m4/attributes.m4
186 - AUTOMAKE_OPTIONS = foreign
187 ---
188 -2.16.2
189 -