1 |
commit: 0848539320c7f89610fb42205f1e2183de97065f |
2 |
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Jun 11 03:58:24 2018 +0000 |
4 |
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
5 |
CommitDate: Mon Jun 11 03:58:24 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=08485393 |
7 |
|
8 |
media-sound/pulseaudio: sync with upstream |
9 |
|
10 |
media-sound/pulseaudio/Manifest | 2 - |
11 |
media-sound/pulseaudio/metadata.xml | 2 +- |
12 |
media-sound/pulseaudio/pulseaudio-10.0.ebuild | 369 ----------------------- |
13 |
media-sound/pulseaudio/pulseaudio-10.99.1.ebuild | 369 ----------------------- |
14 |
media-sound/pulseaudio/pulseaudio-11.1.ebuild | 20 +- |
15 |
5 files changed, 7 insertions(+), 755 deletions(-) |
16 |
|
17 |
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest |
18 |
index cc69a64..6a179c8 100644 |
19 |
--- a/media-sound/pulseaudio/Manifest |
20 |
+++ b/media-sound/pulseaudio/Manifest |
21 |
@@ -1,3 +1 @@ |
22 |
-DIST pulseaudio-10.0.tar.xz 1608040 SHA256 a3186824de9f0d2095ded5d0d0db0405dc73133983c2fbb37291547e37462f57 SHA512 11d98b4b2000a41bdea92df253409452bc9b77d8bb309b6d14c439e3b902e3f90c69da00daff409e3859a54ad01c63a75be5723616bdcb492801d622a6406481 WHIRLPOOL 6d03d8cf7b96cbb46a8cc5f7810f7cf1c4187aa9321483d5e56435874b218d437bc66860d25a149be59ca73de7118916e05e481758e04619e099cb9a50dcb119 |
23 |
-DIST pulseaudio-10.99.1.tar.xz 1635836 SHA256 c9791844569d8d0adb468c183d0d9fb6ac12b9db34a4a078a7773c8bac993f32 SHA512 410758da3cf3431b5810b9a5790d60ed8fe0bba58f621f4ca8e7ba66be8dcdd53cbd8284105ee6694b04f81a37791c3e8c5fe4af3ee034e89dff0b66fdbde006 WHIRLPOOL c8dfe0e4ab54029fdc3b47fb43282406908b7993ee155d6aaa9919419fb4e58a8f1df34bc569a33697a02533979c6ff4002944a20ed96c1246993eb3b97b7eb3 |
24 |
DIST pulseaudio-11.1.tar.xz 1648924 BLAKE2B eea767efb6529436a6c2aa7d5ccaccdbda2338ad8db639ad333598b1589d259acf71ef34e904a240710f5343864fa868789eaa7f7cae1b07902ebd989fe83e12 SHA512 8863d8d7aede0d9a4d158e84e7bece91747c335f9ac98c7b21fafe76b762f8817e1125307aa46e561e540d2c40525e91f51a55ec34ac55d58fd5980199856a7a |
25 |
|
26 |
diff --git a/media-sound/pulseaudio/metadata.xml b/media-sound/pulseaudio/metadata.xml |
27 |
index e35348f..3a9d6bb 100644 |
28 |
--- a/media-sound/pulseaudio/metadata.xml |
29 |
+++ b/media-sound/pulseaudio/metadata.xml |
30 |
@@ -42,7 +42,7 @@ |
31 |
script for PulseAudio. Since this support is only supported for |
32 |
embedded situations, do not enable without reading the upstream |
33 |
instructions at |
34 |
- https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/ . |
35 |
+ https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/ . |
36 |
</flag> |
37 |
<flag name="asyncns">Use libasyncns for asynchronous name resolution.</flag> |
38 |
<flag name="doc">Build the doxygen-described API documentation.</flag> |
39 |
|
40 |
diff --git a/media-sound/pulseaudio/pulseaudio-10.0.ebuild b/media-sound/pulseaudio/pulseaudio-10.0.ebuild |
41 |
deleted file mode 100644 |
42 |
index c94b22f..0000000 |
43 |
--- a/media-sound/pulseaudio/pulseaudio-10.0.ebuild |
44 |
+++ /dev/null |
45 |
@@ -1,369 +0,0 @@ |
46 |
-# Copyright 1999-2017 Gentoo Foundation |
47 |
-# Distributed under the terms of the GNU General Public License v2 |
48 |
- |
49 |
-EAPI=6 |
50 |
-inherit autotools bash-completion-r1 eutils flag-o-matic gnome2-utils linux-info systemd user versionator udev multilib-minimal |
51 |
- |
52 |
-DESCRIPTION="A networked sound server with an advanced plugin system" |
53 |
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/" |
54 |
-SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz" |
55 |
- |
56 |
-# libpulse-simple and libpulse link to libpulse-core; this is daemon's |
57 |
-# library and can link to gdbm and other GPL-only libraries. In this |
58 |
-# cases, we have a fully GPL-2 package. Leaving the rest of the |
59 |
-# GPL-forcing USE flags for those who use them. |
60 |
-# qpaeq equalizer pyqt GUI frontend is AGPL-3+ |
61 |
-LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 ) equalizer? ( AGPL-3+ )" |
62 |
- |
63 |
-SLOT="0" |
64 |
-KEYWORDS="amd64 arm ia64 ppc ~sh sparc x86" |
65 |
- |
66 |
-# +alsa-plugin as discussed in bug #519530 |
67 |
-IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib |
68 |
-gnome gtk ipv6 jack libsamplerate libressl lirc native-headset neon ofono-headset |
69 |
-+orc oss qt4 realtime selinux sox ssl systemd system-wide tcpd test +udev |
70 |
-+webrtc-aec +X zeroconf" |
71 |
- |
72 |
-# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac |
73 |
-REQUIRED_USE=" |
74 |
- bluetooth? ( dbus ) |
75 |
- equalizer? ( dbus ) |
76 |
- ofono-headset? ( bluetooth ) |
77 |
- native-headset? ( bluetooth ) |
78 |
- udev? ( || ( alsa oss ) ) |
79 |
-" |
80 |
- |
81 |
-# libpcre needed in some cases, bug #472228 |
82 |
-RDEPEND=" |
83 |
- || ( |
84 |
- elibc_glibc? ( virtual/libc ) |
85 |
- elibc_uclibc? ( virtual/libc ) |
86 |
- dev-libs/libpcre |
87 |
- ) |
88 |
- >=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}] |
89 |
- X? ( |
90 |
- >=x11-libs/libX11-1.4.0[${MULTILIB_USEDEP}] |
91 |
- >=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}] |
92 |
- x11-libs/libSM[${MULTILIB_USEDEP}] |
93 |
- x11-libs/libICE[${MULTILIB_USEDEP}] |
94 |
- x11-libs/libXtst[${MULTILIB_USEDEP}] |
95 |
- ) |
96 |
- caps? ( >=sys-libs/libcap-2.22-r2[${MULTILIB_USEDEP}] ) |
97 |
- libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) |
98 |
- alsa? ( >=media-libs/alsa-lib-1.0.19 ) |
99 |
- glib? ( >=dev-libs/glib-2.4.0:2[${MULTILIB_USEDEP}] ) |
100 |
- zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) |
101 |
- jack? ( virtual/jack ) |
102 |
- tcpd? ( sys-apps/tcp-wrappers[${MULTILIB_USEDEP}] ) |
103 |
- lirc? ( app-misc/lirc ) |
104 |
- dbus? ( >=sys-apps/dbus-1.0.0[${MULTILIB_USEDEP}] ) |
105 |
- gtk? ( x11-libs/gtk+:3 ) |
106 |
- gnome? ( >=gnome-base/gconf-2.4.0 ) |
107 |
- bluetooth? ( |
108 |
- >=net-wireless/bluez-5 |
109 |
- >=sys-apps/dbus-1.0.0 |
110 |
- media-libs/sbc |
111 |
- ) |
112 |
- asyncns? ( net-libs/libasyncns[${MULTILIB_USEDEP}] ) |
113 |
- udev? ( >=virtual/udev-143[hwdb(+)] ) |
114 |
- realtime? ( sys-auth/rtkit ) |
115 |
- equalizer? ( sci-libs/fftw:3.0 ) |
116 |
- ofono-headset? ( >=net-misc/ofono-1.13 ) |
117 |
- orc? ( >=dev-lang/orc-0.4.15 ) |
118 |
- sox? ( >=media-libs/soxr-0.1.1 ) |
119 |
- ssl? ( |
120 |
- !libressl? ( dev-libs/openssl:0= ) |
121 |
- libressl? ( dev-libs/libressl:= ) |
122 |
- ) |
123 |
- || ( |
124 |
- ( |
125 |
- >=media-libs/speex-1.2.0 |
126 |
- media-libs/speexdsp |
127 |
- ) |
128 |
- ( |
129 |
- <media-libs/speex-1.2.0 |
130 |
- >=media-libs/speex-1.2_rc1 |
131 |
- ) |
132 |
- ) |
133 |
- gdbm? ( sys-libs/gdbm ) |
134 |
- webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 ) |
135 |
- systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] ) |
136 |
- dev-libs/libltdl:0 |
137 |
- selinux? ( sec-policy/selinux-pulseaudio ) |
138 |
-" |
139 |
-# it's a valid RDEPEND, libltdl.so is used for native abi |
140 |
- |
141 |
-DEPEND="${RDEPEND} |
142 |
- sys-devel/m4 |
143 |
- doc? ( app-doc/doxygen ) |
144 |
- test? ( >=dev-libs/check-0.9.10 ) |
145 |
- X? ( |
146 |
- x11-proto/xproto[${MULTILIB_USEDEP}] |
147 |
- >=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}] |
148 |
- ) |
149 |
- dev-libs/libatomic_ops |
150 |
- virtual/pkgconfig |
151 |
- system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) ) |
152 |
- dev-util/intltool |
153 |
- >=sys-devel/gettext-0.18.1 |
154 |
-" |
155 |
-# This is a PDEPEND to avoid a circular dep |
156 |
-PDEPEND=" |
157 |
- alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}] ) ) |
158 |
-" |
159 |
- |
160 |
-# alsa-utils dep is for the alsasound init.d script (see bug #155707) |
161 |
-# bluez dep is for the bluetooth init.d script |
162 |
-# PyQt4 dep is for the qpaeq script |
163 |
-RDEPEND="${RDEPEND} |
164 |
- equalizer? ( qt4? ( dev-python/PyQt4[dbus] ) ) |
165 |
- system-wide? ( |
166 |
- alsa? ( media-sound/alsa-utils ) |
167 |
- bluetooth? ( >=net-wireless/bluez-5 ) |
168 |
- ) |
169 |
-" |
170 |
- |
171 |
-PATCHES=( |
172 |
- "${FILESDIR}/${PN}-9.0-musl-padsp.patch" |
173 |
-) |
174 |
- |
175 |
-pkg_pretend() { |
176 |
- CONFIG_CHECK="~HIGH_RES_TIMERS" |
177 |
- WARNING_HIGH_RES_TIMERS="CONFIG_HIGH_RES_TIMERS:\tis not set (required for enabling timer-based scheduling in pulseaudio)\n" |
178 |
- check_extra_config |
179 |
- |
180 |
- if linux_config_exists; then |
181 |
- local snd_hda_prealloc_size=$(linux_chkconfig_string SND_HDA_PREALLOC_SIZE) |
182 |
- if [ -n "${snd_hda_prealloc_size}" ] && [ "${snd_hda_prealloc_size}" -lt 2048 ]; then |
183 |
- ewarn "A preallocated buffer-size of 2048 (kB) or higher is recommended for the HD-audio driver!" |
184 |
- ewarn "CONFIG_SND_HDA_PREALLOC_SIZE=${snd_hda_prealloc_size}" |
185 |
- fi |
186 |
- fi |
187 |
-} |
188 |
- |
189 |
-pkg_setup() { |
190 |
- linux-info_pkg_setup |
191 |
- gnome2_environment_reset #543364 |
192 |
- |
193 |
- enewgroup audio 18 # Just make sure it exists |
194 |
- |
195 |
- if use system-wide; then |
196 |
- enewgroup pulse-access |
197 |
- enewgroup pulse |
198 |
- enewuser pulse -1 -1 /var/run/pulse pulse,audio |
199 |
- fi |
200 |
-} |
201 |
- |
202 |
-src_prepare() { |
203 |
- default |
204 |
- |
205 |
- # Skip test that cannot work with sandbox, bug #501846 |
206 |
- sed -i -e '/lock-autospawn-test/d' src/Makefile.am || die |
207 |
- |
208 |
- eautoreconf |
209 |
-} |
210 |
- |
211 |
-multilib_src_configure() { |
212 |
- local myconf=() |
213 |
- |
214 |
- if use gdbm; then |
215 |
- myconf+=( --with-database=gdbm ) |
216 |
- else |
217 |
- myconf+=( --with-database=simple ) |
218 |
- fi |
219 |
- |
220 |
- if use bluetooth; then |
221 |
- if multilib_is_native_abi; then |
222 |
- myconf+=( --enable-bluez5 --disable-bluez4 |
223 |
- $(use_enable native-headset bluez5-native-headset) |
224 |
- $(use_enable ofono-headset bluez5-ofono-headset) ) |
225 |
- fi |
226 |
- else |
227 |
- myconf+=( --disable-bluez5 --disable-bluez4 ) |
228 |
- fi |
229 |
- |
230 |
- myconf+=( |
231 |
- --enable-largefile |
232 |
- $(use_enable glib glib2) |
233 |
- --disable-solaris |
234 |
- $(use_enable asyncns) |
235 |
- $(use_enable oss oss-output) |
236 |
- $(use_enable alsa) |
237 |
- $(use_enable lirc) |
238 |
- $(use_enable neon neon-opt) |
239 |
- $(use_enable tcpd tcpwrap) |
240 |
- $(use_enable jack) |
241 |
- $(use_enable zeroconf avahi) |
242 |
- $(use_enable dbus) |
243 |
- $(use_enable gnome gconf) |
244 |
- $(use_enable gtk gtk3) |
245 |
- $(use_enable libsamplerate samplerate) |
246 |
- $(use_enable orc) |
247 |
- $(use_enable X x11) |
248 |
- $(use_enable test default-build-tests) |
249 |
- $(use_enable udev) |
250 |
- $(use_with sox soxr) |
251 |
- $(use_enable systemd systemd-daemon) |
252 |
- $(use_enable systemd systemd-login) |
253 |
- $(use_enable systemd systemd-journal) |
254 |
- $(use_enable ipv6) |
255 |
- $(use_enable ssl openssl) |
256 |
- $(use_enable webrtc-aec) |
257 |
- $(use_with caps) |
258 |
- $(use_with equalizer fftw) |
259 |
- --disable-adrian-aec |
260 |
- --disable-esound |
261 |
- --localstatedir="${EPREFIX}"/var |
262 |
- --with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d |
263 |
- --with-systemduserunitdir=$(systemd_get_userunitdir) |
264 |
- ) |
265 |
- |
266 |
- if ! multilib_is_native_abi; then |
267 |
- # disable all the modules and stuff |
268 |
- myconf+=( |
269 |
- --disable-oss-output |
270 |
- --disable-alsa |
271 |
- --disable-lirc |
272 |
- --disable-jack |
273 |
- --disable-avahi |
274 |
- --disable-gconf |
275 |
- --disable-gtk3 |
276 |
- --disable-samplerate |
277 |
- --disable-bluez4 |
278 |
- --disable-bluez5 |
279 |
- --disable-udev |
280 |
- --disable-openssl |
281 |
- --disable-orc |
282 |
- --disable-webrtc-aec |
283 |
- --without-fftw |
284 |
- --without-soxr |
285 |
- |
286 |
- # tests involve random modules, so just do them for the native |
287 |
- --disable-default-build-tests |
288 |
- |
289 |
- # hack around unnecessary checks |
290 |
- # (results don't matter, we're not building anything using it) |
291 |
- ac_cv_lib_ltdl_lt_dladvise_init=yes |
292 |
- --with-database=simple |
293 |
- LIBSPEEX_CFLAGS=' ' |
294 |
- LIBSPEEX_LIBS=' ' |
295 |
- ) |
296 |
- fi |
297 |
- |
298 |
- ECONF_SOURCE=${S} \ |
299 |
- econf "${myconf[@]}" |
300 |
-} |
301 |
- |
302 |
-multilib_src_compile() { |
303 |
- if multilib_is_native_abi; then |
304 |
- emake |
305 |
- use doc && emake doxygen |
306 |
- else |
307 |
- local targets=( libpulse.la libpulse-simple.la ) |
308 |
- use glib && targets+=( libpulse-mainloop-glib.la ) |
309 |
- emake -C src libpulse{,dsp,-simple,-mainloop-glib}.la |
310 |
- fi |
311 |
-} |
312 |
- |
313 |
-multilib_src_test() { |
314 |
- # We avoid running the toplevel check target because that will run |
315 |
- # po/'s tests too, and they are broken. Officially, it should work |
316 |
- # with intltool 0.41, but that doesn't look like a stable release. |
317 |
- if multilib_is_native_abi; then |
318 |
- emake -C src check |
319 |
- fi |
320 |
-} |
321 |
- |
322 |
-multilib_src_install() { |
323 |
- if multilib_is_native_abi; then |
324 |
- emake -j1 DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" install |
325 |
- use doc && dohtml -r doxygen/html/ |
326 |
- else |
327 |
- local targets=( libpulse.la libpulse-simple.la ) |
328 |
- use glib && targets+=( libpulse-mainloop-glib.la ) |
329 |
- emake DESTDIR="${D}" install-pkgconfigDATA |
330 |
- emake DESTDIR="${D}" -C src \ |
331 |
- install-libLTLIBRARIES \ |
332 |
- install-padsplibLTLIBRARIES \ |
333 |
- lib_LTLIBRARIES="${targets[*]}" \ |
334 |
- install-pulseincludeHEADERS |
335 |
- fi |
336 |
-} |
337 |
- |
338 |
-multilib_src_install_all() { |
339 |
- # Drop the script entirely if X is disabled |
340 |
- use X || rm "${ED}"/usr/bin/start-pulseaudio-x11 |
341 |
- |
342 |
- if use system-wide; then |
343 |
- newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio |
344 |
- |
345 |
- use_define() { |
346 |
- local define=${2:-$(echo $1 | tr '[:lower:]' '[:upper:]')} |
347 |
- |
348 |
- use "$1" && echo "-D$define" || echo "-U$define" |
349 |
- } |
350 |
- |
351 |
- unifdef $(use_define zeroconf AVAHI) \ |
352 |
- $(use_define alsa) \ |
353 |
- $(use_define bluetooth) \ |
354 |
- $(use_define udev) \ |
355 |
- "${FILESDIR}/pulseaudio.init.d-5" \ |
356 |
- > "${T}/pulseaudio" |
357 |
- |
358 |
- doinitd "${T}/pulseaudio" |
359 |
- |
360 |
- systemd_dounit "${FILESDIR}/${PN}.service" |
361 |
- fi |
362 |
- |
363 |
- use zeroconf && sed -i -e '/module-zeroconf-publish/s:^#::' "${ED}/etc/pulse/default.pa" |
364 |
- |
365 |
- dodoc NEWS README todo |
366 |
- |
367 |
- # Create the state directory |
368 |
- use prefix || diropts -o pulse -g pulse -m0755 |
369 |
- |
370 |
- # We need /var/run/pulse, bug #442852 |
371 |
- use system-wide && systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf" |
372 |
- |
373 |
- # Prevent warnings when system-wide is not used, bug #447694 |
374 |
- use system-wide || rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf |
375 |
- |
376 |
- prune_libtool_files --all |
377 |
-} |
378 |
- |
379 |
-pkg_postinst() { |
380 |
- if use system-wide; then |
381 |
- elog "You have enabled the 'system-wide' USE flag for pulseaudio." |
382 |
- elog "This mode should only be used on headless servers, embedded systems," |
383 |
- elog "or thin clients. It will usually require manual configuration, and is" |
384 |
- elog "incompatible with many expected pulseaudio features." |
385 |
- elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED." |
386 |
- elog "For more information, see" |
387 |
- elog " https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/" |
388 |
- elog " https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/" |
389 |
- elog " https://wiki.gentoo.org/wiki/PulseAudio#Headless_server" |
390 |
- if use gnome ; then |
391 |
- elog |
392 |
- elog "By enabling gnome USE flag, you enabled gconf support. Please note" |
393 |
- elog "that you might need to remove the gnome USE flag or disable the" |
394 |
- elog "gconf module on /etc/pulse/system.pa to be able to use PulseAudio" |
395 |
- elog "with a system-wide instance." |
396 |
- fi |
397 |
- fi |
398 |
- |
399 |
- if use equalizer && ! use qt4; then |
400 |
- elog "You've enabled the 'equalizer' USE-flag but not the 'qt4' USE-flag." |
401 |
- elog "This will build the equalizer module, but the 'qpaeq' tool" |
402 |
- elog "which is required to set equalizer levels will not work." |
403 |
- fi |
404 |
- |
405 |
- if use native-headset && use ofono-headset; then |
406 |
- elog "You have enabled both native and ofono headset profiles. The runtime decision" |
407 |
- elog "which to use is done via the 'headset' argument of module-bluetooth-discover." |
408 |
- fi |
409 |
- |
410 |
- if use libsamplerate; then |
411 |
- elog "The libsamplerate based resamplers are now deprecated, because they offer no" |
412 |
- elog "particular advantage over speex. Upstream suggests disabling them." |
413 |
- fi |
414 |
-} |
415 |
|
416 |
diff --git a/media-sound/pulseaudio/pulseaudio-10.99.1.ebuild b/media-sound/pulseaudio/pulseaudio-10.99.1.ebuild |
417 |
deleted file mode 100644 |
418 |
index 57b3dfd..0000000 |
419 |
--- a/media-sound/pulseaudio/pulseaudio-10.99.1.ebuild |
420 |
+++ /dev/null |
421 |
@@ -1,369 +0,0 @@ |
422 |
-# Copyright 1999-2017 Gentoo Foundation |
423 |
-# Distributed under the terms of the GNU General Public License v2 |
424 |
- |
425 |
-EAPI=6 |
426 |
-inherit autotools bash-completion-r1 eutils flag-o-matic gnome2-utils linux-info systemd user versionator udev multilib-minimal |
427 |
- |
428 |
-DESCRIPTION="A networked sound server with an advanced plugin system" |
429 |
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/" |
430 |
-SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz" |
431 |
- |
432 |
-# libpulse-simple and libpulse link to libpulse-core; this is daemon's |
433 |
-# library and can link to gdbm and other GPL-only libraries. In this |
434 |
-# cases, we have a fully GPL-2 package. Leaving the rest of the |
435 |
-# GPL-forcing USE flags for those who use them. |
436 |
-# qpaeq equalizer pyqt GUI frontend is AGPL-3+ |
437 |
-LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 ) equalizer? ( AGPL-3+ )" |
438 |
- |
439 |
-SLOT="0" |
440 |
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sh ~sparc ~x86" |
441 |
- |
442 |
-# +alsa-plugin as discussed in bug #519530 |
443 |
-IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib |
444 |
-gnome gtk ipv6 jack libsamplerate libressl lirc native-headset neon ofono-headset |
445 |
-+orc oss qt4 realtime selinux sox ssl systemd system-wide tcpd test +udev |
446 |
-+webrtc-aec +X zeroconf" |
447 |
- |
448 |
-# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac |
449 |
-REQUIRED_USE=" |
450 |
- bluetooth? ( dbus ) |
451 |
- equalizer? ( dbus ) |
452 |
- ofono-headset? ( bluetooth ) |
453 |
- native-headset? ( bluetooth ) |
454 |
- udev? ( || ( alsa oss ) ) |
455 |
-" |
456 |
- |
457 |
-# libpcre needed in some cases, bug #472228 |
458 |
-RDEPEND=" |
459 |
- || ( |
460 |
- elibc_glibc? ( virtual/libc ) |
461 |
- elibc_uclibc? ( virtual/libc ) |
462 |
- dev-libs/libpcre |
463 |
- ) |
464 |
- >=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}] |
465 |
- X? ( |
466 |
- >=x11-libs/libX11-1.4.0[${MULTILIB_USEDEP}] |
467 |
- >=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}] |
468 |
- x11-libs/libSM[${MULTILIB_USEDEP}] |
469 |
- x11-libs/libICE[${MULTILIB_USEDEP}] |
470 |
- x11-libs/libXtst[${MULTILIB_USEDEP}] |
471 |
- ) |
472 |
- caps? ( >=sys-libs/libcap-2.22-r2[${MULTILIB_USEDEP}] ) |
473 |
- libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) |
474 |
- alsa? ( >=media-libs/alsa-lib-1.0.19 ) |
475 |
- glib? ( >=dev-libs/glib-2.4.0:2[${MULTILIB_USEDEP}] ) |
476 |
- zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) |
477 |
- jack? ( virtual/jack ) |
478 |
- tcpd? ( sys-apps/tcp-wrappers[${MULTILIB_USEDEP}] ) |
479 |
- lirc? ( app-misc/lirc ) |
480 |
- dbus? ( >=sys-apps/dbus-1.0.0[${MULTILIB_USEDEP}] ) |
481 |
- gtk? ( x11-libs/gtk+:3 ) |
482 |
- gnome? ( >=gnome-base/gconf-2.4.0 ) |
483 |
- bluetooth? ( |
484 |
- >=net-wireless/bluez-5 |
485 |
- >=sys-apps/dbus-1.0.0 |
486 |
- media-libs/sbc |
487 |
- ) |
488 |
- asyncns? ( net-libs/libasyncns[${MULTILIB_USEDEP}] ) |
489 |
- udev? ( >=virtual/udev-143[hwdb(+)] ) |
490 |
- realtime? ( sys-auth/rtkit ) |
491 |
- equalizer? ( sci-libs/fftw:3.0 ) |
492 |
- ofono-headset? ( >=net-misc/ofono-1.13 ) |
493 |
- orc? ( >=dev-lang/orc-0.4.15 ) |
494 |
- sox? ( >=media-libs/soxr-0.1.1 ) |
495 |
- ssl? ( |
496 |
- !libressl? ( dev-libs/openssl:0= ) |
497 |
- libressl? ( dev-libs/libressl:= ) |
498 |
- ) |
499 |
- || ( |
500 |
- ( |
501 |
- >=media-libs/speex-1.2.0 |
502 |
- media-libs/speexdsp |
503 |
- ) |
504 |
- ( |
505 |
- <media-libs/speex-1.2.0 |
506 |
- >=media-libs/speex-1.2_rc1 |
507 |
- ) |
508 |
- ) |
509 |
- gdbm? ( sys-libs/gdbm ) |
510 |
- webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 ) |
511 |
- systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] ) |
512 |
- dev-libs/libltdl:0 |
513 |
- selinux? ( sec-policy/selinux-pulseaudio ) |
514 |
-" |
515 |
-# it's a valid RDEPEND, libltdl.so is used for native abi |
516 |
- |
517 |
-DEPEND="${RDEPEND} |
518 |
- sys-devel/m4 |
519 |
- doc? ( app-doc/doxygen ) |
520 |
- test? ( >=dev-libs/check-0.9.10 ) |
521 |
- X? ( |
522 |
- x11-proto/xproto[${MULTILIB_USEDEP}] |
523 |
- >=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}] |
524 |
- ) |
525 |
- dev-libs/libatomic_ops |
526 |
- virtual/pkgconfig |
527 |
- system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) ) |
528 |
- dev-util/intltool |
529 |
- >=sys-devel/gettext-0.18.1 |
530 |
-" |
531 |
-# This is a PDEPEND to avoid a circular dep |
532 |
-PDEPEND=" |
533 |
- alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}] ) ) |
534 |
-" |
535 |
- |
536 |
-# alsa-utils dep is for the alsasound init.d script (see bug #155707) |
537 |
-# bluez dep is for the bluetooth init.d script |
538 |
-# PyQt4 dep is for the qpaeq script |
539 |
-RDEPEND="${RDEPEND} |
540 |
- equalizer? ( qt4? ( dev-python/PyQt4[dbus] ) ) |
541 |
- system-wide? ( |
542 |
- alsa? ( media-sound/alsa-utils ) |
543 |
- bluetooth? ( >=net-wireless/bluez-5 ) |
544 |
- ) |
545 |
-" |
546 |
- |
547 |
-PATCHES=( |
548 |
- "${FILESDIR}/${PN}-9.0-musl-padsp.patch" |
549 |
-) |
550 |
- |
551 |
-pkg_pretend() { |
552 |
- CONFIG_CHECK="~HIGH_RES_TIMERS" |
553 |
- WARNING_HIGH_RES_TIMERS="CONFIG_HIGH_RES_TIMERS:\tis not set (required for enabling timer-based scheduling in pulseaudio)\n" |
554 |
- check_extra_config |
555 |
- |
556 |
- if linux_config_exists; then |
557 |
- local snd_hda_prealloc_size=$(linux_chkconfig_string SND_HDA_PREALLOC_SIZE) |
558 |
- if [ -n "${snd_hda_prealloc_size}" ] && [ "${snd_hda_prealloc_size}" -lt 2048 ]; then |
559 |
- ewarn "A preallocated buffer-size of 2048 (kB) or higher is recommended for the HD-audio driver!" |
560 |
- ewarn "CONFIG_SND_HDA_PREALLOC_SIZE=${snd_hda_prealloc_size}" |
561 |
- fi |
562 |
- fi |
563 |
-} |
564 |
- |
565 |
-pkg_setup() { |
566 |
- linux-info_pkg_setup |
567 |
- gnome2_environment_reset #543364 |
568 |
- |
569 |
- enewgroup audio 18 # Just make sure it exists |
570 |
- |
571 |
- if use system-wide; then |
572 |
- enewgroup pulse-access |
573 |
- enewgroup pulse |
574 |
- enewuser pulse -1 -1 /var/run/pulse pulse,audio |
575 |
- fi |
576 |
-} |
577 |
- |
578 |
-src_prepare() { |
579 |
- default |
580 |
- |
581 |
- # Skip test that cannot work with sandbox, bug #501846 |
582 |
- sed -i -e '/lock-autospawn-test/d' src/Makefile.am || die |
583 |
- |
584 |
- eautoreconf |
585 |
-} |
586 |
- |
587 |
-multilib_src_configure() { |
588 |
- local myconf=() |
589 |
- |
590 |
- if use gdbm; then |
591 |
- myconf+=( --with-database=gdbm ) |
592 |
- else |
593 |
- myconf+=( --with-database=simple ) |
594 |
- fi |
595 |
- |
596 |
- if use bluetooth; then |
597 |
- if multilib_is_native_abi; then |
598 |
- myconf+=( --enable-bluez5 --disable-bluez4 |
599 |
- $(use_enable native-headset bluez5-native-headset) |
600 |
- $(use_enable ofono-headset bluez5-ofono-headset) ) |
601 |
- fi |
602 |
- else |
603 |
- myconf+=( --disable-bluez5 --disable-bluez4 ) |
604 |
- fi |
605 |
- |
606 |
- myconf+=( |
607 |
- --enable-largefile |
608 |
- $(use_enable glib glib2) |
609 |
- --disable-solaris |
610 |
- $(use_enable asyncns) |
611 |
- $(use_enable oss oss-output) |
612 |
- $(use_enable alsa) |
613 |
- $(use_enable lirc) |
614 |
- $(use_enable neon neon-opt) |
615 |
- $(use_enable tcpd tcpwrap) |
616 |
- $(use_enable jack) |
617 |
- $(use_enable zeroconf avahi) |
618 |
- $(use_enable dbus) |
619 |
- $(use_enable gnome gconf) |
620 |
- $(use_enable gtk gtk3) |
621 |
- $(use_enable libsamplerate samplerate) |
622 |
- $(use_enable orc) |
623 |
- $(use_enable X x11) |
624 |
- $(use_enable test default-build-tests) |
625 |
- $(use_enable udev) |
626 |
- $(use_with sox soxr) |
627 |
- $(use_enable systemd systemd-daemon) |
628 |
- $(use_enable systemd systemd-login) |
629 |
- $(use_enable systemd systemd-journal) |
630 |
- $(use_enable ipv6) |
631 |
- $(use_enable ssl openssl) |
632 |
- $(use_enable webrtc-aec) |
633 |
- $(use_with caps) |
634 |
- $(use_with equalizer fftw) |
635 |
- --disable-adrian-aec |
636 |
- --disable-esound |
637 |
- --localstatedir="${EPREFIX}"/var |
638 |
- --with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d |
639 |
- --with-systemduserunitdir=$(systemd_get_userunitdir) |
640 |
- ) |
641 |
- |
642 |
- if ! multilib_is_native_abi; then |
643 |
- # disable all the modules and stuff |
644 |
- myconf+=( |
645 |
- --disable-oss-output |
646 |
- --disable-alsa |
647 |
- --disable-lirc |
648 |
- --disable-jack |
649 |
- --disable-avahi |
650 |
- --disable-gconf |
651 |
- --disable-gtk3 |
652 |
- --disable-samplerate |
653 |
- --disable-bluez4 |
654 |
- --disable-bluez5 |
655 |
- --disable-udev |
656 |
- --disable-openssl |
657 |
- --disable-orc |
658 |
- --disable-webrtc-aec |
659 |
- --without-fftw |
660 |
- --without-soxr |
661 |
- |
662 |
- # tests involve random modules, so just do them for the native |
663 |
- --disable-default-build-tests |
664 |
- |
665 |
- # hack around unnecessary checks |
666 |
- # (results don't matter, we're not building anything using it) |
667 |
- ac_cv_lib_ltdl_lt_dladvise_init=yes |
668 |
- --with-database=simple |
669 |
- LIBSPEEX_CFLAGS=' ' |
670 |
- LIBSPEEX_LIBS=' ' |
671 |
- ) |
672 |
- fi |
673 |
- |
674 |
- ECONF_SOURCE=${S} \ |
675 |
- econf "${myconf[@]}" |
676 |
-} |
677 |
- |
678 |
-multilib_src_compile() { |
679 |
- if multilib_is_native_abi; then |
680 |
- emake |
681 |
- use doc && emake doxygen |
682 |
- else |
683 |
- local targets=( libpulse.la libpulse-simple.la ) |
684 |
- use glib && targets+=( libpulse-mainloop-glib.la ) |
685 |
- emake -C src libpulse{,dsp,-simple,-mainloop-glib}.la |
686 |
- fi |
687 |
-} |
688 |
- |
689 |
-multilib_src_test() { |
690 |
- # We avoid running the toplevel check target because that will run |
691 |
- # po/'s tests too, and they are broken. Officially, it should work |
692 |
- # with intltool 0.41, but that doesn't look like a stable release. |
693 |
- if multilib_is_native_abi; then |
694 |
- emake -C src check |
695 |
- fi |
696 |
-} |
697 |
- |
698 |
-multilib_src_install() { |
699 |
- if multilib_is_native_abi; then |
700 |
- emake -j1 DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" install |
701 |
- use doc && dohtml -r doxygen/html/ |
702 |
- else |
703 |
- local targets=( libpulse.la libpulse-simple.la ) |
704 |
- use glib && targets+=( libpulse-mainloop-glib.la ) |
705 |
- emake DESTDIR="${D}" install-pkgconfigDATA |
706 |
- emake DESTDIR="${D}" -C src \ |
707 |
- install-libLTLIBRARIES \ |
708 |
- install-padsplibLTLIBRARIES \ |
709 |
- lib_LTLIBRARIES="${targets[*]}" \ |
710 |
- install-pulseincludeHEADERS |
711 |
- fi |
712 |
-} |
713 |
- |
714 |
-multilib_src_install_all() { |
715 |
- # Drop the script entirely if X is disabled |
716 |
- use X || rm "${ED}"/usr/bin/start-pulseaudio-x11 |
717 |
- |
718 |
- if use system-wide; then |
719 |
- newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio |
720 |
- |
721 |
- use_define() { |
722 |
- local define=${2:-$(echo $1 | tr '[:lower:]' '[:upper:]')} |
723 |
- |
724 |
- use "$1" && echo "-D$define" || echo "-U$define" |
725 |
- } |
726 |
- |
727 |
- unifdef $(use_define zeroconf AVAHI) \ |
728 |
- $(use_define alsa) \ |
729 |
- $(use_define bluetooth) \ |
730 |
- $(use_define udev) \ |
731 |
- "${FILESDIR}/pulseaudio.init.d-5" \ |
732 |
- > "${T}/pulseaudio" |
733 |
- |
734 |
- doinitd "${T}/pulseaudio" |
735 |
- |
736 |
- systemd_dounit "${FILESDIR}/${PN}.service" |
737 |
- fi |
738 |
- |
739 |
- use zeroconf && sed -i -e '/module-zeroconf-publish/s:^#::' "${ED}/etc/pulse/default.pa" |
740 |
- |
741 |
- dodoc NEWS README todo |
742 |
- |
743 |
- # Create the state directory |
744 |
- use prefix || diropts -o pulse -g pulse -m0755 |
745 |
- |
746 |
- # We need /var/run/pulse, bug #442852 |
747 |
- use system-wide && systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf" |
748 |
- |
749 |
- # Prevent warnings when system-wide is not used, bug #447694 |
750 |
- use system-wide || rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf |
751 |
- |
752 |
- prune_libtool_files --all |
753 |
-} |
754 |
- |
755 |
-pkg_postinst() { |
756 |
- if use system-wide; then |
757 |
- elog "You have enabled the 'system-wide' USE flag for pulseaudio." |
758 |
- elog "This mode should only be used on headless servers, embedded systems," |
759 |
- elog "or thin clients. It will usually require manual configuration, and is" |
760 |
- elog "incompatible with many expected pulseaudio features." |
761 |
- elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED." |
762 |
- elog "For more information, see" |
763 |
- elog " https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/" |
764 |
- elog " https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/" |
765 |
- elog " https://wiki.gentoo.org/wiki/PulseAudio#Headless_server" |
766 |
- if use gnome ; then |
767 |
- elog |
768 |
- elog "By enabling gnome USE flag, you enabled gconf support. Please note" |
769 |
- elog "that you might need to remove the gnome USE flag or disable the" |
770 |
- elog "gconf module on /etc/pulse/system.pa to be able to use PulseAudio" |
771 |
- elog "with a system-wide instance." |
772 |
- fi |
773 |
- fi |
774 |
- |
775 |
- if use equalizer && ! use qt4; then |
776 |
- elog "You've enabled the 'equalizer' USE-flag but not the 'qt4' USE-flag." |
777 |
- elog "This will build the equalizer module, but the 'qpaeq' tool" |
778 |
- elog "which is required to set equalizer levels will not work." |
779 |
- fi |
780 |
- |
781 |
- if use native-headset && use ofono-headset; then |
782 |
- elog "You have enabled both native and ofono headset profiles. The runtime decision" |
783 |
- elog "which to use is done via the 'headset' argument of module-bluetooth-discover." |
784 |
- fi |
785 |
- |
786 |
- if use libsamplerate; then |
787 |
- elog "The libsamplerate based resamplers are now deprecated, because they offer no" |
788 |
- elog "particular advantage over speex. Upstream suggests disabling them." |
789 |
- fi |
790 |
-} |
791 |
|
792 |
diff --git a/media-sound/pulseaudio/pulseaudio-11.1.ebuild b/media-sound/pulseaudio/pulseaudio-11.1.ebuild |
793 |
index eeceeac..ede0809 100644 |
794 |
--- a/media-sound/pulseaudio/pulseaudio-11.1.ebuild |
795 |
+++ b/media-sound/pulseaudio/pulseaudio-11.1.ebuild |
796 |
@@ -1,4 +1,4 @@ |
797 |
-# Copyright 1999-2017 Gentoo Foundation |
798 |
+# Copyright 1999-2018 Gentoo Foundation |
799 |
# Distributed under the terms of the GNU General Public License v2 |
800 |
|
801 |
EAPI=6 |
802 |
@@ -16,7 +16,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz" |
803 |
LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 ) equalizer? ( AGPL-3+ )" |
804 |
|
805 |
SLOT="0" |
806 |
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sh ~sparc ~x86" |
807 |
+KEYWORDS="amd64 arm ia64 ppc ~sh sparc x86" |
808 |
|
809 |
# +alsa-plugin as discussed in bug #519530 |
810 |
IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib |
811 |
@@ -75,17 +75,9 @@ RDEPEND=" |
812 |
!libressl? ( dev-libs/openssl:0= ) |
813 |
libressl? ( dev-libs/libressl:= ) |
814 |
) |
815 |
- || ( |
816 |
- ( |
817 |
- >=media-libs/speex-1.2.0 |
818 |
- media-libs/speexdsp |
819 |
- ) |
820 |
- ( |
821 |
- <media-libs/speex-1.2.0 |
822 |
- >=media-libs/speex-1.2_rc1 |
823 |
- ) |
824 |
- ) |
825 |
- gdbm? ( sys-libs/gdbm ) |
826 |
+ >=media-libs/speex-1.2.0 |
827 |
+ media-libs/speexdsp |
828 |
+ gdbm? ( sys-libs/gdbm:= ) |
829 |
webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 ) |
830 |
systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] ) |
831 |
dev-libs/libltdl:0 |
832 |
@@ -98,7 +90,7 @@ DEPEND="${RDEPEND} |
833 |
doc? ( app-doc/doxygen ) |
834 |
test? ( >=dev-libs/check-0.9.10 ) |
835 |
X? ( |
836 |
- x11-proto/xproto[${MULTILIB_USEDEP}] |
837 |
+ x11-base/xorg-proto |
838 |
>=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}] |
839 |
) |
840 |
dev-libs/libatomic_ops |