* [gentoo-commits] proj/musl:master commit in: media-sound/pulseaudio/, media-sound/pulseaudio/files/
@ 2017-01-29 11:16 Anthony G. Basile
0 siblings, 0 replies; 3+ messages in thread
From: Anthony G. Basile @ 2017-01-29 11:16 UTC (permalink / raw
To: gentoo-commits
commit: 40d2a7902e1a2053bbe06dbdc361fc63d970c677
Author: callmetango <callmetango <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Wed Jan 25 19:35:37 2017 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 11:16:18 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=40d2a790
media-sound/pulseaudio: added version 9.0 with patches from Alpine Linux
media-sound/pulseaudio/Manifest | 8 +
.../files/pulseaudio-9.0-musl-padsp.patch | 67 ++++
media-sound/pulseaudio/files/pulseaudio.conf.d | 7 +
media-sound/pulseaudio/files/pulseaudio.init.d-5 | 81 +++++
media-sound/pulseaudio/files/pulseaudio.service | 10 +
media-sound/pulseaudio/files/pulseaudio.tmpfiles | 1 +
media-sound/pulseaudio/metadata.xml | 84 +++++
media-sound/pulseaudio/pulseaudio-9.0.ebuild | 370 +++++++++++++++++++++
8 files changed, 628 insertions(+)
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
new file mode 100644
index 0000000..64a4743
--- /dev/null
+++ b/media-sound/pulseaudio/Manifest
@@ -0,0 +1,8 @@
+AUX pulseaudio-9.0-musl-padsp.patch 1681 SHA256 bfa722e400ba820ee7013ceb050058b4e239b1ea8544be23767ceb70ee0bc332 SHA512 25b648681d9397631138635c024b5c6e289e32f11bf222afe4d853f62501555b5d75cc9058023d24ab8f97e442bcb37a647667e01582539d146762912a8ce08e WHIRLPOOL 543e2ff55f20aa653c7617894e1610f16193bc26b463662d44b6a7525e767b98782e8bee1bec402ce2c5ed02dae2c904da9e99b1d17b59b8823b87265c3988e7
+AUX pulseaudio.conf.d 158 SHA256 06a4c3effeb3d30df6d384f7405a5c3297a04d7f1db17b511a77702007c95c95 SHA512 05f1cea02d9fcbcca07202aa5c8664dceb6a71b72b306af7e361c1caeb8708c37760c62af8b27e34d3a00b817ecac73de9e4a9925479f0437c4a0345f0563b58 WHIRLPOOL 912ffc1d4da5c8bfdd664da9ac7143c0107084ce80fbd986082fad37c99d35d86cb254d5a81eafde9bfc1362467d4a338c817eadb8052f28eaab0702f2290506
+AUX pulseaudio.init.d-5 2234 SHA256 77b53c1d70ad7439293c0fe42d72e73b0d56f2ef60d7c7a98d042a01a702300c SHA512 b882ccf6d278dda70b3911d2fff4620908c1d87edac34fea6310f8db77f5e8514b473ed93b0fc4e7e3499dcae3d866d33fdaa476fea6419a219f9c178c48756b WHIRLPOOL 9fa82547e98e8c632571aa40c6e9b54e06db65f727b497ccf64f248621e180c284b3db242917d4ca9eadcc26484f1d46541e75b1c0e9fc3fe76356c32f168e6e
+AUX pulseaudio.service 227 SHA256 62cd3b7e83845a27f437790cf293970f85ff02816da599a53cd5f3bf13da3788 SHA512 567663b231fe7c2682b08b1059cdad1fcb3c4cb01c1b24aed9afb6fb767b30f250b78bbbed48aadfb06c6d1a4963a6db24877d79a1d36c4be2a128b479c086d6 WHIRLPOOL bb548efc14d88b372abaafae557fe23681ce93d1b010fe7761458c5f7793a96886aa368df4cbec5a4fde078f9e8d940020e3ad2a36248ff6c8ab3b70f412d634
+AUX pulseaudio.tmpfiles 36 SHA256 d836951fb800308256288506b6bd82919d377399e1292dc10905a7aa12dac0e9 SHA512 f040850d81030ef04e1aa368d333a1ae1b7238adef5772280fc344c3068262d5ab8c9f3edb92db9c443f9d7d21abb27583ea1efc51ed733bbfa43e2edc68dde1 WHIRLPOOL b293b7372b7f63ddea63e6985d1f66a2010d8778ea3ae00501e58f15bfba3ed19b794111c073ee3bd5c8cf98d33f3c8db95220acf57f97477523f4cfa7121553
+DIST pulseaudio-9.0.tar.xz 1537568 SHA256 c3d3d66b827f18fbe903fe3df647013f09fc1e2191c035be1ee2d82a9e404686 SHA512 2177d4ab2ab7ded43d6eb5ece763504bdd614f9bdc27ab007894f8f7eed3fd0006a5b7550e5fd099d1877423524bc2baa22775372c8cefd9b772c28134d3e55a WHIRLPOOL 46f7accbae648143f14a51673014d8f20d578b618f79e681062d612f8cc83a3269bbe1ade769fad8b876bddd53d7ed15b04c01c3a518aa9e5fbbf2aca6253d20
+EBUILD pulseaudio-9.0.ebuild 11100 SHA256 def83816a9592bab1b1c4c1806e7370b3485c062bf480511efbb2a0246e2b83f SHA512 f0f63b9b4b2328a4bb69275a8517ea285e8268d54fb1558f061055dca0b5f3bb38887df071f53ee83e0b8fe1ea6412a9e7683d9cc6d3a96770cca2e3cf77301f WHIRLPOOL 501359f01234296df0957ef46fd4649d1f3bd69f6861eff1c490efe8907f9243229973dbc7225b1e2788252b5b61b3469274d60d875b5bdfaf522bb668434f81
+MISC metadata.xml 3519 SHA256 1acbacb97aa01f4b5f0906b845191023418c7c450579756d7f012e17fb9ffef1 SHA512 caf3dd068c5ec66b53dedc44642f333e091e8aa745cd2a3218b40cefb6713bfaaa8826a773697e6dc22441ee1238b6bb468168fd4a85ef5d504b45b3d6eacbf9 WHIRLPOOL aa7fe6f702994b84b440b6a267f333ac6e7b814e3fb3404fcb378b63f8d97a6eed32f53fcf4c10d0fa8dbe250cb1f3988468a2e5cc8402b61339db87dc34fd49
diff --git a/media-sound/pulseaudio/files/pulseaudio-9.0-musl-padsp.patch b/media-sound/pulseaudio/files/pulseaudio-9.0-musl-padsp.patch
new file mode 100644
index 0000000..1593393
--- /dev/null
+++ b/media-sound/pulseaudio/files/pulseaudio-9.0-musl-padsp.patch
@@ -0,0 +1,67 @@
+From f6ab3c3aa7a1841c8add04828029356d2a8c88e7 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 6 Apr 2015 21:56:31 -0700
+Subject: [PATCH] padsp: Make it compile on musl
+
+break assumptions on glibc and there is no stat64 on non
+glibc C libraries
+
+See pulseaudio bug
+
+https://bugs.freedesktop.org/show_bug.cgi?id=85319
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/utils/padsp.c | 15 +++++++++------
+ 1 file changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/src/utils/padsp.c b/src/utils/padsp.c
+index 943479b..d0530d7 100644
+--- a/src/utils/padsp.c
++++ b/src/utils/padsp.c
+@@ -2377,7 +2377,7 @@ fail:
+ return ret;
+ }
+
+-#ifdef sun
++#ifndef __GLIBC__
+ int ioctl(int fd, int request, ...) {
+ #else
+ int ioctl(int fd, unsigned long request, ...) {
+@@ -2517,10 +2517,13 @@ int stat(const char *pathname, struct stat *buf) {
+
+ return 0;
+ }
+-
+ #ifdef HAVE_OPEN64
+-
++#undef stat64
++#ifdef __GLIBC__
+ int stat64(const char *pathname, struct stat64 *buf) {
++#else
++int stat64(const char *pathname, struct stat *buf) {
++#endif
+ struct stat oldbuf;
+ int ret;
+
+@@ -2553,7 +2556,7 @@ int stat64(const char *pathname, struct stat64 *buf) {
+
+ return 0;
+ }
+-
++#undef open64
+ int open64(const char *filename, int flags, ...) {
+ va_list args;
+ mode_t mode = 0;
+@@ -2679,8 +2682,8 @@ FILE* fopen(const char *filename, const char *mode) {
+ }
+
+ #ifdef HAVE_OPEN64
+-
+-FILE *fopen64(const char *filename, const char *mode) {
++#undef fopen64
++FILE *fopen64(const char *__restrict filename, const char *__restrict mode) {
+
+ debug(DEBUG_LEVEL_VERBOSE, __FILE__": fopen64(%s)\n", filename?filename:"NULL");
+
diff --git a/media-sound/pulseaudio/files/pulseaudio.conf.d b/media-sound/pulseaudio/files/pulseaudio.conf.d
new file mode 100644
index 0000000..348540b
--- /dev/null
+++ b/media-sound/pulseaudio/files/pulseaudio.conf.d
@@ -0,0 +1,7 @@
+# Config file for /etc/init.d/pulseaudio
+# $Id$
+
+# For more see "pulseaudio -h".
+
+# Startup options
+PA_OPTS="--log-target=syslog --disallow-module-loading=1"
diff --git a/media-sound/pulseaudio/files/pulseaudio.init.d-5 b/media-sound/pulseaudio/files/pulseaudio.init.d-5
new file mode 100644
index 0000000..099edd3
--- /dev/null
+++ b/media-sound/pulseaudio/files/pulseaudio.init.d-5
@@ -0,0 +1,81 @@
+#!/sbin/openrc-run
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+ need localmount
+ use net
+
+ local script="/etc/pulse/system.pa"
+
+ for opt in ${PA_OPTS}; do
+ case "$opt" in
+ --file=*) script="${opt#*=}" ;;
+ -F*) script="${opt#-F}" ;;
+ esac
+ done
+
+ config "$script"
+
+ local needs="$(get_options need)"
+ if [ -n "${needs}" ]; then
+ need ${needs}
+ return
+ fi
+
+ if egrep -q '^[[:space:]]*load-module[[:space:]]+module-console-kit' "$script"; then
+ needs="${needs} consolekit"
+ fi
+
+#ifdef UDEV
+ if egrep -q '^[[:space:]]*load-module[[:space:]]+module-udev-detect' "$script"; then
+ needs="${needs} udev"
+ fi
+#endif
+
+#ifdef AVAHI
+ if egrep -q '^[[:space:]]*load-module[[:space:]]+module-zeroconf-publish' "$script"; then
+ needs="${needs} avahi-daemon"
+ fi
+#endif
+
+#ifdef BLUETOOTH
+ if egrep -q '^[[:space:]]*load-module[[:space:]]+module-bt-proximity' "$script"; then
+ needs="${needs} bluetooth"
+ fi
+#endif
+
+#ifdef ALSA
+ if egrep -q '^[[:space:]]*load-module[[:space:]]+module-alsa-(sink|source)' "$script" ||
+ egrep -q '^[[:space:]]*load-module[[:space:]]+module-(udev-)?detect' "$script" ||
+ egrep -q '^[[:space:]]*add-autoload-source[[:space:]]+(input|output)[[:space:]]+module-alsa-(sink|source)' "$script"; then
+ needs="${needs} alsasound"
+ fi
+#endif
+
+ need "${needs}"
+ save_options need "${needs}"
+}
+
+start() {
+ if [ -z "${PULSEAUDIO_SHOULD_NOT_GO_SYSTEMWIDE}" ]; then
+ eerror "Please don't use system wide PulseAudio unless you read the"
+ eerror "documentation available at http://www.pulseaudio.org/wiki/WhatIsWrongWithSystemMode"
+ eerror ""
+ eerror "When you're done, please set the variable PULSEAUDIO_SHOULD_NOT_GO_SYSTEMWIDE in"
+ eerror "/etc/conf.d/pulseaudio . Please remember that upstream does not support this mode"
+ eerror "when used for standard desktop configurations."
+ return 1
+ fi
+ ebegin "Starting pulseaudio"
+ PA_ALL_OPTS="${PA_OPTS} --fail=1 --daemonize=1 --system"
+ start-stop-daemon --start --exec /usr/bin/pulseaudio -- ${PA_ALL_OPTS}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping pulseaudio"
+ start-stop-daemon --stop --quiet --exec /usr/bin/pulseaudio --pidfile /var/run/pulse/pid
+ eend $?
+}
diff --git a/media-sound/pulseaudio/files/pulseaudio.service b/media-sound/pulseaudio/files/pulseaudio.service
new file mode 100644
index 0000000..c5f0d57
--- /dev/null
+++ b/media-sound/pulseaudio/files/pulseaudio.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=System wide PulseAudio instance
+After=syslog.target network.target alsasound.service
+
+[Service]
+Restart=always
+ExecStart=/usr/bin/pulseaudio --system --log-target=syslog
+
+[Install]
+WantedBy=multi-user.target
diff --git a/media-sound/pulseaudio/files/pulseaudio.tmpfiles b/media-sound/pulseaudio/files/pulseaudio.tmpfiles
new file mode 100644
index 0000000..88374e3
--- /dev/null
+++ b/media-sound/pulseaudio/files/pulseaudio.tmpfiles
@@ -0,0 +1 @@
+d /var/run/pulse 0755 pulse audio -
diff --git a/media-sound/pulseaudio/metadata.xml b/media-sound/pulseaudio/metadata.xml
new file mode 100644
index 0000000..1f547a3
--- /dev/null
+++ b/media-sound/pulseaudio/metadata.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
+ <use>
+ <flag name="X">
+ Build the X11 publish module to export PulseAudio information
+ through X11 protocol for clients to make use. Don't enable this
+ flag if you want to use a system wide instance. If unsure, enable
+ this flag.
+ </flag>
+ <flag name="alsa-plugin">
+ Request installing <pkg>media-plugins/alsa-plugins</pkg> with
+ PulseAudio plugin enabled. This ensures that clients supporting
+ ALSA only will use PulseAudio.
+ </flag>
+ <flag name="gnome">
+ Use GConf to store user preferences on streams and so on. Don't
+ enable this flag if you want to use a system wide instance. If
+ unsure, enable this flag.
+ </flag>
+ <flag name="oss">
+ Enable OSS sink/source (output/input). Deprecated, upstream does
+ not support this on systems where other sink/source systems are
+ available (i.e.: Linux). The padsp wrapper is now always build
+ if the system supports OSS at all.
+ </flag>
+ <flag name="glib">
+ Add support to <pkg>dev-libs/glib</pkg>-based mainloop for the
+ libpulse client library, to allow using libpulse on glib-based
+ programs.
+ </flag>
+ <flag name="system-wide" restrict=">=media-sound/pulseaudio-0.9.21.1">
+ Allow preparation and installation of the system-wide init
+ script for PulseAudio. Since this support is only supported for
+ embedded situations, do not enable without reading the upstream
+ instructions at
+ http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/ .
+ </flag>
+ <flag name="asyncns">Use libasyncns for asynchronous name resolution.</flag>
+ <flag name="doc">Build the doxygen-described API documentation.</flag>
+ <flag name="realtime" restrict=">=media-sound/pulseaudio-0.9.21.2-r1">
+ Makes PulseAudio use RealtimeKit (<pkg>sys-auth/rtkit</pkg>) to get
+ real-time priority while running.
+ </flag>
+ <flag name="equalizer">
+ Enable the equalizer module (requires <pkg>sci-libs/fftw</pkg>).
+ </flag>
+ <flag name="ssl">
+ Use <pkg>dev-libs/openssl</pkg> to provide support for RAOP
+ (AirPort) streaming.
+ </flag>
+ <flag name="gdbm">
+ Use <pkg>sys-libs/gdbm</pkg> to store PulseAudio
+ databases. Recommended for desktop usage. This flag causes the
+ whole package to be licensed under GPL-2 or later.
+ </flag>
+ <flag name="webrtc-aec">
+ Uses the webrtc.org AudioProcessing library for enhancing VoIP calls
+ greatly in applications that support it by performing acoustic echo
+ cancellation, analog gain control, noise suppression and other processing.
+ </flag>
+ <flag name="xen">
+ Builds a special paravirtualized module for running in a Xen guest.
+ </flag>
+ <flag name="systemd">
+ Build with <pkg>sys-apps/systemd</pkg> support to replace standalone
+ ConsoleKit.
+ </flag>
+ <flag name="native-headset">
+ Build with native HSP backend for bluez 5.
+ </flag>
+ <flag name="ofono-headset">
+ Build with oFono HFP backend for bluez 5, requires <pkg>net-misc/ofono</pkg>.
+ </flag>
+ </use>
+</pkgmetadata>
diff --git a/media-sound/pulseaudio/pulseaudio-9.0.ebuild b/media-sound/pulseaudio/pulseaudio-9.0.ebuild
new file mode 100644
index 0000000..f7f394b
--- /dev/null
+++ b/media-sound/pulseaudio/pulseaudio-9.0.ebuild
@@ -0,0 +1,370 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools bash-completion-r1 eutils flag-o-matic gnome2-utils linux-info systemd user versionator udev multilib-minimal
+
+DESCRIPTION="A networked sound server with an advanced plugin system"
+HOMEPAGE="http://www.pulseaudio.org/"
+SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
+
+# libpulse-simple and libpulse link to libpulse-core; this is daemon's
+# library and can link to gdbm and other GPL-only libraries. In this
+# cases, we have a fully GPL-2 package. Leaving the rest of the
+# GPL-forcing USE flags for those who use them.
+LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+
+# +alsa-plugin as discussed in bug #519530
+IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib
+gnome gtk ipv6 jack libsamplerate libressl lirc native-headset neon ofono-headset
++orc oss qt4 realtime selinux sox ssl systemd system-wide tcpd test +udev
++webrtc-aec +X xen zeroconf"
+
+# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
+REQUIRED_USE="
+ bluetooth? ( dbus )
+ ofono-headset? ( bluetooth )
+ native-headset? ( bluetooth )
+ udev? ( || ( alsa oss ) )
+"
+
+# libpcre needed in some cases, bug #472228
+RDEPEND="
+ || (
+ elibc_glibc? ( virtual/libc )
+ elibc_uclibc? ( virtual/libc )
+ dev-libs/libpcre
+ )
+ >=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}]
+ X? (
+ >=x11-libs/libX11-1.4.0[${MULTILIB_USEDEP}]
+ >=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
+ x11-libs/libSM[${MULTILIB_USEDEP}]
+ x11-libs/libICE[${MULTILIB_USEDEP}]
+ x11-libs/libXtst[${MULTILIB_USEDEP}]
+ )
+ caps? ( >=sys-libs/libcap-2.22-r2[${MULTILIB_USEDEP}] )
+ libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 )
+ alsa? ( >=media-libs/alsa-lib-1.0.19 )
+ glib? ( >=dev-libs/glib-2.4.0:2[${MULTILIB_USEDEP}] )
+ zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
+ jack? ( virtual/jack )
+ tcpd? ( sys-apps/tcp-wrappers[${MULTILIB_USEDEP}] )
+ lirc? ( app-misc/lirc )
+ dbus? ( >=sys-apps/dbus-1.0.0[${MULTILIB_USEDEP}] )
+ gtk? ( x11-libs/gtk+:3 )
+ gnome? ( >=gnome-base/gconf-2.4.0 )
+ bluetooth? (
+ >=net-wireless/bluez-5
+ >=sys-apps/dbus-1.0.0
+ media-libs/sbc
+ )
+ asyncns? ( net-libs/libasyncns[${MULTILIB_USEDEP}] )
+ udev? ( >=virtual/udev-143[hwdb(+)] )
+ realtime? ( sys-auth/rtkit )
+ equalizer? ( sci-libs/fftw:3.0 )
+ ofono-headset? ( >=net-misc/ofono-1.13 )
+ orc? ( >=dev-lang/orc-0.4.15 )
+ sox? ( >=media-libs/soxr-0.1.1 )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
+ )
+ >=media-libs/speex-1.2_rc1
+ gdbm? ( sys-libs/gdbm )
+ webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 )
+ xen? ( app-emulation/xen-tools )
+ systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] )
+ >=dev-libs/json-c-0.11[${MULTILIB_USEDEP}]
+ dev-libs/libltdl:0
+ selinux? ( sec-policy/selinux-pulseaudio )
+"
+# it's a valid RDEPEND, libltdl.so is used for native abi
+
+DEPEND="${RDEPEND}
+ sys-devel/m4
+ doc? ( app-doc/doxygen )
+ test? ( dev-libs/check )
+ X? (
+ x11-proto/xproto[${MULTILIB_USEDEP}]
+ >=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}]
+ )
+ dev-libs/libatomic_ops
+ virtual/pkgconfig
+ system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) )
+ dev-util/intltool
+ >=sys-devel/gettext-0.18.1
+"
+# This is a PDEPEND to avoid a circular dep
+PDEPEND="
+ alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}] ) )
+"
+
+# alsa-utils dep is for the alsasound init.d script (see bug #155707)
+# bluez dep is for the bluetooth init.d script
+# PyQt4 dep is for the qpaeq script
+RDEPEND="${RDEPEND}
+ equalizer? ( qt4? ( dev-python/PyQt4[dbus] ) )
+ system-wide? (
+ alsa? ( media-sound/alsa-utils )
+ bluetooth? ( >=net-wireless/bluez-5 )
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-9.0-musl-padsp.patch"
+)
+
+pkg_pretend() {
+ CONFIG_CHECK="~HIGH_RES_TIMERS"
+ WARNING_HIGH_RES_TIMERS="CONFIG_HIGH_RES_TIMERS:\tis not set (required for enabling timer-based scheduling in pulseaudio)\n"
+ check_extra_config
+
+ if linux_config_exists; then
+ local snd_hda_prealloc_size=$(linux_chkconfig_string SND_HDA_PREALLOC_SIZE)
+ if [ -n "${snd_hda_prealloc_size}" ] && [ "${snd_hda_prealloc_size}" -lt 2048 ]; then
+ ewarn "A preallocated buffer-size of 2048 (kB) or higher is recommended for the HD-audio driver!"
+ ewarn "CONFIG_SND_HDA_PREALLOC_SIZE=${snd_hda_prealloc_size}"
+ fi
+ fi
+}
+
+pkg_setup() {
+ linux-info_pkg_setup
+ gnome2_environment_reset #543364
+
+ enewgroup audio 18 # Just make sure it exists
+
+ if use system-wide; then
+ enewgroup pulse-access
+ enewgroup pulse
+ enewuser pulse -1 -1 /var/run/pulse pulse,audio
+ fi
+}
+
+src_prepare() {
+ default
+
+ # Skip test that cannot work with sandbox, bug #501846
+ sed -i -e '/lock-autospawn-test/d' src/Makefile.am || die
+
+ eautoreconf
+}
+
+multilib_src_configure() {
+ local myconf=()
+
+ if use gdbm; then
+ myconf+=( --with-database=gdbm )
+ else
+ myconf+=( --with-database=simple )
+ fi
+
+ if use bluetooth; then
+ if multilib_is_native_abi; then
+ myconf+=( --enable-bluez5 --disable-bluez4
+ $(use_enable native-headset bluez5-native-headset)
+ $(use_enable ofono-headset bluez5-ofono-headset) )
+ fi
+ else
+ myconf+=( --disable-bluez5 --disable-bluez4 )
+ fi
+
+ myconf+=(
+ --enable-largefile
+ $(use_enable glib glib2)
+ --disable-solaris
+ $(use_enable asyncns)
+ $(use_enable oss oss-output)
+ $(use_enable alsa)
+ $(use_enable lirc)
+ $(use_enable neon neon-opt)
+ $(use_enable tcpd tcpwrap)
+ $(use_enable jack)
+ $(use_enable zeroconf avahi)
+ $(use_enable dbus)
+ $(use_enable gnome gconf)
+ $(use_enable gtk gtk3)
+ $(use_enable libsamplerate samplerate)
+ $(use_enable orc)
+ $(use_enable X x11)
+ $(use_enable test default-build-tests)
+ $(use_enable udev)
+ $(use_with sox soxr)
+ $(use_enable systemd systemd-daemon)
+ $(use_enable systemd systemd-login)
+ $(use_enable systemd systemd-journal)
+ $(use_enable ipv6)
+ $(use_enable ssl openssl)
+ $(use_enable webrtc-aec)
+ $(use_enable xen)
+ $(use_with caps)
+ $(use_with equalizer fftw)
+ --disable-adrian-aec
+ --disable-esound
+ --localstatedir="${EPREFIX}"/var
+ --with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
+ --with-systemduserunitdir=$(systemd_get_userunitdir)
+ )
+
+ if ! multilib_is_native_abi; then
+ # disable all the modules and stuff
+ myconf+=(
+ --disable-oss-output
+ --disable-alsa
+ --disable-lirc
+ --disable-jack
+ --disable-avahi
+ --disable-gconf
+ --disable-gtk3
+ --disable-samplerate
+ --disable-bluez4
+ --disable-bluez5
+ --disable-udev
+ --disable-openssl
+ --disable-orc
+ --disable-webrtc-aec
+ --disable-xen
+ --without-fftw
+ --without-soxr
+
+ # tests involve random modules, so just do them for the native
+ --disable-default-build-tests
+
+ # hack around unnecessary checks
+ # (results don't matter, we're not building anything using it)
+ ac_cv_lib_ltdl_lt_dladvise_init=yes
+ --with-database=simple
+ LIBSPEEX_CFLAGS=' '
+ LIBSPEEX_LIBS=' '
+ )
+ fi
+
+ ECONF_SOURCE=${S} \
+ econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+ if multilib_is_native_abi; then
+ emake
+ use doc && emake doxygen
+ else
+ local targets=( libpulse.la libpulse-simple.la )
+ use glib && targets+=( libpulse-mainloop-glib.la )
+ emake -C src libpulse{,dsp,-simple,-mainloop-glib}.la
+ fi
+}
+
+multilib_src_test() {
+ # We avoid running the toplevel check target because that will run
+ # po/'s tests too, and they are broken. Officially, it should work
+ # with intltool 0.41, but that doesn't look like a stable release.
+ if multilib_is_native_abi; then
+ emake -C src check
+ fi
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ emake -j1 DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" install
+ use doc && dohtml -r doxygen/html/
+ else
+ local targets=( libpulse.la libpulse-simple.la )
+ use glib && targets+=( libpulse-mainloop-glib.la )
+ emake DESTDIR="${D}" install-pkgconfigDATA
+ emake DESTDIR="${D}" -C src \
+ install-libLTLIBRARIES \
+ install-padsplibLTLIBRARIES \
+ lib_LTLIBRARIES="${targets[*]}" \
+ install-pulseincludeHEADERS
+ fi
+}
+
+multilib_src_install_all() {
+ # Drop the script entirely if X is disabled
+ use X || rm "${ED}"/usr/bin/start-pulseaudio-x11
+
+ if use system-wide; then
+ newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio
+
+ use_define() {
+ local define=${2:-$(echo $1 | tr '[:lower:]' '[:upper:]')}
+
+ use "$1" && echo "-D$define" || echo "-U$define"
+ }
+
+ unifdef $(use_define zeroconf AVAHI) \
+ $(use_define alsa) \
+ $(use_define bluetooth) \
+ $(use_define udev) \
+ "${FILESDIR}/pulseaudio.init.d-5" \
+ > "${T}/pulseaudio"
+
+ doinitd "${T}/pulseaudio"
+
+ systemd_dounit "${FILESDIR}/${PN}.service"
+ fi
+
+ use zeroconf && sed -i -e '/module-zeroconf-publish/s:^#::' "${ED}/etc/pulse/default.pa"
+
+ dodoc NEWS README todo
+
+ # Create the state directory
+ use prefix || diropts -o pulse -g pulse -m0755
+
+ # We need /var/run/pulse, bug #442852
+ use system-wide && systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
+
+ # Prevent warnings when system-wide is not used, bug #447694
+ use system-wide || rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf
+
+ prune_libtool_files --all
+}
+
+pkg_postinst() {
+ if use system-wide; then
+ elog "You have enabled the 'system-wide' USE flag for pulseaudio."
+ elog "This mode should only be used on headless servers, embedded systems,"
+ elog "or thin clients. It will usually require manual configuration, and is"
+ elog "incompatible with many expected pulseaudio features."
+ elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED."
+ elog "For more information, see"
+ elog " https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
+ elog " https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"
+ elog " https://wiki.gentoo.org/wiki/PulseAudio#Headless_server"
+ if use gnome ; then
+ elog
+ elog "By enabling gnome USE flag, you enabled gconf support. Please note"
+ elog "that you might need to remove the gnome USE flag or disable the"
+ elog "gconf module on /etc/pulse/system.pa to be able to use PulseAudio"
+ elog "with a system-wide instance."
+ fi
+ fi
+
+ if use equalizer && ! use qt4; then
+ elog "You've enabled the 'equalizer' USE-flag but not the 'qt4' USE-flag."
+ elog "This will build the equalizer module, but the 'qpaeq' tool"
+ elog "which is required to set equalizer levels will not work."
+ fi
+
+ if use native-headset && use ofono-headset; then
+ elog "You have enabled both native and ofono headset profiles. The runtime decision"
+ elog "which to use is done via the 'headset' argument of module-bluetooth-discover."
+ fi
+
+ if use libsamplerate; then
+ elog "The libsamplerate based resamplers are now deprecated, because they offer no"
+ elog "particular advantage over speex. Upstream suggests disabling them."
+ fi
+
+ # Needed for pulseaudio-6.0 update from older versions
+ if use udev; then
+ if ! version_is_at_least 6.0 ${REPLACING_VERSIONS}; then
+ udevadm control --reload && udevadm trigger
+ fi
+ fi
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/musl:master commit in: media-sound/pulseaudio/, media-sound/pulseaudio/files/
@ 2017-09-04 17:02 Aric Belsito
0 siblings, 0 replies; 3+ messages in thread
From: Aric Belsito @ 2017-09-04 17:02 UTC (permalink / raw
To: gentoo-commits
commit: 53a4e46aba657e0367c7cf03d82cbec22f3741cd
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Mon Sep 4 17:00:40 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Mon Sep 4 17:00:40 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=53a4e46a
media-sound/pulseaudio: version bump to 10.99.1
Cleanup 10.0 as well.
media-sound/pulseaudio/Manifest | 10 +++---
media-sound/pulseaudio/files/pulseaudio.conf.d | 1 -
media-sound/pulseaudio/files/pulseaudio.init.d-5 | 1 -
media-sound/pulseaudio/metadata.xml | 5 +--
media-sound/pulseaudio/pulseaudio-10.0.ebuild | 36 +++++++++++-----------
...audio-10.0.ebuild => pulseaudio-10.99.1.ebuild} | 36 +++++++++++-----------
6 files changed, 43 insertions(+), 46 deletions(-)
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index be69ee6..08e1b21 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -1,8 +1,10 @@
AUX pulseaudio-9.0-musl-padsp.patch 1681 SHA256 bfa722e400ba820ee7013ceb050058b4e239b1ea8544be23767ceb70ee0bc332 SHA512 25b648681d9397631138635c024b5c6e289e32f11bf222afe4d853f62501555b5d75cc9058023d24ab8f97e442bcb37a647667e01582539d146762912a8ce08e WHIRLPOOL 543e2ff55f20aa653c7617894e1610f16193bc26b463662d44b6a7525e767b98782e8bee1bec402ce2c5ed02dae2c904da9e99b1d17b59b8823b87265c3988e7
-AUX pulseaudio.conf.d 158 SHA256 06a4c3effeb3d30df6d384f7405a5c3297a04d7f1db17b511a77702007c95c95 SHA512 05f1cea02d9fcbcca07202aa5c8664dceb6a71b72b306af7e361c1caeb8708c37760c62af8b27e34d3a00b817ecac73de9e4a9925479f0437c4a0345f0563b58 WHIRLPOOL 912ffc1d4da5c8bfdd664da9ac7143c0107084ce80fbd986082fad37c99d35d86cb254d5a81eafde9bfc1362467d4a338c817eadb8052f28eaab0702f2290506
-AUX pulseaudio.init.d-5 2234 SHA256 77b53c1d70ad7439293c0fe42d72e73b0d56f2ef60d7c7a98d042a01a702300c SHA512 b882ccf6d278dda70b3911d2fff4620908c1d87edac34fea6310f8db77f5e8514b473ed93b0fc4e7e3499dcae3d866d33fdaa476fea6419a219f9c178c48756b WHIRLPOOL 9fa82547e98e8c632571aa40c6e9b54e06db65f727b497ccf64f248621e180c284b3db242917d4ca9eadcc26484f1d46541e75b1c0e9fc3fe76356c32f168e6e
+AUX pulseaudio.conf.d 151 SHA256 99f8e923e249ad64a8dcc3084a3300988a42412f8160476184115d5f3580a667 SHA512 f97ed431e371e43d297b099952bf1e897b243a822183524b8e3ea17e888c08590bb3793e195bc22e3254eae7f2e1fa00204a752638746c4dde825a423f08c24b WHIRLPOOL fd6904b6cbf82f9c216b64dd543be8899f91b196cdc1c37f70fd9e63aa7b2d9c08afad4c3eb392de5035d22f0e264facfd0be8393dc7df363d1c5aff5eec7ed7
+AUX pulseaudio.init.d-5 2227 SHA256 f3f19fe6aee3822b861de486c55412f05aeed112e9a062103c1381e83ad72c69 SHA512 d0e1519fc97208c2d42c7d9d8f2e7d4658e741e8063102713da361748b6deaeae475619a65b3d3d1893c107a4511e17d4245264b5430190087f1823899c0f64b WHIRLPOOL 689d0cd2dd8c160f4c9ff610d49ddd0235078bd906f942383a77bc620de7e4e6c254ce23d5cf40da92974306d8ce3c160ad94350c6ae8666a4fbe262cb67f99c
AUX pulseaudio.service 227 SHA256 62cd3b7e83845a27f437790cf293970f85ff02816da599a53cd5f3bf13da3788 SHA512 567663b231fe7c2682b08b1059cdad1fcb3c4cb01c1b24aed9afb6fb767b30f250b78bbbed48aadfb06c6d1a4963a6db24877d79a1d36c4be2a128b479c086d6 WHIRLPOOL bb548efc14d88b372abaafae557fe23681ce93d1b010fe7761458c5f7793a96886aa368df4cbec5a4fde078f9e8d940020e3ad2a36248ff6c8ab3b70f412d634
AUX pulseaudio.tmpfiles 36 SHA256 d836951fb800308256288506b6bd82919d377399e1292dc10905a7aa12dac0e9 SHA512 f040850d81030ef04e1aa368d333a1ae1b7238adef5772280fc344c3068262d5ab8c9f3edb92db9c443f9d7d21abb27583ea1efc51ed733bbfa43e2edc68dde1 WHIRLPOOL b293b7372b7f63ddea63e6985d1f66a2010d8778ea3ae00501e58f15bfba3ed19b794111c073ee3bd5c8cf98d33f3c8db95220acf57f97477523f4cfa7121553
DIST pulseaudio-10.0.tar.xz 1608040 SHA256 a3186824de9f0d2095ded5d0d0db0405dc73133983c2fbb37291547e37462f57 SHA512 11d98b4b2000a41bdea92df253409452bc9b77d8bb309b6d14c439e3b902e3f90c69da00daff409e3859a54ad01c63a75be5723616bdcb492801d622a6406481 WHIRLPOOL 6d03d8cf7b96cbb46a8cc5f7810f7cf1c4187aa9321483d5e56435874b218d437bc66860d25a149be59ca73de7118916e05e481758e04619e099cb9a50dcb119
-EBUILD pulseaudio-10.0.ebuild 11093 SHA256 022002b7353dd7ee5e5953c60ccaa99bc31b8ec4db4b08e679597ecca52cf5cf SHA512 670fae85ffd252dc2159727b1d9a1ffe5ebf0e01232fab39f5fecefe278b339d34689691f17495170a855d41fb85d3c82485673eb71ec5de4cf60c6407da03db WHIRLPOOL 879779bb5e7c0d4bd553f976122a0c5ce552cfac1c2bea469b895dea2ac53c6f40a1a50bdde6e8f42b0a45392d783a1238dd23ea3af39e187052cde398350cff
-MISC metadata.xml 3519 SHA256 1acbacb97aa01f4b5f0906b845191023418c7c450579756d7f012e17fb9ffef1 SHA512 caf3dd068c5ec66b53dedc44642f333e091e8aa745cd2a3218b40cefb6713bfaaa8826a773697e6dc22441ee1238b6bb468168fd4a85ef5d504b45b3d6eacbf9 WHIRLPOOL aa7fe6f702994b84b440b6a267f333ac6e7b814e3fb3404fcb378b63f8d97a6eed32f53fcf4c10d0fa8dbe250cb1f3988468a2e5cc8402b61339db87dc34fd49
+DIST pulseaudio-10.99.1.tar.xz 1635836 SHA256 c9791844569d8d0adb468c183d0d9fb6ac12b9db34a4a078a7773c8bac993f32 SHA512 410758da3cf3431b5810b9a5790d60ed8fe0bba58f621f4ca8e7ba66be8dcdd53cbd8284105ee6694b04f81a37791c3e8c5fe4af3ee034e89dff0b66fdbde006 WHIRLPOOL c8dfe0e4ab54029fdc3b47fb43282406908b7993ee155d6aaa9919419fb4e58a8f1df34bc569a33697a02533979c6ff4002944a20ed96c1246993eb3b97b7eb3
+EBUILD pulseaudio-10.0.ebuild 11018 SHA256 fe6de7d9125875de17f8eec61d475922cfd1fdb586795780d0aed98e02cb06f5 SHA512 afad5f4da75bbebf7537cad4938d2ec12389c0ab71ed55dd46d246987acd8b1418f52181f0fb130817018ce6050e4d8a34da1438093c01811718a7766fb14ea8 WHIRLPOOL 47ebb6864f3ce8b91015dd091605aa6fb9eebc4dda31d1314eaa6ee5e552a88aef9776badbd4e87a1f761e0e5f69af727ea28416eb538dc794ec878f2f7ec0cc
+EBUILD pulseaudio-10.99.1.ebuild 11027 SHA256 cded1326d7cb4593e7a8eeac15198616de4395131415f18239be751aa34c81dc SHA512 e8eb325b7cd8ff6ba3a785f52a1e1279935b0bda3372d6fede83a7406791e4ae7bb27d3310b57a4167567c5ff94b8781036bddeb777ee6cd50de4527f2160d22 WHIRLPOOL 6516a7aa65d6e03a86843db2ec660b3edfc0eb3641c7b979630035e92669167389e91d2e3dd7e9314723c9f69a93ef77979e1a64cea832866e40bf4139a537d8
+MISC metadata.xml 3412 SHA256 cd935d80de811afb228e5ca6d9ec448f8eb1f8f76dfd35751ece76982139f3a4 SHA512 93583cdaa021b818252c01aa575c812fbb594604ed0d8aca395d9d9db36d7ada3e2796047b585917c227a8c2030f3bde13e3ec6af5842829895104dc9cf41a48 WHIRLPOOL 4b73707a368354166090949c6a2a9cc41d20c37407b36582a4567f33e743bdd1ded174330f868b7eb0c4acbe983b1654eab0cae9f0cdf3ab43046d732b823831
diff --git a/media-sound/pulseaudio/files/pulseaudio.conf.d b/media-sound/pulseaudio/files/pulseaudio.conf.d
index 348540b..9e72453 100644
--- a/media-sound/pulseaudio/files/pulseaudio.conf.d
+++ b/media-sound/pulseaudio/files/pulseaudio.conf.d
@@ -1,5 +1,4 @@
# Config file for /etc/init.d/pulseaudio
-# $Id$
# For more see "pulseaudio -h".
diff --git a/media-sound/pulseaudio/files/pulseaudio.init.d-5 b/media-sound/pulseaudio/files/pulseaudio.init.d-5
index 099edd3..d5415d6 100644
--- a/media-sound/pulseaudio/files/pulseaudio.init.d-5
+++ b/media-sound/pulseaudio/files/pulseaudio.init.d-5
@@ -1,7 +1,6 @@
#!/sbin/openrc-run
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
depend() {
need localmount
diff --git a/media-sound/pulseaudio/metadata.xml b/media-sound/pulseaudio/metadata.xml
index 1f547a3..e35348f 100644
--- a/media-sound/pulseaudio/metadata.xml
+++ b/media-sound/pulseaudio/metadata.xml
@@ -42,7 +42,7 @@
script for PulseAudio. Since this support is only supported for
embedded situations, do not enable without reading the upstream
instructions at
- http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/ .
+ https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/ .
</flag>
<flag name="asyncns">Use libasyncns for asynchronous name resolution.</flag>
<flag name="doc">Build the doxygen-described API documentation.</flag>
@@ -67,9 +67,6 @@
greatly in applications that support it by performing acoustic echo
cancellation, analog gain control, noise suppression and other processing.
</flag>
- <flag name="xen">
- Builds a special paravirtualized module for running in a Xen guest.
- </flag>
<flag name="systemd">
Build with <pkg>sys-apps/systemd</pkg> support to replace standalone
ConsoleKit.
diff --git a/media-sound/pulseaudio/pulseaudio-10.0.ebuild b/media-sound/pulseaudio/pulseaudio-10.0.ebuild
index afd9272..fd392bb 100644
--- a/media-sound/pulseaudio/pulseaudio-10.0.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-10.0.ebuild
@@ -1,31 +1,33 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit autotools bash-completion-r1 eutils flag-o-matic gnome2-utils linux-info systemd user versionator udev multilib-minimal
DESCRIPTION="A networked sound server with an advanced plugin system"
-HOMEPAGE="http://www.pulseaudio.org/"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
# libpulse-simple and libpulse link to libpulse-core; this is daemon's
# library and can link to gdbm and other GPL-only libraries. In this
# cases, we have a fully GPL-2 package. Leaving the rest of the
# GPL-forcing USE flags for those who use them.
-LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
+# qpaeq equalizer pyqt GUI frontend is AGPL-3+
+LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 ) equalizer? ( AGPL-3+ )"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
# +alsa-plugin as discussed in bug #519530
IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib
gnome gtk ipv6 jack libsamplerate libressl lirc native-headset neon ofono-headset
+orc oss qt4 realtime selinux sox ssl systemd system-wide tcpd test +udev
-+webrtc-aec +X xen zeroconf"
++webrtc-aec +X zeroconf"
# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
REQUIRED_USE="
bluetooth? ( dbus )
+ equalizer? ( dbus )
ofono-headset? ( bluetooth )
native-headset? ( bluetooth )
udev? ( || ( alsa oss ) )
@@ -73,12 +75,19 @@ RDEPEND="
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:= )
)
- >=media-libs/speex-1.2_rc1
+ || (
+ (
+ >=media-libs/speex-1.2.0
+ media-libs/speexdsp
+ )
+ (
+ <media-libs/speex-1.2.0
+ >=media-libs/speex-1.2_rc1
+ )
+ )
gdbm? ( sys-libs/gdbm )
webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 )
- xen? ( app-emulation/xen-tools )
systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] )
- >=dev-libs/json-c-0.11[${MULTILIB_USEDEP}]
dev-libs/libltdl:0
selinux? ( sec-policy/selinux-pulseaudio )
"
@@ -87,7 +96,7 @@ RDEPEND="
DEPEND="${RDEPEND}
sys-devel/m4
doc? ( app-doc/doxygen )
- test? ( dev-libs/check )
+ test? ( >=dev-libs/check-0.9.10 )
X? (
x11-proto/xproto[${MULTILIB_USEDEP}]
>=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}]
@@ -200,7 +209,6 @@ multilib_src_configure() {
$(use_enable ipv6)
$(use_enable ssl openssl)
$(use_enable webrtc-aec)
- $(use_enable xen)
$(use_with caps)
$(use_with equalizer fftw)
--disable-adrian-aec
@@ -227,7 +235,6 @@ multilib_src_configure() {
--disable-openssl
--disable-orc
--disable-webrtc-aec
- --disable-xen
--without-fftw
--without-soxr
@@ -359,11 +366,4 @@ pkg_postinst() {
elog "The libsamplerate based resamplers are now deprecated, because they offer no"
elog "particular advantage over speex. Upstream suggests disabling them."
fi
-
- # Needed for pulseaudio-6.0 update from older versions
- if use udev; then
- if ! version_is_at_least 6.0 ${REPLACING_VERSIONS}; then
- udevadm control --reload && udevadm trigger
- fi
- fi
}
diff --git a/media-sound/pulseaudio/pulseaudio-10.0.ebuild b/media-sound/pulseaudio/pulseaudio-10.99.1.ebuild
similarity index 94%
copy from media-sound/pulseaudio/pulseaudio-10.0.ebuild
copy to media-sound/pulseaudio/pulseaudio-10.99.1.ebuild
index afd9272..97cd6d6 100644
--- a/media-sound/pulseaudio/pulseaudio-10.0.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-10.99.1.ebuild
@@ -1,31 +1,33 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit autotools bash-completion-r1 eutils flag-o-matic gnome2-utils linux-info systemd user versionator udev multilib-minimal
DESCRIPTION="A networked sound server with an advanced plugin system"
-HOMEPAGE="http://www.pulseaudio.org/"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
# libpulse-simple and libpulse link to libpulse-core; this is daemon's
# library and can link to gdbm and other GPL-only libraries. In this
# cases, we have a fully GPL-2 package. Leaving the rest of the
# GPL-forcing USE flags for those who use them.
-LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
+# qpaeq equalizer pyqt GUI frontend is AGPL-3+
+LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 ) equalizer? ( AGPL-3+ )"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
# +alsa-plugin as discussed in bug #519530
IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib
gnome gtk ipv6 jack libsamplerate libressl lirc native-headset neon ofono-headset
+orc oss qt4 realtime selinux sox ssl systemd system-wide tcpd test +udev
-+webrtc-aec +X xen zeroconf"
++webrtc-aec +X zeroconf"
# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
REQUIRED_USE="
bluetooth? ( dbus )
+ equalizer? ( dbus )
ofono-headset? ( bluetooth )
native-headset? ( bluetooth )
udev? ( || ( alsa oss ) )
@@ -73,12 +75,19 @@ RDEPEND="
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:= )
)
- >=media-libs/speex-1.2_rc1
+ || (
+ (
+ >=media-libs/speex-1.2.0
+ media-libs/speexdsp
+ )
+ (
+ <media-libs/speex-1.2.0
+ >=media-libs/speex-1.2_rc1
+ )
+ )
gdbm? ( sys-libs/gdbm )
webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 )
- xen? ( app-emulation/xen-tools )
systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] )
- >=dev-libs/json-c-0.11[${MULTILIB_USEDEP}]
dev-libs/libltdl:0
selinux? ( sec-policy/selinux-pulseaudio )
"
@@ -87,7 +96,7 @@ RDEPEND="
DEPEND="${RDEPEND}
sys-devel/m4
doc? ( app-doc/doxygen )
- test? ( dev-libs/check )
+ test? ( >=dev-libs/check-0.9.10 )
X? (
x11-proto/xproto[${MULTILIB_USEDEP}]
>=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}]
@@ -200,7 +209,6 @@ multilib_src_configure() {
$(use_enable ipv6)
$(use_enable ssl openssl)
$(use_enable webrtc-aec)
- $(use_enable xen)
$(use_with caps)
$(use_with equalizer fftw)
--disable-adrian-aec
@@ -227,7 +235,6 @@ multilib_src_configure() {
--disable-openssl
--disable-orc
--disable-webrtc-aec
- --disable-xen
--without-fftw
--without-soxr
@@ -359,11 +366,4 @@ pkg_postinst() {
elog "The libsamplerate based resamplers are now deprecated, because they offer no"
elog "particular advantage over speex. Upstream suggests disabling them."
fi
-
- # Needed for pulseaudio-6.0 update from older versions
- if use udev; then
- if ! version_is_at_least 6.0 ${REPLACING_VERSIONS}; then
- udevadm control --reload && udevadm trigger
- fi
- fi
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/musl:master commit in: media-sound/pulseaudio/, media-sound/pulseaudio/files/
@ 2018-06-05 0:21 Jory Pratt
0 siblings, 0 replies; 3+ messages in thread
From: Jory Pratt @ 2018-06-05 0:21 UTC (permalink / raw
To: gentoo-commits
commit: f36379f0f00305d698e6ba41194142fffb1e14fb
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 5 00:20:53 2018 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Tue Jun 5 00:20:53 2018 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=f36379f0
media-sound/pulseaudio: sync with changes in main tree
media-sound/pulseaudio/Manifest | 2 +-
.../pulseaudio-11.1-disable-flat-volumes.patch | 48 +++
.../files/pulseaudio-11.1-glibc-2.27.patch | 59 ++++
.../files/pulseaudio-11.1-qpaeq-pyqt5-1.patch | 198 +++++++++++
.../files/pulseaudio-11.1-qpaeq-pyqt5-2.patch | 31 ++
media-sound/pulseaudio/pulseaudio-11.1-r1.ebuild | 364 +++++++++++++++++++++
6 files changed, 701 insertions(+), 1 deletion(-)
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 24a4d7c..cc69a64 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -1,3 +1,3 @@
DIST pulseaudio-10.0.tar.xz 1608040 SHA256 a3186824de9f0d2095ded5d0d0db0405dc73133983c2fbb37291547e37462f57 SHA512 11d98b4b2000a41bdea92df253409452bc9b77d8bb309b6d14c439e3b902e3f90c69da00daff409e3859a54ad01c63a75be5723616bdcb492801d622a6406481 WHIRLPOOL 6d03d8cf7b96cbb46a8cc5f7810f7cf1c4187aa9321483d5e56435874b218d437bc66860d25a149be59ca73de7118916e05e481758e04619e099cb9a50dcb119
DIST pulseaudio-10.99.1.tar.xz 1635836 SHA256 c9791844569d8d0adb468c183d0d9fb6ac12b9db34a4a078a7773c8bac993f32 SHA512 410758da3cf3431b5810b9a5790d60ed8fe0bba58f621f4ca8e7ba66be8dcdd53cbd8284105ee6694b04f81a37791c3e8c5fe4af3ee034e89dff0b66fdbde006 WHIRLPOOL c8dfe0e4ab54029fdc3b47fb43282406908b7993ee155d6aaa9919419fb4e58a8f1df34bc569a33697a02533979c6ff4002944a20ed96c1246993eb3b97b7eb3
-DIST pulseaudio-11.1.tar.xz 1648924 SHA256 f2521c525a77166189e3cb9169f75c2ee2b82fa3fcf9476024fbc2c3a6c9cd9e SHA512 8863d8d7aede0d9a4d158e84e7bece91747c335f9ac98c7b21fafe76b762f8817e1125307aa46e561e540d2c40525e91f51a55ec34ac55d58fd5980199856a7a WHIRLPOOL 53e6d83853dff5dc4291403506277fc832e60d8e55f555e39e377903856668c2f158a600019719902f30827d707850391aa4cc0bb07664864d87d5fc175c912f
+DIST pulseaudio-11.1.tar.xz 1648924 BLAKE2B eea767efb6529436a6c2aa7d5ccaccdbda2338ad8db639ad333598b1589d259acf71ef34e904a240710f5343864fa868789eaa7f7cae1b07902ebd989fe83e12 SHA512 8863d8d7aede0d9a4d158e84e7bece91747c335f9ac98c7b21fafe76b762f8817e1125307aa46e561e540d2c40525e91f51a55ec34ac55d58fd5980199856a7a
diff --git a/media-sound/pulseaudio/files/pulseaudio-11.1-disable-flat-volumes.patch b/media-sound/pulseaudio/files/pulseaudio-11.1-disable-flat-volumes.patch
new file mode 100644
index 0000000..40b23ec
--- /dev/null
+++ b/media-sound/pulseaudio/files/pulseaudio-11.1-disable-flat-volumes.patch
@@ -0,0 +1,48 @@
+diff -up a/man/pulse-daemon.conf.5.xml.in b/man/pulse-daemon.conf.5.xml.in
+--- a/man/pulse-daemon.conf.5.xml.in 2016-05-26 23:21:17.000000000 -0500
++++ b/man/pulse-daemon.conf.5.xml.in 2016-05-31 10:01:55.679976730 -0500
+@@ -220,7 +220,7 @@ License along with PulseAudio; if not, s
+ <p><opt>flat-volumes=</opt> Enable 'flat' volumes, i.e. where
+ possible let the sink volume equal the maximum of the volumes of
+ the inputs connected to it. Takes a boolean argument, defaults
+- to <opt>yes</opt>.</p>
++ to <opt>no</opt>.</p>
+ </option>
+
+ </section>
+diff -up a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c
+--- a/src/daemon/daemon-conf.c 2016-05-26 23:21:17.000000000 -0500
++++ b/src/daemon/daemon-conf.c 2016-05-31 10:01:55.680976735 -0500
+@@ -68,7 +68,7 @@ static const pa_daemon_conf default_conf
+ .realtime_priority = 5, /* Half of JACK's default rtprio */
+ .disallow_module_loading = false,
+ .disallow_exit = false,
+- .flat_volumes = true,
++ .flat_volumes = false,
+ .exit_idle_time = 20,
+ .scache_idle_time = 20,
+ .script_commands = NULL,
+diff -up a/src/daemon/daemon.conf.in b/src/daemon/daemon.conf.in
+--- a/src/daemon/daemon.conf.in 2016-05-31 10:01:55.680976735 -0500
++++ b/src/daemon/daemon.conf.in 2016-05-31 10:02:28.048133267 -0500
+@@ -57,7 +57,7 @@ ifelse(@HAVE_DBUS@, 1, [dnl
+ ; enable-lfe-remixing = no
+ ; lfe-crossover-freq = 0
+
+-; flat-volumes = yes
++; flat-volumes = no
+
+ ifelse(@HAVE_SYS_RESOURCE_H@, 1, [dnl
+ ; rlimit-fsize = -1
+diff -up a/src/pulsecore/core.c b/src/pulsecore/core.c
+--- a/src/pulsecore/core.c 2016-05-26 23:21:17.000000000 -0500
++++ b/src/pulsecore/core.c 2016-05-31 10:01:55.681976740 -0500
+@@ -135,7 +135,7 @@ pa_core* pa_core_new(pa_mainloop_api *m,
+ c->exit_idle_time = -1;
+ c->scache_idle_time = 20;
+
+- c->flat_volumes = true;
++ c->flat_volumes = false;
+ c->disallow_module_loading = false;
+ c->disallow_exit = false;
+ c->running_as_daemon = false;
diff --git a/media-sound/pulseaudio/files/pulseaudio-11.1-glibc-2.27.patch b/media-sound/pulseaudio/files/pulseaudio-11.1-glibc-2.27.patch
new file mode 100644
index 0000000..a89167b
--- /dev/null
+++ b/media-sound/pulseaudio/files/pulseaudio-11.1-glibc-2.27.patch
@@ -0,0 +1,59 @@
+From: Tanu Kaskinen <tanuk@iki.fi>
+Date: Wed, 24 Jan 2018 03:51:49 +0200
+Subject: memfd-wrappers: only define memfd_create() if not already defined
+
+glibc 2.27 is to be released soon, and it will provide memfd_create().
+If glibc provides the function, we must not define it ourselves,
+otherwise building fails due to conflict between the two implementations
+of the same function.
+
+BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=104733
+(cherry picked from commit dfb0460fb4743aec047cdf755a660a9ac2d0f3fb)
+---
+ configure.ac | 3 +++
+ src/pulsecore/memfd-wrappers.h | 7 ++++---
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 77b5ff5..3a71fd8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -607,6 +607,9 @@ AS_IF([test "x$enable_memfd" = "xyes" && test "x$HAVE_MEMFD" = "x0"],
+ [AC_MSG_ERROR([*** Your Linux kernel does not support memfd shared memory.
+ *** Use linux v3.17 or higher for such a feature.])])
+
++AS_IF([test "x$HAVE_MEMFD" = "x1"],
++ AC_CHECK_FUNCS([memfd_create]))
++
+ AC_SUBST(HAVE_MEMFD)
+ AM_CONDITIONAL([HAVE_MEMFD], [test "x$HAVE_MEMFD" = x1])
+ AS_IF([test "x$HAVE_MEMFD" = "x1"], AC_DEFINE([HAVE_MEMFD], 1, [Have memfd shared memory.]))
+diff --git a/src/pulsecore/memfd-wrappers.h b/src/pulsecore/memfd-wrappers.h
+index 3bed9b2..c7aadfd 100644
+--- a/src/pulsecore/memfd-wrappers.h
++++ b/src/pulsecore/memfd-wrappers.h
+@@ -20,13 +20,14 @@
+ License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
+ ***/
+
+-#ifdef HAVE_MEMFD
++#if defined(HAVE_MEMFD) && !defined(HAVE_MEMFD_CREATE)
+
+ #include <sys/syscall.h>
+ #include <fcntl.h>
+
+ /*
+- * No glibc wrappers exist for memfd_create(2), so provide our own.
++ * Before glibc version 2.27 there was no wrapper for memfd_create(2),
++ * so we have to provide our own.
+ *
+ * Also define memfd fcntl sealing macros. While they are already
+ * defined in the kernel header file <linux/fcntl.h>, that file as
+@@ -63,6 +64,6 @@ static inline int memfd_create(const char *name, unsigned int flags) {
+ #define F_SEAL_WRITE 0x0008 /* prevent writes */
+ #endif
+
+-#endif /* HAVE_MEMFD */
++#endif /* HAVE_MEMFD && !HAVE_MEMFD_CREATE */
+
+ #endif
diff --git a/media-sound/pulseaudio/files/pulseaudio-11.1-qpaeq-pyqt5-1.patch b/media-sound/pulseaudio/files/pulseaudio-11.1-qpaeq-pyqt5-1.patch
new file mode 100644
index 0000000..62012c1
--- /dev/null
+++ b/media-sound/pulseaudio/files/pulseaudio-11.1-qpaeq-pyqt5-1.patch
@@ -0,0 +1,198 @@
+From: =?utf-8?q?Andrius_=C5=A0tikonas?= <andrius@stikonas.eu>
+Date: Mon, 20 Nov 2017 19:56:53 +0000
+Subject: qpaeq: port to PyQt5
+
+(cherry picked from commit 480e0e74f43565d7ece72141666961ae8cc2ed75)
+---
+ src/utils/qpaeq | 68 ++++++++++++++++++++++++++++-----------------------------
+ 1 file changed, 34 insertions(+), 34 deletions(-)
+
+diff --git a/src/utils/qpaeq b/src/utils/qpaeq
+index ac4b9e4..508b233 100755
+--- a/src/utils/qpaeq
++++ b/src/utils/qpaeq
+@@ -18,13 +18,13 @@
+
+ import os,math,sys
+ try:
+- import PyQt4,sip
+- from PyQt4 import QtGui,QtCore
++ import PyQt5,sip
++ from PyQt5 import QtWidgets,QtCore
+ import dbus.mainloop.qt
+ import dbus
+ except ImportError as e:
+ sys.stderr.write('There was an error importing needed libraries\n'
+- 'Make sure you have qt4 and dbus-python installed\n'
++ 'Make sure you have qt5 and dbus-python installed\n'
+ 'The error that occured was:\n'
+ '\t%s\n' % (str(e)))
+ sys.exit(-1)
+@@ -62,7 +62,7 @@ def connect():
+ prop_iface='org.freedesktop.DBus.Properties'
+ eq_iface='org.PulseAudio.Ext.Equalizing1.Equalizer'
+ device_iface='org.PulseAudio.Core1.Device'
+-class QPaeq(QtGui.QWidget):
++class QPaeq(QtWidgets.QWidget):
+ manager_path='/org/pulseaudio/equalizing1'
+ manager_iface='org.PulseAudio.Ext.Equalizing1.Manager'
+ core_iface='org.PulseAudio.Core1'
+@@ -70,7 +70,7 @@ class QPaeq(QtGui.QWidget):
+ module_name='module-equalizer-sink'
+
+ def __init__(self):
+- QtGui.QWidget.__init__(self)
++ QtWidgets.QWidget.__init__(self)
+ self.setWindowTitle('qpaeq')
+ self.slider_widget=None
+ self.sink_name=None
+@@ -84,50 +84,50 @@ class QPaeq(QtGui.QWidget):
+ self.setMinimumSize(self.sizeHint())
+
+ def create_layout(self):
+- self.main_layout=QtGui.QVBoxLayout()
++ self.main_layout=QtWidgets.QVBoxLayout()
+ self.setLayout(self.main_layout)
+- toprow_layout=QtGui.QHBoxLayout()
+- sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed)
++ toprow_layout=QtWidgets.QHBoxLayout()
++ sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+ sizePolicy.setHorizontalStretch(0)
+ sizePolicy.setVerticalStretch(0)
+ #sizePolicy.setHeightForWidth(self.profile_box.sizePolicy().hasHeightForWidth())
+
+- toprow_layout.addWidget(QtGui.QLabel('Sink'))
+- self.sink_box = QtGui.QComboBox()
++ toprow_layout.addWidget(QtWidgets.QLabel('Sink'))
++ self.sink_box = QtWidgets.QComboBox()
+ self.sink_box.setSizePolicy(sizePolicy)
+ self.sink_box.setDuplicatesEnabled(False)
+- self.sink_box.setInsertPolicy(QtGui.QComboBox.InsertAlphabetically)
+- #self.sink_box.setSizeAdjustPolicy(QtGui.QComboBox.AdjustToContents)
++ self.sink_box.setInsertPolicy(QtWidgets.QComboBox.InsertAlphabetically)
++ #self.sink_box.setSizeAdjustPolicy(QtWidgets.QComboBox.AdjustToContents)
+ toprow_layout.addWidget(self.sink_box)
+
+- toprow_layout.addWidget(QtGui.QLabel('Channel'))
+- self.channel_box = QtGui.QComboBox()
++ toprow_layout.addWidget(QtWidgets.QLabel('Channel'))
++ self.channel_box = QtWidgets.QComboBox()
+ self.channel_box.setSizePolicy(sizePolicy)
+ toprow_layout.addWidget(self.channel_box)
+
+- toprow_layout.addWidget(QtGui.QLabel('Preset'))
+- self.profile_box = QtGui.QComboBox()
++ toprow_layout.addWidget(QtWidgets.QLabel('Preset'))
++ self.profile_box = QtWidgets.QComboBox()
+ self.profile_box.setSizePolicy(sizePolicy)
+- self.profile_box.setInsertPolicy(QtGui.QComboBox.InsertAlphabetically)
+- #self.profile_box.setSizeAdjustPolicy(QtGui.QComboBox.AdjustToContents)
++ self.profile_box.setInsertPolicy(QtWidgets.QComboBox.InsertAlphabetically)
++ #self.profile_box.setSizeAdjustPolicy(QtWidgets.QComboBox.AdjustToContents)
+ toprow_layout.addWidget(self.profile_box)
+
+- large_icon_size=self.style().pixelMetric(QtGui.QStyle.PM_LargeIconSize)
++ large_icon_size=self.style().pixelMetric(QtWidgets.QStyle.PM_LargeIconSize)
+ large_icon_size=QtCore.QSize(large_icon_size,large_icon_size)
+- save_profile=QtGui.QToolButton()
+- save_profile.setIcon(self.style().standardIcon(QtGui.QStyle.SP_DriveFDIcon))
++ save_profile=QtWidgets.QToolButton()
++ save_profile.setIcon(self.style().standardIcon(QtWidgets.QStyle.SP_DriveFDIcon))
+ save_profile.setIconSize(large_icon_size)
+ save_profile.setToolButtonStyle(QtCore.Qt.ToolButtonIconOnly)
+ save_profile.clicked.connect(self.save_profile)
+- remove_profile=QtGui.QToolButton()
+- remove_profile.setIcon(self.style().standardIcon(QtGui.QStyle.SP_TrashIcon))
++ remove_profile=QtWidgets.QToolButton()
++ remove_profile.setIcon(self.style().standardIcon(QtWidgets.QStyle.SP_TrashIcon))
+ remove_profile.setIconSize(large_icon_size)
+ remove_profile.setToolButtonStyle(QtCore.Qt.ToolButtonIconOnly)
+ remove_profile.clicked.connect(self.remove_profile)
+ toprow_layout.addWidget(save_profile)
+ toprow_layout.addWidget(remove_profile)
+
+- reset_button = QtGui.QPushButton('Reset')
++ reset_button = QtWidgets.QPushButton('Reset')
+ reset_button.clicked.connect(self.reset)
+ toprow_layout.addStretch()
+ toprow_layout.addWidget(reset_button)
+@@ -192,11 +192,11 @@ class QPaeq(QtGui.QWidget):
+ def save_profile(self):
+ #popup dialog box for name
+ current=self.profile_box.currentIndex()
+- profile,ok=QtGui.QInputDialog.getItem(self,'Preset Name','Preset',self.profiles,current)
++ profile,ok=QtWidgets.QInputDialog.getItem(self,'Preset Name','Preset',self.profiles,current)
+ if not ok or profile=='':
+ return
+ if profile in self.profiles:
+- mbox=QtGui.QMessageBox(self)
++ mbox=QtWidgets.QMessageBox(self)
+ mbox.setText('%s preset already exists'%(profile,))
+ mbox.setInformativeText('Do you want to save over it?')
+ mbox.setStandardButtons(mbox.Save|mbox.Discard|mbox.Cancel)
+@@ -217,7 +217,7 @@ class QPaeq(QtGui.QWidget):
+ profile=self.profile_box.itemText(x)
+ self.filter_state.load_profile(profile)
+ def select_channel(self,x):
+- self.filter_state.channel = self.channel_box.itemData(x).toPyObject()
++ self.filter_state.channel = self.channel_box.itemData(x)
+ self._set_profile_name()
+ self.filter_state.readback()
+
+@@ -295,13 +295,13 @@ class QPaeq(QtGui.QWidget):
+ self.profile_box.blockSignals(False)
+
+
+-class SliderArray(QtGui.QWidget):
++class SliderArray(QtWidgets.QWidget):
+ def __init__(self,filter_state,parent=None):
+ super(SliderArray,self).__init__(parent)
+ #self.setStyleSheet('padding: 0px; border-width: 0px; margin: 0px;')
+ #self.setStyleSheet('font-family: monospace;'+outline%('blue'))
+ self.filter_state=filter_state
+- self.setLayout(QtGui.QHBoxLayout())
++ self.setLayout(QtWidgets.QHBoxLayout())
+ self.sub_array=None
+ self.set_sub_array(SliderArraySub(self.filter_state))
+ self.inhibit_resize=0
+@@ -359,11 +359,11 @@ class SliderArray(QtGui.QWidget):
+ self.set_sub_array(SliderArraySub(self.filter_state))
+ self.inhibit_resize-=1
+
+-class SliderArraySub(QtGui.QWidget):
++class SliderArraySub(QtWidgets.QWidget):
+ def __init__(self,filter_state,parent=None):
+ super(SliderArraySub,self).__init__(parent)
+ self.filter_state=filter_state
+- self.setLayout(QtGui.QGridLayout())
++ self.setLayout(QtWidgets.QGridLayout())
+ self.slider=[None]*len(self.filter_state.frequencies)
+ self.label=[None]*len(self.slider)
+ #self.setStyleSheet('padding: 0px; border-width: 0px; margin: 0px;')
+@@ -375,7 +375,7 @@ class SliderArraySub(QtGui.QWidget):
+ self.layout().addWidget(label,1,c,qt.AlignHCenter)
+ self.layout().setColumnMinimumWidth(c,max(label.sizeHint().width(),slider.sizeHint().width()))
+ def create_slider(slider_label):
+- slider=QtGui.QSlider(QtCore.Qt.Vertical,self)
++ slider=QtWidgets.QSlider(QtCore.Qt.Vertical,self)
+ label=SliderLabel(slider_label,filter_state,self)
+ slider.setRange(-1000,2000)
+ slider.setSingleStep(1)
+@@ -461,7 +461,7 @@ class SliderArraySub(QtGui.QWidget):
+ return int((x-1.0)*1000)
+ outline='border-width: 1px; border-style: solid; border-color: %s;'
+
+-class SliderLabel(QtGui.QLabel):
++class SliderLabel(QtWidgets.QLabel):
+ clicked=QtCore.pyqtSignal()
+ def __init__(self,label_text,filter_state,parent=None):
+ super(SliderLabel,self).__init__(parent)
+@@ -566,7 +566,7 @@ def subdivide(xs, t_points):
+
+ def main():
+ dbus.mainloop.qt.DBusQtMainLoop(set_as_default=True)
+- app=QtGui.QApplication(sys.argv)
++ app=QtWidgets.QApplication(sys.argv)
+ qpaeq_main=QPaeq()
+ qpaeq_main.show()
+ sys.exit(app.exec_())
diff --git a/media-sound/pulseaudio/files/pulseaudio-11.1-qpaeq-pyqt5-2.patch b/media-sound/pulseaudio/files/pulseaudio-11.1-qpaeq-pyqt5-2.patch
new file mode 100644
index 0000000..7706bfb
--- /dev/null
+++ b/media-sound/pulseaudio/files/pulseaudio-11.1-qpaeq-pyqt5-2.patch
@@ -0,0 +1,31 @@
+From: Felipe Sateler <fsateler@debian.org>
+Date: Thu, 5 Apr 2018 15:44:26 -0300
+Subject: Use the pyqt5 dbus mainloop integration
+
+Forwarded: https://bugs.freedesktop.org/show_bug.cgi?id=102572
+---
+ src/utils/qpaeq | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/utils/qpaeq b/src/utils/qpaeq
+index 508b233..a319dad 100755
+--- a/src/utils/qpaeq
++++ b/src/utils/qpaeq
+@@ -20,7 +20,7 @@ import os,math,sys
+ try:
+ import PyQt5,sip
+ from PyQt5 import QtWidgets,QtCore
+- import dbus.mainloop.qt
++ import dbus.mainloop.pyqt5
+ import dbus
+ except ImportError as e:
+ sys.stderr.write('There was an error importing needed libraries\n'
+@@ -565,7 +565,7 @@ def subdivide(xs, t_points):
+ return left+right
+
+ def main():
+- dbus.mainloop.qt.DBusQtMainLoop(set_as_default=True)
++ dbus.mainloop.pyqt5.DBusQtMainLoop(set_as_default=True)
+ app=QtWidgets.QApplication(sys.argv)
+ qpaeq_main=QPaeq()
+ qpaeq_main.show()
diff --git a/media-sound/pulseaudio/pulseaudio-11.1-r1.ebuild b/media-sound/pulseaudio/pulseaudio-11.1-r1.ebuild
new file mode 100644
index 0000000..cc82065
--- /dev/null
+++ b/media-sound/pulseaudio/pulseaudio-11.1-r1.ebuild
@@ -0,0 +1,364 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools bash-completion-r1 eutils flag-o-matic gnome2-utils linux-info systemd user versionator udev multilib-minimal
+
+DESCRIPTION="A networked sound server with an advanced plugin system"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
+SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
+
+# libpulse-simple and libpulse link to libpulse-core; this is daemon's
+# library and can link to gdbm and other GPL-only libraries. In this
+# cases, we have a fully GPL-2 package. Leaving the rest of the
+# GPL-forcing USE flags for those who use them.
+# qpaeq equalizer pyqt GUI frontend is AGPL-3+
+LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 ) equalizer? ( AGPL-3+ )"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+
+# +alsa-plugin as discussed in bug #519530
+IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib
+gnome gtk ipv6 jack libsamplerate libressl lirc native-headset neon ofono-headset
++orc oss qt5 realtime selinux sox ssl systemd system-wide tcpd test +udev
++webrtc-aec +X zeroconf"
+
+# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
+REQUIRED_USE="
+ bluetooth? ( dbus )
+ equalizer? ( dbus )
+ ofono-headset? ( bluetooth )
+ native-headset? ( bluetooth )
+ udev? ( || ( alsa oss ) )
+"
+
+# libpcre needed in some cases, bug #472228
+RDEPEND="
+ || (
+ elibc_glibc? ( virtual/libc )
+ elibc_uclibc? ( virtual/libc )
+ dev-libs/libpcre
+ )
+ >=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}]
+ X? (
+ >=x11-libs/libX11-1.4.0[${MULTILIB_USEDEP}]
+ >=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
+ x11-libs/libSM[${MULTILIB_USEDEP}]
+ x11-libs/libICE[${MULTILIB_USEDEP}]
+ x11-libs/libXtst[${MULTILIB_USEDEP}]
+ )
+ caps? ( >=sys-libs/libcap-2.22-r2[${MULTILIB_USEDEP}] )
+ libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 )
+ alsa? ( >=media-libs/alsa-lib-1.0.19 )
+ glib? ( >=dev-libs/glib-2.4.0:2[${MULTILIB_USEDEP}] )
+ zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
+ jack? ( virtual/jack )
+ tcpd? ( sys-apps/tcp-wrappers[${MULTILIB_USEDEP}] )
+ lirc? ( app-misc/lirc )
+ dbus? ( >=sys-apps/dbus-1.0.0[${MULTILIB_USEDEP}] )
+ gtk? ( x11-libs/gtk+:3 )
+ gnome? ( >=gnome-base/gconf-2.4.0 )
+ bluetooth? (
+ >=net-wireless/bluez-5
+ >=sys-apps/dbus-1.0.0
+ media-libs/sbc
+ )
+ asyncns? ( net-libs/libasyncns[${MULTILIB_USEDEP}] )
+ udev? ( >=virtual/udev-143[hwdb(+)] )
+ realtime? ( sys-auth/rtkit )
+ equalizer? ( sci-libs/fftw:3.0 )
+ ofono-headset? ( >=net-misc/ofono-1.13 )
+ orc? ( >=dev-lang/orc-0.4.15 )
+ sox? ( >=media-libs/soxr-0.1.1 )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
+ )
+ media-libs/speexdsp
+ gdbm? ( sys-libs/gdbm:= )
+ webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 )
+ systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] )
+ dev-libs/libltdl:0
+ selinux? ( sec-policy/selinux-pulseaudio )
+"
+# it's a valid RDEPEND, libltdl.so is used for native abi
+
+DEPEND="${RDEPEND}
+ sys-devel/m4
+ doc? ( app-doc/doxygen )
+ test? ( >=dev-libs/check-0.9.10 )
+ X? (
+ x11-base/xorg-proto
+ >=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}]
+ )
+ dev-libs/libatomic_ops
+ virtual/pkgconfig
+ system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) )
+ dev-util/intltool
+ >=sys-devel/gettext-0.18.1
+"
+# This is a PDEPEND to avoid a circular dep
+PDEPEND="
+ alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}] ) )
+"
+
+# alsa-utils dep is for the alsasound init.d script (see bug #155707)
+# bluez dep is for the bluetooth init.d script
+# PyQt5 dep is for the qpaeq script
+RDEPEND="${RDEPEND}
+ equalizer? ( qt5? ( dev-python/PyQt5[dbus,widgets] ) )
+ system-wide? (
+ alsa? ( media-sound/alsa-utils )
+ bluetooth? ( >=net-wireless/bluez-5 )
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}"-qpaeq-pyqt5-{1,2}.patch
+ "${FILESDIR}/${P}"-glibc-2.27.patch
+ "${FILESDIR}/${P}"-disable-flat-volumes.patch # bug 627894
+ "${FILESDIR}/${PN}-9.0-musl-padsp.patch"
+)
+
+pkg_pretend() {
+ CONFIG_CHECK="~HIGH_RES_TIMERS"
+ WARNING_HIGH_RES_TIMERS="CONFIG_HIGH_RES_TIMERS:\tis not set (required for enabling timer-based scheduling in pulseaudio)\n"
+ check_extra_config
+
+ if linux_config_exists; then
+ local snd_hda_prealloc_size=$(linux_chkconfig_string SND_HDA_PREALLOC_SIZE)
+ if [ -n "${snd_hda_prealloc_size}" ] && [ "${snd_hda_prealloc_size}" -lt 2048 ]; then
+ ewarn "A preallocated buffer-size of 2048 (kB) or higher is recommended for the HD-audio driver!"
+ ewarn "CONFIG_SND_HDA_PREALLOC_SIZE=${snd_hda_prealloc_size}"
+ fi
+ fi
+}
+
+pkg_setup() {
+ linux-info_pkg_setup
+ gnome2_environment_reset #543364
+
+ enewgroup audio 18 # Just make sure it exists
+
+ if use system-wide; then
+ enewgroup pulse-access
+ enewgroup pulse
+ enewuser pulse -1 -1 /var/run/pulse pulse,audio
+ fi
+}
+
+src_prepare() {
+ default
+
+ # Skip test that cannot work with sandbox, bug #501846
+ sed -i -e '/lock-autospawn-test/d' src/Makefile.am || die
+
+ eautoreconf
+}
+
+multilib_src_configure() {
+ local myconf=()
+
+ if use gdbm; then
+ myconf+=( --with-database=gdbm )
+ else
+ myconf+=( --with-database=simple )
+ fi
+
+ if use bluetooth; then
+ if multilib_is_native_abi; then
+ myconf+=( --enable-bluez5 --disable-bluez4
+ $(use_enable native-headset bluez5-native-headset)
+ $(use_enable ofono-headset bluez5-ofono-headset) )
+ fi
+ else
+ myconf+=( --disable-bluez5 --disable-bluez4 )
+ fi
+
+ myconf+=(
+ --enable-largefile
+ $(use_enable glib glib2)
+ --disable-solaris
+ $(use_enable asyncns)
+ $(use_enable oss oss-output)
+ $(use_enable alsa)
+ $(use_enable lirc)
+ $(use_enable neon neon-opt)
+ $(use_enable tcpd tcpwrap)
+ $(use_enable jack)
+ $(use_enable zeroconf avahi)
+ $(use_enable dbus)
+ $(use_enable gnome gconf)
+ $(use_enable gtk gtk3)
+ $(use_enable libsamplerate samplerate)
+ $(use_enable orc)
+ $(use_enable X x11)
+ $(use_enable test default-build-tests)
+ $(use_enable udev)
+ $(use_with sox soxr)
+ $(use_enable systemd systemd-daemon)
+ $(use_enable systemd systemd-login)
+ $(use_enable systemd systemd-journal)
+ $(use_enable ipv6)
+ $(use_enable ssl openssl)
+ $(use_enable webrtc-aec)
+ $(use_with caps)
+ $(use_with equalizer fftw)
+ --disable-adrian-aec
+ --disable-esound
+ --localstatedir="${EPREFIX}"/var
+ --with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
+ --with-systemduserunitdir=$(systemd_get_userunitdir)
+ )
+
+ if ! multilib_is_native_abi; then
+ # disable all the modules and stuff
+ myconf+=(
+ --disable-oss-output
+ --disable-alsa
+ --disable-lirc
+ --disable-jack
+ --disable-avahi
+ --disable-gconf
+ --disable-gtk3
+ --disable-samplerate
+ --disable-bluez4
+ --disable-bluez5
+ --disable-udev
+ --disable-openssl
+ --disable-orc
+ --disable-webrtc-aec
+ --without-fftw
+ --without-soxr
+
+ # tests involve random modules, so just do them for the native
+ --disable-default-build-tests
+
+ # hack around unnecessary checks
+ # (results don't matter, we're not building anything using it)
+ ac_cv_lib_ltdl_lt_dladvise_init=yes
+ --with-database=simple
+ LIBSPEEX_CFLAGS=' '
+ LIBSPEEX_LIBS=' '
+ )
+ fi
+
+ ECONF_SOURCE=${S} \
+ econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+ if multilib_is_native_abi; then
+ emake
+ use doc && emake doxygen
+ else
+ local targets=( libpulse.la libpulsedsp.la libpulse-simple.la )
+ use glib && targets+=( libpulse-mainloop-glib.la )
+ emake -C src ${targets[*]}
+ fi
+}
+
+multilib_src_test() {
+ # We avoid running the toplevel check target because that will run
+ # po/'s tests too, and they are broken. Officially, it should work
+ # with intltool 0.41, but that doesn't look like a stable release.
+ if multilib_is_native_abi; then
+ emake -C src check
+ fi
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ emake -j1 DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" install
+ use doc && dohtml -r doxygen/html/
+ else
+ local targets=( libpulse.la libpulse-simple.la )
+ use glib && targets+=( libpulse-mainloop-glib.la )
+ emake DESTDIR="${D}" install-pkgconfigDATA
+ emake DESTDIR="${D}" -C src \
+ install-libLTLIBRARIES \
+ install-padsplibLTLIBRARIES \
+ lib_LTLIBRARIES="${targets[*]}" \
+ install-pulseincludeHEADERS
+ fi
+}
+
+multilib_src_install_all() {
+ # Drop the script entirely if X is disabled
+ use X || rm "${ED}"/usr/bin/start-pulseaudio-x11
+
+ if use system-wide; then
+ newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio
+
+ use_define() {
+ local define=${2:-$(echo $1 | tr '[:lower:]' '[:upper:]')}
+
+ use "$1" && echo "-D$define" || echo "-U$define"
+ }
+
+ unifdef $(use_define zeroconf AVAHI) \
+ $(use_define alsa) \
+ $(use_define bluetooth) \
+ $(use_define udev) \
+ "${FILESDIR}/pulseaudio.init.d-5" \
+ > "${T}/pulseaudio"
+
+ doinitd "${T}/pulseaudio"
+
+ systemd_dounit "${FILESDIR}/${PN}.service"
+ fi
+
+ use zeroconf && sed -i -e '/module-zeroconf-publish/s:^#::' "${ED}/etc/pulse/default.pa"
+
+ dodoc NEWS README todo
+
+ # Create the state directory
+ use prefix || diropts -o pulse -g pulse -m0755
+
+ # We need /var/run/pulse, bug #442852
+ use system-wide && systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
+
+ # Prevent warnings when system-wide is not used, bug #447694
+ use system-wide || rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf
+
+ prune_libtool_files --all
+}
+
+pkg_postinst() {
+ if use system-wide; then
+ elog "You have enabled the 'system-wide' USE flag for pulseaudio."
+ elog "This mode should only be used on headless servers, embedded systems,"
+ elog "or thin clients. It will usually require manual configuration, and is"
+ elog "incompatible with many expected pulseaudio features."
+ elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED."
+ elog "For more information, see"
+ elog " https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
+ elog " https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"
+ elog " https://wiki.gentoo.org/wiki/PulseAudio#Headless_server"
+ if use gnome ; then
+ elog
+ elog "By enabling gnome USE flag, you enabled gconf support. Please note"
+ elog "that you might need to remove the gnome USE flag or disable the"
+ elog "gconf module on /etc/pulse/system.pa to be able to use PulseAudio"
+ elog "with a system-wide instance."
+ fi
+ fi
+
+ if use equalizer && ! use qt5; then
+ elog "You've enabled the 'equalizer' USE-flag but not the 'qt5' USE-flag."
+ elog "This will build the equalizer module, but the 'qpaeq' tool"
+ elog "which is required to set equalizer levels will not work."
+ fi
+
+ if use native-headset && use ofono-headset; then
+ elog "You have enabled both native and ofono headset profiles. The runtime decision"
+ elog "which to use is done via the 'headset' argument of module-bluetooth-discover."
+ fi
+
+ if use libsamplerate; then
+ elog "The libsamplerate based resamplers are now deprecated, because they offer no"
+ elog "particular advantage over speex. Upstream suggests disabling them."
+ fi
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-06-05 0:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-05 0:21 [gentoo-commits] proj/musl:master commit in: media-sound/pulseaudio/, media-sound/pulseaudio/files/ Jory Pratt
-- strict thread matches above, loose matches on Subject: below --
2017-09-04 17:02 Aric Belsito
2017-01-29 11:16 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox