* [gentoo-commits] repo/gentoo:master commit in: media-sound/pulseaudio/, media-sound/pulseaudio/files/
@ 2018-06-02 17:09 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2018-06-02 17:09 UTC (permalink / raw
To: gentoo-commits
commit: 2f89fbb0b4966952ac0f89717c915f1b4b94c0e2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May 28 22:14:21 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 2 17:06:36 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f89fbb0
media-sound/pulseaudio: Port to Qt5
Bug: https://bugs.gentoo.org/656704
Package-Manager: Portage-2.3.40, Repoman-2.3.9
.../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 | 360 +++++++++++++++++++++
3 files changed, 589 insertions(+)
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 00000000000..62012c12147
--- /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 00000000000..7706bfb3416
--- /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 00000000000..f9aee0517a3
--- /dev/null
+++ b/media-sound/pulseaudio/pulseaudio-11.1-r1.ebuild
@@ -0,0 +1,360 @@
+# 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/speex-1.2.0
+ 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 )
+
+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] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/pulseaudio/, media-sound/pulseaudio/files/
@ 2018-12-28 7:48 Mart Raudsepp
0 siblings, 0 replies; 7+ messages in thread
From: Mart Raudsepp @ 2018-12-28 7:48 UTC (permalink / raw
To: gentoo-commits
commit: 0dbf02ad82b088f6f71bb8d3dfbeedbf9d0ab85c
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 28 07:47:23 2018 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Fri Dec 28 07:48:28 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dbf02ad
media-sound/pulseaudio: remove old
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
Package-Manager: Portage-2.3.52, Repoman-2.3.11
media-sound/pulseaudio/Manifest | 1 -
.../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/metadata.xml | 14 +-
media-sound/pulseaudio/pulseaudio-11.1-r1.ebuild | 363 ---------------------
6 files changed, 2 insertions(+), 664 deletions(-)
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 2dcd18e020a..51ef3ffb093 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -1,2 +1 @@
-DIST pulseaudio-11.1.tar.xz 1648924 BLAKE2B eea767efb6529436a6c2aa7d5ccaccdbda2338ad8db639ad333598b1589d259acf71ef34e904a240710f5343864fa868789eaa7f7cae1b07902ebd989fe83e12 SHA512 8863d8d7aede0d9a4d158e84e7bece91747c335f9ac98c7b21fafe76b762f8817e1125307aa46e561e540d2c40525e91f51a55ec34ac55d58fd5980199856a7a
DIST pulseaudio-12.2.tar.xz 1665092 BLAKE2B 2e36efc5142c1e379cc2b135f4126f03a31831b26efe60f7cdf128af6e23fab25706a5609644d0b387530021055f87525fe60d527cd3a087f51bfd58e810644f SHA512 877754c1838b3cb042dbc18a5f1cc3cf313ffcaee7a64703330406d1f86279c34f1107634ac3083b158365e6757fbacf5ec406bc3c5788d291de67b77a561a4e
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
deleted file mode 100644
index a89167b603d..00000000000
--- a/media-sound/pulseaudio/files/pulseaudio-11.1-glibc-2.27.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-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
deleted file mode 100644
index 62012c12147..00000000000
--- a/media-sound/pulseaudio/files/pulseaudio-11.1-qpaeq-pyqt5-1.patch
+++ /dev/null
@@ -1,198 +0,0 @@
-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
deleted file mode 100644
index 7706bfb3416..00000000000
--- a/media-sound/pulseaudio/files/pulseaudio-11.1-qpaeq-pyqt5-2.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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/metadata.xml b/media-sound/pulseaudio/metadata.xml
index 25a2d372c61..a0d16e0c781 100644
--- a/media-sound/pulseaudio/metadata.xml
+++ b/media-sound/pulseaudio/metadata.xml
@@ -21,28 +21,18 @@
Ensure <pkg>gnome-base/gconf</pkg> is present for pulseaudio GConf
to GSettings module automatic migration (keeping the user configuration)
</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" restrict="<media-sound/pulseaudio-12.0">
- 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="glib" restrict=">=media-sound/pulseaudio-12.0">
+ <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. Build the GSettings PA module.
</flag>
- <flag name="system-wide" restrict=">=media-sound/pulseaudio-0.9.21.1">
+ <flag name="system-wide">
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
diff --git a/media-sound/pulseaudio/pulseaudio-11.1-r1.ebuild b/media-sound/pulseaudio/pulseaudio-11.1-r1.ebuild
deleted file mode 100644
index 760c88ca121..00000000000
--- a/media-sound/pulseaudio/pulseaudio-11.1-r1.ebuild
+++ /dev/null
@@ -1,363 +0,0 @@
-# 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
-)
-
-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] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/pulseaudio/, media-sound/pulseaudio/files/
@ 2019-06-30 11:23 Pacho Ramos
0 siblings, 0 replies; 7+ messages in thread
From: Pacho Ramos @ 2019-06-30 11:23 UTC (permalink / raw
To: gentoo-commits
commit: a4f08a1601d56e585c3c724d68b80e1614f9c49e
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 30 11:20:56 2019 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Jun 30 11:22:50 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4f08a16
media-sound/pulseaudio: Fix relogin issues and alsa-lib compat
Closes: https://bugs.gentoo.org/686206
Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
| 130 ++++++++
| 45 +++
.../files/pulseaudio-12.2-exit-time-session.patch | 181 ++++++++++
media-sound/pulseaudio/pulseaudio-12.2-r2.ebuild | 366 +++++++++++++++++++++
4 files changed, 722 insertions(+)
--git a/media-sound/pulseaudio/files/pulseaudio-12.2-alsa-header-path.patch b/media-sound/pulseaudio/files/pulseaudio-12.2-alsa-header-path.patch
new file mode 100644
index 00000000000..334af3ee755
--- /dev/null
+++ b/media-sound/pulseaudio/files/pulseaudio-12.2-alsa-header-path.patch
@@ -0,0 +1,130 @@
+From 993d3fd89e5611997f1e165bf03edefb0204b0a4 Mon Sep 17 00:00:00 2001
+From: Olaf Hering <olaf@aepfle.de>
+Date: Wed, 27 Mar 2019 09:35:05 +0100
+Subject: [PATCH 287/375] alsa: Use correct header path
+
+Consumers are expected to use <alsa/asoundlib.h> instead of
+<asoundlib.h>.
+
+This is in preparation of an change to pkgconfig(alsa) to
+not pollute CFLAGS with -I/usr/include/alsa anymore.
+
+Signed-off-by: Olaf Hering <olaf@aepfle.de>
+---
+ src/modules/alsa/alsa-mixer.c | 2 +-
+ src/modules/alsa/alsa-mixer.h | 2 +-
+ src/modules/alsa/alsa-sink.c | 2 +-
+ src/modules/alsa/alsa-source.c | 2 +-
+ src/modules/alsa/alsa-ucm.c | 2 +-
+ src/modules/alsa/alsa-util.c | 2 +-
+ src/modules/alsa/alsa-util.h | 2 +-
+ src/modules/alsa/module-alsa-source.c | 2 +-
+ 8 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
+index 5cb99c8fd..cd99a75f8 100644
+--- a/src/modules/alsa/alsa-mixer.c
++++ b/src/modules/alsa/alsa-mixer.c
+@@ -23,7 +23,7 @@
+ #endif
+
+ #include <sys/types.h>
+-#include <asoundlib.h>
++#include <alsa/asoundlib.h>
+ #include <math.h>
+
+ #ifdef HAVE_VALGRIND_MEMCHECK_H
+diff --git a/src/modules/alsa/alsa-mixer.h b/src/modules/alsa/alsa-mixer.h
+index 3ea4d7329..65b071165 100644
+--- a/src/modules/alsa/alsa-mixer.h
++++ b/src/modules/alsa/alsa-mixer.h
+@@ -21,7 +21,7 @@
+ along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
+ ***/
+
+-#include <asoundlib.h>
++#include <alsa/asoundlib.h>
+
+ #include <pulse/sample.h>
+ #include <pulse/mainloop-api.h>
+diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c
+index 28143402a..4b46708ce 100644
+--- a/src/modules/alsa/alsa-sink.c
++++ b/src/modules/alsa/alsa-sink.c
+@@ -25,7 +25,7 @@
+ #include <signal.h>
+ #include <stdio.h>
+
+-#include <asoundlib.h>
++#include <alsa/asoundlib.h>
+
+ #ifdef HAVE_VALGRIND_MEMCHECK_H
+ #include <valgrind/memcheck.h>
+diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c
+index 8129220b0..c8bf649e1 100644
+--- a/src/modules/alsa/alsa-source.c
++++ b/src/modules/alsa/alsa-source.c
+@@ -25,7 +25,7 @@
+ #include <signal.h>
+ #include <stdio.h>
+
+-#include <asoundlib.h>
++#include <alsa/asoundlib.h>
+
+ #include <pulse/rtclock.h>
+ #include <pulse/timeval.h>
+diff --git a/src/modules/alsa/alsa-ucm.c b/src/modules/alsa/alsa-ucm.c
+index 341c8012e..0a40ca8fe 100644
+--- a/src/modules/alsa/alsa-ucm.c
++++ b/src/modules/alsa/alsa-ucm.c
+@@ -27,7 +27,7 @@
+ #include <ctype.h>
+ #include <sys/types.h>
+ #include <limits.h>
+-#include <asoundlib.h>
++#include <alsa/asoundlib.h>
+
+ #ifdef HAVE_VALGRIND_MEMCHECK_H
+ #include <valgrind/memcheck.h>
+diff --git a/src/modules/alsa/alsa-util.c b/src/modules/alsa/alsa-util.c
+index e8d712e72..bd0a47e50 100644
+--- a/src/modules/alsa/alsa-util.c
++++ b/src/modules/alsa/alsa-util.c
+@@ -23,7 +23,7 @@
+ #endif
+
+ #include <sys/types.h>
+-#include <asoundlib.h>
++#include <alsa/asoundlib.h>
+
+ #include <pulse/sample.h>
+ #include <pulse/xmalloc.h>
+diff --git a/src/modules/alsa/alsa-util.h b/src/modules/alsa/alsa-util.h
+index 6b27339ec..4ceaa06ee 100644
+--- a/src/modules/alsa/alsa-util.h
++++ b/src/modules/alsa/alsa-util.h
+@@ -21,7 +21,7 @@
+ along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
+ ***/
+
+-#include <asoundlib.h>
++#include <alsa/asoundlib.h>
+
+ #include <pulse/sample.h>
+ #include <pulse/channelmap.h>
+diff --git a/src/modules/alsa/module-alsa-source.c b/src/modules/alsa/module-alsa-source.c
+index af6800dd2..747ba9342 100644
+--- a/src/modules/alsa/module-alsa-source.c
++++ b/src/modules/alsa/module-alsa-source.c
+@@ -24,7 +24,7 @@
+
+ #include <stdio.h>
+
+-#include <asoundlib.h>
++#include <alsa/asoundlib.h>
+
+ #ifdef HAVE_VALGRIND_MEMCHECK_H
+ #include <valgrind/memcheck.h>
+--
+2.21.0
+
--git a/media-sound/pulseaudio/files/pulseaudio-12.2-alsa-header-path2.patch b/media-sound/pulseaudio/files/pulseaudio-12.2-alsa-header-path2.patch
new file mode 100644
index 00000000000..c592da2205e
--- /dev/null
+++ b/media-sound/pulseaudio/files/pulseaudio-12.2-alsa-header-path2.patch
@@ -0,0 +1,45 @@
+From b89d33bb182c42db5ad3987b0e91b7bf62f421e8 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Sun, 21 Apr 2019 11:59:30 +0200
+Subject: [PATCH 304/375] alsa: Fix inclusion of use-case.h
+
+The recent change in ALSA upstream stripped -I$include/alsa path from
+pkgconfig. We already fixed for this change in some places but still
+the code for UCM was overlooked, and this resulted in the unresolved
+symbols in alsa card module. Fix them as well.
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+---
+ configure.ac | 2 +-
+ src/modules/alsa/alsa-ucm.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c004bd70d..b44ed1595 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -826,7 +826,7 @@ AS_IF([test "x$enable_alsa" = "xyes" && test "x$HAVE_ALSA" = "x0"],
+ AS_IF([test "x$HAVE_ALSA" = "x1"],
+ [
+ save_CPPFLAGS="$CPPFLAGS"; CPPFLAGS="$CPPFLAGS $ASOUNDLIB_CFLAGS"
+- AC_CHECK_HEADERS([use-case.h], HAVE_ALSA_UCM=1, HAVE_ALSA_UCM=0)
++ AC_CHECK_HEADERS([alsa/use-case.h], HAVE_ALSA_UCM=1, HAVE_ALSA_UCM=0)
+ CPPFLAGS="$save_CPPFLAGS"
+ ],
+ HAVE_ALSA_UCM=0)
+diff --git a/src/modules/alsa/alsa-ucm.h b/src/modules/alsa/alsa-ucm.h
+index 53abf3f90..c926f3cc3 100644
+--- a/src/modules/alsa/alsa-ucm.h
++++ b/src/modules/alsa/alsa-ucm.h
+@@ -23,7 +23,7 @@
+ ***/
+
+ #ifdef HAVE_ALSA_UCM
+-#include <use-case.h>
++#include <alsa/use-case.h>
+ #else
+ typedef void snd_use_case_mgr_t;
+ #endif
+--
+2.21.0
+
diff --git a/media-sound/pulseaudio/files/pulseaudio-12.2-exit-time-session.patch b/media-sound/pulseaudio/files/pulseaudio-12.2-exit-time-session.patch
new file mode 100644
index 00000000000..045ab5567d8
--- /dev/null
+++ b/media-sound/pulseaudio/files/pulseaudio-12.2-exit-time-session.patch
@@ -0,0 +1,181 @@
+From de705a0eeaa27a8ac1abdc2625e639340323595a Mon Sep 17 00:00:00 2001
+From: Tanu Kaskinen <tanuk@iki.fi>
+Date: Tue, 6 Mar 2018 15:09:06 +0200
+Subject: [PATCH 08/77] set exit_idle_time to 0 when we detect a session
+
+As the comments explain, this fixes relogin problems on some systems
+that remove our sockets on logout without terminating the daemon.
+---
+ man/pulse-daemon.conf.5.xml.in | 15 ++++++++++++---
+ man/pulseaudio.1.xml.in | 17 +++++++++++++++--
+ src/modules/module-console-kit.c | 13 +++++++++++++
+ src/modules/module-systemd-login.c | 14 ++++++++++++++
+ src/modules/x11/module-x11-xsmp.c | 13 +++++++++++++
+ src/pulsecore/core.c | 10 ++++++++++
+ src/pulsecore/core.h | 2 ++
+ 7 files changed, 79 insertions(+), 5 deletions(-)
+
+diff --git a/man/pulse-daemon.conf.5.xml.in b/man/pulse-daemon.conf.5.xml.in
+index f0550f3b..f49fa9b0 100644
+--- a/man/pulse-daemon.conf.5.xml.in
++++ b/man/pulse-daemon.conf.5.xml.in
+@@ -292,9 +292,18 @@ License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
+ <option>
+ <p><opt>exit-idle-time=</opt> Terminate the daemon after the
+ last client quit and this time in seconds passed. Use a negative value to
+- disable this feature. Defaults to 20. The
+- <opt>--exit-idle-time</opt> command line option takes
+- precedence.</p>
++ disable this feature. Defaults to 20. The <opt>--exit-idle-time</opt>
++ command line option takes precedence.</p>
++
++ <p>When PulseAudio runs in the per-user mode and detects a login
++ session, then any positive value will be reset to 0 so that PulseAudio
++ will terminate immediately on logout. A positive value therefore has
++ effect only in environments where there's no support for login session
++ tracking. A negative value can still be used to disable any automatic
++ exit.</p>
++
++ <p>When PulseAudio runs in the system mode, automatic exit is always
++ disabled, so this option does nothing.</p>
+ </option>
+
+ <option>
+diff --git a/man/pulseaudio.1.xml.in b/man/pulseaudio.1.xml.in
+index f732b8ae..824eddb4 100644
+--- a/man/pulseaudio.1.xml.in
++++ b/man/pulseaudio.1.xml.in
+@@ -189,8 +189,21 @@ License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
+ <option>
+ <p><opt>--exit-idle-time</opt><arg>=SECS</arg></p>
+
+- <optdesc><p>Terminate the daemon when idle and the specified
+- number of seconds passed.</p></optdesc>
++ <optdesc>
++ <p>Terminate the daemon after the last client quit and this time in
++ seconds passed. Use a negative value to disable this feature. Defaults
++ to 20.</p>
++
++ <p>When PulseAudio runs in the per-user mode and detects a login
++ session, then any positive value will be reset to 0 so that PulseAudio
++ will terminate immediately on logout. A positive value therefore has
++ effect only in environments where there's no support for login session
++ tracking. A negative value can still be used to disable any automatic
++ exit.</p>
++
++ <p>When PulseAudio runs in the system mode, automatic exit is always
++ disabled, so this option does nothing.</p>
++ </optdesc>
+ </option>
+
+ <option>
+diff --git a/src/modules/module-console-kit.c b/src/modules/module-console-kit.c
+index c7938849..c8fe2ed2 100644
+--- a/src/modules/module-console-kit.c
++++ b/src/modules/module-console-kit.c
+@@ -118,6 +118,19 @@ static void add_session(struct userdata *u, const char *id) {
+
+ pa_log_debug("Added new session %s", id);
+
++ /* Positive exit_idle_time is only useful when we have no session tracking
++ * capability, so we can set it to 0 now that we have detected a session.
++ * The benefit of setting exit_idle_time to 0 is that pulseaudio will exit
++ * immediately when the session ends. That in turn is useful, because some
++ * systems (those that use pam_systemd but don't use systemd for managing
++ * pulseaudio) clean $XDG_RUNTIME_DIR on logout, but fail to terminate all
++ * services that depend on the files in $XDG_RUNTIME_DIR. The directory
++ * contains our sockets, and if the sockets are removed without terminating
++ * pulseaudio, a quick relogin will likely cause trouble, because a new
++ * instance will be spawned while the old instance is still running. */
++ if (u->core->exit_idle_time > 0)
++ pa_core_set_exit_idle_time(u->core, 0);
++
+ fail:
+
+ if (m)
+diff --git a/src/modules/module-systemd-login.c b/src/modules/module-systemd-login.c
+index 87981592..51401575 100644
+--- a/src/modules/module-systemd-login.c
++++ b/src/modules/module-systemd-login.c
+@@ -84,6 +84,20 @@ static int add_session(struct userdata *u, const char *id) {
+ pa_hashmap_put(u->sessions, session->id, session);
+
+ pa_log_debug("Added new session %s", id);
++
++ /* Positive exit_idle_time is only useful when we have no session tracking
++ * capability, so we can set it to 0 now that we have detected a session.
++ * The benefit of setting exit_idle_time to 0 is that pulseaudio will exit
++ * immediately when the session ends. That in turn is useful, because some
++ * systems (those that use pam_systemd but don't use systemd for managing
++ * pulseaudio) clean $XDG_RUNTIME_DIR on logout, but fail to terminate all
++ * services that depend on the files in $XDG_RUNTIME_DIR. The directory
++ * contains our sockets, and if the sockets are removed without terminating
++ * pulseaudio, a quick relogin will likely cause trouble, because a new
++ * instance will be spawned while the old instance is still running. */
++ if (u->core->exit_idle_time > 0)
++ pa_core_set_exit_idle_time(u->core, 0);
++
+ return 0;
+ }
+
+diff --git a/src/modules/x11/module-x11-xsmp.c b/src/modules/x11/module-x11-xsmp.c
+index 0238e516..6f801237 100644
+--- a/src/modules/x11/module-x11-xsmp.c
++++ b/src/modules/x11/module-x11-xsmp.c
+@@ -206,6 +206,19 @@ int pa__init(pa_module*m) {
+ if (!u->client)
+ goto fail;
+
++ /* Positive exit_idle_time is only useful when we have no session tracking
++ * capability, so we can set it to 0 now that we have detected a session.
++ * The benefit of setting exit_idle_time to 0 is that pulseaudio will exit
++ * immediately when the session ends. That in turn is useful, because some
++ * systems (those that use pam_systemd but don't use systemd for managing
++ * pulseaudio) clean $XDG_RUNTIME_DIR on logout, but fail to terminate all
++ * services that depend on the files in $XDG_RUNTIME_DIR. The directory
++ * contains our sockets, and if the sockets are removed without terminating
++ * pulseaudio, a quick relogin will likely cause trouble, because a new
++ * instance will be spawned while the old instance is still running. */
++ if (u->core->exit_idle_time > 0)
++ pa_core_set_exit_idle_time(u->core, 0);
++
+ pa_modargs_free(ma);
+
+ return 0;
+diff --git a/src/pulsecore/core.c b/src/pulsecore/core.c
+index 79abbc04..da42a13e 100644
+--- a/src/pulsecore/core.c
++++ b/src/pulsecore/core.c
+@@ -426,6 +426,16 @@ void pa_core_update_default_source(pa_core *core) {
+ pa_hook_fire(&core->hooks[PA_CORE_HOOK_DEFAULT_SOURCE_CHANGED], core->default_source);
+ }
+
++void pa_core_set_exit_idle_time(pa_core *core, int time) {
++ pa_assert(core);
++
++ if (time == core->exit_idle_time)
++ return;
++
++ pa_log_info("exit_idle_time: %i -> %i", core->exit_idle_time, time);
++ core->exit_idle_time = time;
++}
++
+ static void exit_callback(pa_mainloop_api *m, pa_time_event *e, const struct timeval *t, void *userdata) {
+ pa_core *c = userdata;
+ pa_assert(c->exit_event == e);
+diff --git a/src/pulsecore/core.h b/src/pulsecore/core.h
+index 213964ce..38622f61 100644
+--- a/src/pulsecore/core.h
++++ b/src/pulsecore/core.h
+@@ -258,6 +258,8 @@ void pa_core_set_configured_default_source(pa_core *core, const char *source);
+ void pa_core_update_default_sink(pa_core *core);
+ void pa_core_update_default_source(pa_core *core);
+
++void pa_core_set_exit_idle_time(pa_core *core, int time);
++
+ /* Check whether no one is connected to this core */
+ void pa_core_check_idle(pa_core *c);
+
+--
+2.17.1
+
diff --git a/media-sound/pulseaudio/pulseaudio-12.2-r2.ebuild b/media-sound/pulseaudio/pulseaudio-12.2-r2.ebuild
new file mode 100644
index 00000000000..4e7497c6168
--- /dev/null
+++ b/media-sound/pulseaudio/pulseaudio-12.2-r2.ebuild
@@ -0,0 +1,366 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools bash-completion-r1 flag-o-matic gnome2-utils linux-info systemd user 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.
+LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
+
+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 elogind gconf
++gdbm +glib 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="
+ ?? ( elogind systemd )
+ bluetooth? ( dbus )
+ equalizer? ( dbus )
+ ofono-headset? ( bluetooth )
+ native-headset? ( bluetooth )
+ realtime? ( dbus )
+ udev? ( || ( alsa oss ) )
+"
+
+# libpcre needed in some cases, bug #472228
+CDEPEND="
+ || (
+ 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.26.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 )
+ 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(+)] )
+ 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 )
+ elogind? ( sys-auth/elogind )
+ systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] )
+ dev-libs/libltdl:0
+ selinux? ( sec-policy/selinux-pulseaudio )
+" # libltdl is a valid RDEPEND, libltdl.so is used for native abi in pulsecore and daemon
+
+RDEPEND="${CDEPEND}
+ realtime? ( sys-auth/rtkit )
+ gconf? ( >=gnome-base/gconf-3.2.6 )
+"
+
+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}"/pulseaudio-11.1-disable-flat-volumes.patch # bug 627894
+ # Backports from Fedora
+ "${FILESDIR}"/${P}-exit-time-session.patch
+ "${FILESDIR}"/${P}-alsa-header-path.patch
+ "${FILESDIR}"/${P}-alsa-header-path2.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
+ sed -i -e 's/lock-autospawn-test$(EXEEXT) //' src/Makefile.in || die
+
+ eautoreconf
+}
+
+multilib_src_configure() {
+ local myconf=(
+ --disable-adrian-aec
+ --disable-bluez4
+ --disable-esound
+ --disable-gconf
+ --disable-solaris
+ --enable-largefile
+ --localstatedir="${EPREFIX}"/var
+ --with-systemduserunitdir=$(systemd_get_userunitdir)
+ --with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
+ $(multilib_native_use_enable alsa)
+ $(multilib_native_use_enable bluetooth bluez5)
+ $(multilib_native_use_enable glib gsettings)
+ $(multilib_native_use_enable gtk gtk3)
+ $(multilib_native_use_enable jack)
+ $(multilib_native_use_enable libsamplerate samplerate)
+ $(multilib_native_use_enable lirc)
+ $(multilib_native_use_enable orc)
+ $(multilib_native_use_enable oss oss-output)
+ $(multilib_native_use_enable ssl openssl)
+ # tests involve random modules, so just do them for the native
+ $(multilib_native_use_enable test default-build-tests)
+ $(multilib_native_use_enable udev)
+ $(multilib_native_use_enable webrtc-aec)
+ $(multilib_native_use_enable zeroconf avahi)
+ $(multilib_native_use_with equalizer fftw)
+ $(multilib_native_use_with sox soxr)
+ $(multilib_native_usex gdbm '--with-database=gdbm' '--with-database=simple')
+ $(use_enable glib glib2)
+ $(use_enable asyncns)
+ $(use_enable neon neon-opt)
+ $(use_enable tcpd tcpwrap)
+ $(use_enable dbus)
+ $(use_enable X x11)
+ $(use_enable systemd systemd-daemon)
+ # systemd-login isn't necessary for non-native, but the rest of systemd are; not changing it at this point close to a meson port
+ $(use_enable systemd systemd-login)
+ $(use_enable systemd systemd-journal)
+ $(use_enable ipv6)
+ $(use_with caps)
+ )
+
+ if use elogind && multilib_is_native_abi; then
+ myconf+=(
+ --enable-systemd-login
+ SYSTEMDLOGIN_CFLAGS=`pkg-config --cflags "libelogind" 2>/dev/null`
+ SYSTEMDLOGIN_LIBS=`pkg-config --libs "libelogind" 2>/dev/null`
+ )
+ fi
+
+ if use bluetooth; then
+ myconf+=(
+ $(multilib_native_use_enable native-headset bluez5-native-headset)
+ $(multilib_native_use_enable ofono-headset bluez5-ofono-headset)
+ )
+ fi
+
+ if ! multilib_is_native_abi; then
+ myconf+=(
+ # hack around unnecessary checks
+ # (results don't matter, we're not building anything using it)
+ ac_cv_lib_ltdl_lt_dladvise_init=yes
+ LIBSPEEX_CFLAGS=' '
+ LIBSPEEX_LIBS=' '
+ )
+ else
+ # Make padsp work for non-native ABI, supposedly only possible with glibc; this is used by /usr/bin/padsp that comes from native build, thus we need this argument for native build
+ if use elibc_glibc ; then
+ myconf+=( --with-pulsedsp-location="${EPREFIX}"'/usr/\\$$LIB/pulseaudio' )
+ fi
+ 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
+ if use doc ; then
+ docinto html
+ dodoc -r doxygen/html/
+ fi
+ 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() {
+ 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"
+
+ # We need /var/run/pulse, bug #442852
+ systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
+ else
+ # Prevent warnings when system-wide is not used, bug #447694
+ if use dbus ; then
+ rm "${ED%/}"/etc/dbus-1/system.d/pulseaudio-system.conf || die
+ fi
+ fi
+
+ if use zeroconf ; then
+ sed -e '/module-zeroconf-publish/s:^#::' \
+ -i "${ED%/}/etc/pulse/default.pa" || die
+ fi
+
+ dodoc NEWS README todo
+
+ # Create the state directory
+ use prefix || diropts -o pulse -g pulse -m0755
+
+ find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+}
+
+pkg_postinst() {
+ gnome2_schemas_update
+ 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"
+ 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 equalizer && use qt5; then
+ elog "You will need to load some extra modules to make qpaeq work."
+ elog "You can do that by adding the following two lines in"
+ elog "/etc/pulse/default.pa and restarting pulseaudio:"
+ elog "load-module module-equalizer-sink"
+ elog "load-module module-dbus-protocol"
+ 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
+}
+
+pkg_postrm() {
+ gnome2_schemas_update
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/pulseaudio/, media-sound/pulseaudio/files/
@ 2021-06-21 0:26 Thomas Deutschmann
0 siblings, 0 replies; 7+ messages in thread
From: Thomas Deutschmann @ 2021-06-21 0:26 UTC (permalink / raw
To: gentoo-commits
commit: 5484b21ca35d648b6c92b4f6cbf5f460268ae3c3
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 21 00:26:33 2021 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jun 21 00:26:55 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5484b21c
media-sound/pulseaudio: fix building with USE=-glib
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
...dio-14.99.2-require-GIO-for-RTP-GStreamer.patch | 36 ++++++++++++++++++++++
.../pulseaudio/pulseaudio-14.99.2_pre.ebuild | 2 ++
2 files changed, 38 insertions(+)
diff --git a/media-sound/pulseaudio/files/pulseaudio-14.99.2-require-GIO-for-RTP-GStreamer.patch b/media-sound/pulseaudio/files/pulseaudio-14.99.2-require-GIO-for-RTP-GStreamer.patch
new file mode 100644
index 00000000000..dfce2488156
--- /dev/null
+++ b/media-sound/pulseaudio/files/pulseaudio-14.99.2-require-GIO-for-RTP-GStreamer.patch
@@ -0,0 +1,36 @@
+From fe25df45d5742f20a225e9d9cd790156a7f05943 Mon Sep 17 00:00:00 2001
+From: "Igor V. Kovalenko" <igor.v.kovalenko@gmail.com>
+Date: Mon, 21 Jun 2021 02:32:41 +0300
+Subject: [PATCH] build-sys: meson: require GIO dependency for RTP-GStreamer
+
+---
+ meson.build | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index fdd8bf655..61660b981 100644
+--- a/meson.build
++++ b/meson.build
+@@ -614,8 +614,9 @@ if dbus_dep.found()
+ cdata.set('HAVE_DBUS', 1)
+ endif
+
+-gio_dep = dependency('gio-2.0', version : '>= 2.26.0', required : get_option('gsettings'))
+-if gio_dep.found()
++gio_dep = dependency('gio-2.0', version : '>= 2.26.0')
++if get_option('gsettings').enabled()
++ assert(gio_dep.found(), 'GSettings support needs glib I/O library (GIO)')
+ cdata.set('HAVE_GSETTINGS', 1)
+ endif
+
+@@ -760,6 +761,7 @@ gstrtp_dep = dependency('gstreamer-rtp-1.0', required : get_option('gstreamer'))
+
+ have_gstreamer = false
+ if gst_dep.found() and gstapp_dep.found() and gstrtp_dep.found()
++ assert(gio_dep.found(), 'GStreamer-based RTP needs glib I/O library (GIO)')
+ have_gstreamer = true
+ endif
+
+--
+GitLab
+
diff --git a/media-sound/pulseaudio/pulseaudio-14.99.2_pre.ebuild b/media-sound/pulseaudio/pulseaudio-14.99.2_pre.ebuild
index aa307be1068..203ebb43b87 100644
--- a/media-sound/pulseaudio/pulseaudio-14.99.2_pre.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-14.99.2_pre.ebuild
@@ -164,6 +164,8 @@ DOCS=( NEWS README )
S="${WORKDIR}/${MY_P}"
+PATCHES=( "${FILESDIR}"/${MY_P}-require-GIO-for-RTP-GStreamer.patch )
+
src_prepare() {
default
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/pulseaudio/, media-sound/pulseaudio/files/
@ 2021-06-21 11:18 Thomas Deutschmann
0 siblings, 0 replies; 7+ messages in thread
From: Thomas Deutschmann @ 2021-06-21 11:18 UTC (permalink / raw
To: gentoo-commits
commit: abf184c08f844da0ddea740490a681ac073b0301
Author: Theo Anderson <telans <AT> posteo <DOT> de>
AuthorDate: Tue Jan 19 06:14:09 2021 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jun 21 11:15:56 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abf184c0
media-sound/pulseaudio: fix build with clang
Closes: https://bugs.gentoo.org/740498
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Theo Anderson <telans <AT> posteo.de>
Closes: https://github.com/gentoo/gentoo/pull/19122
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
.../pulseaudio/files/pulseaudio-13.0-clang.patch | 25 ++++++++++++++++++++++
media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild | 1 +
2 files changed, 26 insertions(+)
diff --git a/media-sound/pulseaudio/files/pulseaudio-13.0-clang.patch b/media-sound/pulseaudio/files/pulseaudio-13.0-clang.patch
new file mode 100644
index 00000000000..d7b81de0313
--- /dev/null
+++ b/media-sound/pulseaudio/files/pulseaudio-13.0-clang.patch
@@ -0,0 +1,25 @@
+From e4450d8b586103ec1414e2d6245ff34a9096d97a Mon Sep 17 00:00:00 2001
+From: Peter Levine <plevine457@gmail.com>
+Date: Thu, 26 Sep 2019 07:24:40 +0000
+Subject: [PATCH] atomic: Explicitly cast void* to unsigned long
+
+---
+ src/pulsecore/atomic.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/pulsecore/atomic.h b/src/pulsecore/atomic.h
+index a82ca83c5..e5c140109 100644
+--- a/src/pulsecore/atomic.h
++++ b/src/pulsecore/atomic.h
+@@ -117,7 +117,7 @@ static inline void* pa_atomic_ptr_load(const pa_atomic_ptr_t *a) {
+ }
+
+ static inline void pa_atomic_ptr_store(pa_atomic_ptr_t *a, void* p) {
+- __atomic_store_n(&a->value, p, __ATOMIC_SEQ_CST);
++ __atomic_store_n(&a->value, (unsigned long) p, __ATOMIC_SEQ_CST);
+ }
+
+ #else
+--
+GitLab
+
diff --git a/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild b/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
index 0b4d1139a5b..0b9a7d18570 100644
--- a/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
@@ -121,6 +121,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/pulseaudio-11.1-disable-flat-volumes.patch # bug 627894
+ "${FILESDIR}"/${P}-clang.patch
)
pkg_pretend() {
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/pulseaudio/, media-sound/pulseaudio/files/
@ 2021-08-18 20:10 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2021-08-18 20:10 UTC (permalink / raw
To: gentoo-commits
commit: 148c7751fcab10497a6a780ab15c48bd782f2b56
Author: Igor V. Kovalenko <igor.v.kovalenko <AT> gmail <DOT> com>
AuthorDate: Wed Aug 18 19:31:59 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 18 20:10:45 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=148c7751
media-sound/pulseaudio: Require xice, xsm and xtst for daemon only
Backport change 42af3ee08381faa5807fde68d4c8ec0d7ad5e9a5 from upstream master.
Closes: https://bugs.gentoo.org/806052
Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/22020
Signed-off-by: Sam James <sam <AT> gentoo.org>
...pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch | 25 ++++++++++++++++++++++
media-sound/pulseaudio/pulseaudio-15.0.ebuild | 4 ++++
2 files changed, 29 insertions(+)
diff --git a/media-sound/pulseaudio/files/pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch b/media-sound/pulseaudio/files/pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch
new file mode 100644
index 00000000000..f3df62031d3
--- /dev/null
+++ b/media-sound/pulseaudio/files/pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/806052
+
+commit 42af3ee08381faa5807fde68d4c8ec0d7ad5e9a5
+Author: Igor V. Kovalenko <igor.v.kovalenko@gmail.com>
+Date: Tue Aug 3 09:43:32 2021 +0300
+
+ build-sys: meson: Require xice, xsm and xtst for daemon only
+
+ Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/613>
+
+--- a/meson.build
++++ b/meson.build
+@@ -681,9 +681,9 @@ endif
+ x11_dep = dependency('x11-xcb', required : get_option('x11'))
+ if x11_dep.found()
+ xcb_dep = dependency('xcb', required : true, version : '>= 1.6')
+- ice_dep = dependency('ice', required : true)
+- sm_dep = dependency('sm', required : true)
+- xtst_dep = dependency('xtst', required : true)
++ ice_dep = dependency('ice', required : get_option('daemon'))
++ sm_dep = dependency('sm', required : get_option('daemon'))
++ xtst_dep = dependency('xtst', required : get_option('daemon'))
+ cdata.set('HAVE_X11', 1)
+ if cc.has_function('XSetIOErrorExitHandler', dependencies: x11_dep)
+ cdata.set('HAVE_XSETIOERROREXITHANDLER', 1)
diff --git a/media-sound/pulseaudio/pulseaudio-15.0.ebuild b/media-sound/pulseaudio/pulseaudio-15.0.ebuild
index b3e74c86cb1..a28a050fb04 100644
--- a/media-sound/pulseaudio/pulseaudio-15.0.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-15.0.ebuild
@@ -165,6 +165,10 @@ DOCS=( NEWS README )
S="${WORKDIR}/${MY_P}"
+PATCHES=(
+ "${FILESDIR}"/pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch
+)
+
src_prepare() {
default
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/pulseaudio/, media-sound/pulseaudio/files/
@ 2022-07-31 3:40 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2022-07-31 3:40 UTC (permalink / raw
To: gentoo-commits
commit: c185146b40b6665533f7235a5d88dee258dc05fd
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 31 03:36:19 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 31 03:39:33 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c185146b
media-sound/pulseaudio: drop 13.0-r1, 15.0-r2, 15.0-r3
This should make things a bit less confusing when
looking at packages.gentoo.org, 'equery u', etc
wrt libpulse split.
media-sound/pulseaudio is now just a meta.
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-sound/pulseaudio/Manifest | 2 -
.../pulseaudio-11.1-disable-flat-volumes.patch | 48 ---
.../pulseaudio/files/pulseaudio-13.0-clang.patch | 25 --
...dio-14.99.2-require-GIO-for-RTP-GStreamer.patch | 51 ---
...lseaudio-14.99.2-require-bluez-dependency.patch | 89 -----
...pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch | 25 --
media-sound/pulseaudio/files/pulseaudio.conf.d | 6 -
media-sound/pulseaudio/files/pulseaudio.init.d-5 | 80 -----
media-sound/pulseaudio/files/pulseaudio.service | 10 -
media-sound/pulseaudio/files/pulseaudio.tmpfiles | 1 -
media-sound/pulseaudio/metadata.xml | 69 ----
media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild | 355 -------------------
media-sound/pulseaudio/pulseaudio-15.0-r2.ebuild | 375 --------------------
media-sound/pulseaudio/pulseaudio-15.0-r3.ebuild | 382 ---------------------
14 files changed, 1518 deletions(-)
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
deleted file mode 100644
index 39535c6a45ad..000000000000
--- a/media-sound/pulseaudio/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST pulseaudio-13.0.tar.xz 1901768 BLAKE2B 651a80f54525f196bcb036d893fedd4d9f34e10459918281397a45f498c31bff0d0c836f4e64aab5ac2612ffd5a0cab1a41ea710bbee5fd34dfc9ea1236deea9 SHA512 d445b8ccd43029a0ca0e456fc9291a79d3434d6496ead7eb329ab348d5249235e8bde6cf2be68765d8f761452dbe1486fb10c739e40b1e67ed75787bbd24ac0c
-DIST pulseaudio-15.0.tar.xz 1521760 BLAKE2B a6f7b74fdcfe7f2a993eafb9f465946915a24b6801d3077971b9377290d6c70b3f8640a800abd09d5901db96a20349f31b1beedd9da2249f69b591fb8392f489 SHA512 352ef20384c76c631c0faa73b08e2318902a433712e0c086a5ac7a0ae58873c8d4be8f35879bdec71a93b19ae8e2ba073cacac4d56215bcf58375a0cd9d88833
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
deleted file mode 100644
index 40b23ec05f2e..000000000000
--- a/media-sound/pulseaudio/files/pulseaudio-11.1-disable-flat-volumes.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-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-13.0-clang.patch b/media-sound/pulseaudio/files/pulseaudio-13.0-clang.patch
deleted file mode 100644
index d7b81de0313e..000000000000
--- a/media-sound/pulseaudio/files/pulseaudio-13.0-clang.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e4450d8b586103ec1414e2d6245ff34a9096d97a Mon Sep 17 00:00:00 2001
-From: Peter Levine <plevine457@gmail.com>
-Date: Thu, 26 Sep 2019 07:24:40 +0000
-Subject: [PATCH] atomic: Explicitly cast void* to unsigned long
-
----
- src/pulsecore/atomic.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/pulsecore/atomic.h b/src/pulsecore/atomic.h
-index a82ca83c5..e5c140109 100644
---- a/src/pulsecore/atomic.h
-+++ b/src/pulsecore/atomic.h
-@@ -117,7 +117,7 @@ static inline void* pa_atomic_ptr_load(const pa_atomic_ptr_t *a) {
- }
-
- static inline void pa_atomic_ptr_store(pa_atomic_ptr_t *a, void* p) {
-- __atomic_store_n(&a->value, p, __ATOMIC_SEQ_CST);
-+ __atomic_store_n(&a->value, (unsigned long) p, __ATOMIC_SEQ_CST);
- }
-
- #else
---
-GitLab
-
diff --git a/media-sound/pulseaudio/files/pulseaudio-14.99.2-require-GIO-for-RTP-GStreamer.patch b/media-sound/pulseaudio/files/pulseaudio-14.99.2-require-GIO-for-RTP-GStreamer.patch
deleted file mode 100644
index a6554178da60..000000000000
--- a/media-sound/pulseaudio/files/pulseaudio-14.99.2-require-GIO-for-RTP-GStreamer.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 58052e0e04ee1b5fdb1027ebc19717e7766825ec Mon Sep 17 00:00:00 2001
-From: "Igor V. Kovalenko" <igor.v.kovalenko@gmail.com>
-Date: Mon, 21 Jun 2021 02:32:41 +0300
-Subject: [PATCH] build-sys: meson: require GIO dependency for RTP-GStreamer
-
-Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/584>
----
- meson.build | 6 ++++--
- src/modules/meson.build | 2 +-
- 2 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index fdd8bf655..61660b981 100644
---- a/meson.build
-+++ b/meson.build
-@@ -614,8 +614,9 @@ if dbus_dep.found()
- cdata.set('HAVE_DBUS', 1)
- endif
-
--gio_dep = dependency('gio-2.0', version : '>= 2.26.0', required : get_option('gsettings'))
--if gio_dep.found()
-+gio_dep = dependency('gio-2.0', version : '>= 2.26.0')
-+if get_option('gsettings').enabled()
-+ assert(gio_dep.found(), 'GSettings support needs glib I/O library (GIO)')
- cdata.set('HAVE_GSETTINGS', 1)
- endif
-
-@@ -760,6 +761,7 @@ gstrtp_dep = dependency('gstreamer-rtp-1.0', required : get_option('gstreamer'))
-
- have_gstreamer = false
- if gst_dep.found() and gstapp_dep.found() and gstrtp_dep.found()
-+ assert(gio_dep.found(), 'GStreamer-based RTP needs glib I/O library (GIO)')
- have_gstreamer = true
- endif
-
-diff --git a/src/modules/meson.build b/src/modules/meson.build
-index 9c498a4e1..e7db573b6 100644
---- a/src/modules/meson.build
-+++ b/src/modules/meson.build
-@@ -161,7 +161,7 @@ if dbus_dep.found() and fftw_dep.found()
- ]
- endif
-
--if gio_dep.found()
-+if get_option('gsettings').enabled() and gio_dep.found()
- subdir('gsettings')
- all_modules += [
- [ 'module-gsettings',
---
-GitLab
-
diff --git a/media-sound/pulseaudio/files/pulseaudio-14.99.2-require-bluez-dependency.patch b/media-sound/pulseaudio/files/pulseaudio-14.99.2-require-bluez-dependency.patch
deleted file mode 100644
index 5983a05ea4a9..000000000000
--- a/media-sound/pulseaudio/files/pulseaudio-14.99.2-require-bluez-dependency.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From c817dfb5a438055c98449a4a2f34eb4ec341ccde Mon Sep 17 00:00:00 2001
-From: "Igor V. Kovalenko" <igor.v.kovalenko@gmail.com>
-Date: Fri, 18 Jun 2021 20:48:12 +0300
-Subject: [PATCH] build-sys: meson: Require bluez dependency if bluez5 feature
- is enabled
-
-Build breaks if bluez5 and bluez5-native-headset are both enabled
-but bluez headers are not available.
-
-Fix this by changing `bluez5` to Meson feature requiring `bluez` dependency.
-
-Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/583>
----
- meson.build | 10 ++++++----
- meson_options.txt | 2 +-
- src/modules/bluetooth/meson.build | 2 +-
- src/modules/meson.build | 2 +-
- 4 files changed, 9 insertions(+), 7 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 61660b981..92ceef706 100644
---- a/meson.build
-+++ b/meson.build
-@@ -706,7 +706,9 @@ endif
-
- sbc_dep = dependency('sbc', version : '>= 1.0', required : false)
-
--if get_option('bluez5')
-+bluez_dep = dependency('bluez', required : get_option('bluez5'))
-+
-+if bluez_dep.found()
- assert(dbus_dep.found(), 'BlueZ requires D-Bus support')
- assert(sbc_dep.found(), 'BlueZ requires SBC support')
- cdata.set('HAVE_SBC', 1)
-@@ -914,9 +916,9 @@ summary = [
- 'Enable Async DNS: @0@'.format(asyncns_dep.found()),
- 'Enable LIRC: @0@'.format(lirc_dep.found()),
- 'Enable D-Bus: @0@'.format(dbus_dep.found()),
-- ' Enable BlueZ 5: @0@'.format(get_option('bluez5')),
-- ' Enable native headsets: @0@'.format(get_option('bluez5-native-headset')),
-- ' Enable ofono headsets: @0@'.format(get_option('bluez5-ofono-headset')),
-+ ' Enable BlueZ 5: @0@'.format(cdata.has('HAVE_BLUEZ_5')),
-+ ' Enable native headsets: @0@'.format(cdata.has('HAVE_BLUEZ_5_NATIVE_HEADSET')),
-+ ' Enable ofono headsets: @0@'.format(cdata.has('HAVE_BLUEZ_5_OFONO_HEADSET')),
- ' Enable GStreamer based codecs: @0@'.format(have_bluez5_gstreamer),
- 'Enable udev: @0@'.format(udev_dep.found()),
- ' Enable HAL->udev compat: @0@'.format(get_option('hal-compat')),
-diff --git a/meson_options.txt b/meson_options.txt
-index cdb3c6787..bb41a42a7 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -85,7 +85,7 @@ option('avahi',
- type : 'feature', value : 'auto',
- description : 'Optional Avahi support')
- option('bluez5',
-- type : 'boolean', value : 'true',
-+ type : 'feature', value : 'auto',
- description : 'Optional BlueZ 5 support')
- option('bluez5-gstreamer',
- type : 'feature', value: 'auto',
-diff --git a/src/modules/bluetooth/meson.build b/src/modules/bluetooth/meson.build
-index 99263bb5a..ca77ee6aa 100644
---- a/src/modules/bluetooth/meson.build
-+++ b/src/modules/bluetooth/meson.build
-@@ -35,7 +35,7 @@ libbluez5_util = shared_library('bluez5-util',
- c_args : [pa_c_args, server_c_args],
- link_args : [nodelete_link_args],
- include_directories : [configinc, topinc],
-- dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, dbus_dep, sbc_dep, libintl_dep, bluez5_gst_dep, bluez5_gstapp_dep],
-+ dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, bluez_dep, dbus_dep, sbc_dep, libintl_dep, bluez5_gst_dep, bluez5_gstapp_dep],
- install : true,
- install_rpath : privlibdir,
- install_dir : modlibexecdir,
-diff --git a/src/modules/meson.build b/src/modules/meson.build
-index e7db573b6..be72c3b9b 100644
---- a/src/modules/meson.build
-+++ b/src/modules/meson.build
-@@ -118,7 +118,7 @@ if avahi_dep.found()
- ]
- endif
-
--if get_option('bluez5')
-+if cdata.has('HAVE_BLUEZ_5')
- subdir('bluetooth')
- all_modules += [
- [ 'module-bluetooth-discover', 'bluetooth/module-bluetooth-discover.c' ],
---
-GitLab
-
diff --git a/media-sound/pulseaudio/files/pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch b/media-sound/pulseaudio/files/pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch
deleted file mode 100644
index f3df62031d34..000000000000
--- a/media-sound/pulseaudio/files/pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://bugs.gentoo.org/806052
-
-commit 42af3ee08381faa5807fde68d4c8ec0d7ad5e9a5
-Author: Igor V. Kovalenko <igor.v.kovalenko@gmail.com>
-Date: Tue Aug 3 09:43:32 2021 +0300
-
- build-sys: meson: Require xice, xsm and xtst for daemon only
-
- Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/613>
-
---- a/meson.build
-+++ b/meson.build
-@@ -681,9 +681,9 @@ endif
- x11_dep = dependency('x11-xcb', required : get_option('x11'))
- if x11_dep.found()
- xcb_dep = dependency('xcb', required : true, version : '>= 1.6')
-- ice_dep = dependency('ice', required : true)
-- sm_dep = dependency('sm', required : true)
-- xtst_dep = dependency('xtst', required : true)
-+ ice_dep = dependency('ice', required : get_option('daemon'))
-+ sm_dep = dependency('sm', required : get_option('daemon'))
-+ xtst_dep = dependency('xtst', required : get_option('daemon'))
- cdata.set('HAVE_X11', 1)
- if cc.has_function('XSetIOErrorExitHandler', dependencies: x11_dep)
- cdata.set('HAVE_XSETIOERROREXITHANDLER', 1)
diff --git a/media-sound/pulseaudio/files/pulseaudio.conf.d b/media-sound/pulseaudio/files/pulseaudio.conf.d
deleted file mode 100644
index 9e7245344a57..000000000000
--- a/media-sound/pulseaudio/files/pulseaudio.conf.d
+++ /dev/null
@@ -1,6 +0,0 @@
-# Config file for /etc/init.d/pulseaudio
-
-# 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
deleted file mode 100644
index d5415d6987d8..000000000000
--- a/media-sound/pulseaudio/files/pulseaudio.init.d-5
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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
deleted file mode 100644
index c5f0d5799929..000000000000
--- a/media-sound/pulseaudio/files/pulseaudio.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[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
deleted file mode 100644
index 88374e35574b..000000000000
--- a/media-sound/pulseaudio/files/pulseaudio.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /var/run/pulse 0755 pulse audio -
diff --git a/media-sound/pulseaudio/metadata.xml b/media-sound/pulseaudio/metadata.xml
index b2a077b71249..9810b94f531c 100644
--- a/media-sound/pulseaudio/metadata.xml
+++ b/media-sound/pulseaudio/metadata.xml
@@ -14,83 +14,14 @@
<name>Mart Raudsepp</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="daemon">Build the pulseaudio binary (not-needed for pipewire-pulse)</flag>
- <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for giving each session a PA client</flag>
- <flag name="gconf">
- Ensure <pkg>gnome-base/gconf</pkg> is present for pulseaudio GConf
- to GSettings module automatic migration (keeping the user configuration)
- </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. Build the GSettings PA module.
</flag>
- <flag name="system-wide">
- 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
- 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>
- <flag name="realtime">
- 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="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>
- <flag name="gstreamer">
- Build with support for gstreamer including ability to use bluetooth codecs.
- For bluetooth codecs see USE ldac and aptx.
- </flag>
- <flag name="aptx">
- aptX (HD) over Bluetooth (many Android compatible headphones), requires <pkg>media-plugins/gst-plugins-openaptx</pkg>.
- </flag>
- <flag name="ldac">
- LDAC over Bluetooth (primarily Sony headphones), requires <pkg>media-plugins/gst-plugins-ldac</pkg>.
- </flag>
</use>
</pkgmetadata>
diff --git a/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild b/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
deleted file mode 100644
index 5c3f45966c18..000000000000
--- a/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
+++ /dev/null
@@ -1,355 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools bash-completion-r1 flag-o-matic gnome2-utils linux-info systemd toolchain-funcs udev multilib-minimal tmpfiles
-
-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.
-LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-# +alsa-plugin as discussed in bug #519530
-IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer elogind gconf
-+gdbm +glib gtk ipv6 jack libsamplerate lirc native-headset cpu_flags_arm_neon
-ofono-headset +orc oss qt5 realtime selinux sox ssl systemd system-wide tcpd test
-+udev +webrtc-aec +X zeroconf"
-
-RESTRICT="!test? ( test )"
-# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
-REQUIRED_USE="
- ?? ( elogind systemd )
- bluetooth? ( dbus )
- equalizer? ( dbus )
- ofono-headset? ( bluetooth )
- native-headset? ( bluetooth )
- realtime? ( dbus )
- udev? ( || ( alsa oss ) )
-"
-
-# libpcre needed in some cases, bug #472228
-RDEPEND="
- || (
- elibc_glibc? ( 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.26.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 )
- 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(+)] )
- 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? ( dev-libs/openssl:0= )
- media-libs/speexdsp
- gdbm? ( sys-libs/gdbm:= )
- webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 )
- elogind? ( sys-auth/elogind )
- systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] )
- dev-libs/libltdl:0
- selinux? ( sec-policy/selinux-pulseaudio )
- realtime? ( sys-auth/rtkit )
- gconf? ( >=gnome-base/gconf-3.2.6 )
-" # libltdl is a valid RDEPEND, libltdl.so is used for native abi in pulsecore and daemon
-
-DEPEND="${RDEPEND}
- X? (
- x11-base/xorg-proto
- >=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}]
- )
- dev-libs/libatomic_ops
-"
-# 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 )
- acct-user/pulse
- acct-group/pulse-access
- )
- acct-group/audio
-"
-
-BDEPEND="
- doc? ( app-doc/doxygen )
- orc? ( >=dev-lang/orc-0.4.15 )
- system-wide? ( dev-util/unifdef )
- test? ( >=dev-libs/check-0.9.10 )
- sys-devel/gettext
- sys-devel/m4
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/pulseaudio-11.1-disable-flat-volumes.patch # bug 627894
- "${FILESDIR}"/${P}-clang.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
-}
-
-src_prepare() {
- default
-
- # Skip test that cannot work with sandbox, bug #501846
- sed -i -e '/lock-autospawn-test /d' src/Makefile.am || die
- sed -i -e 's/lock-autospawn-test$(EXEEXT) //' src/Makefile.in || die
-
- eautoreconf
-}
-
-multilib_src_configure() {
- local myconf=(
- --disable-adrian-aec
- --disable-esound
- --disable-gconf
- --disable-solaris
- --enable-largefile
- --localstatedir="${EPREFIX}"/var
- --with-systemduserunitdir=$(systemd_get_userunitdir)
- --with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
- $(multilib_native_use_enable alsa)
- $(multilib_native_use_enable bluetooth bluez5)
- $(multilib_native_use_enable glib gsettings)
- $(multilib_native_use_enable gtk gtk3)
- $(multilib_native_use_enable jack)
- $(multilib_native_use_enable libsamplerate samplerate)
- $(multilib_native_use_enable lirc)
- $(multilib_native_use_enable orc)
- $(multilib_native_use_enable oss oss-output)
- $(multilib_native_use_enable ssl openssl)
- # tests involve random modules, so just do them for the native
- $(multilib_native_use_enable test default-build-tests)
- $(multilib_native_use_enable udev)
- $(multilib_native_use_enable webrtc-aec)
- $(multilib_native_use_enable zeroconf avahi)
- $(multilib_native_use_with equalizer fftw)
- $(multilib_native_use_with sox soxr)
- $(multilib_native_usex gdbm '--with-database=gdbm' '--with-database=simple')
- $(multilib_native_usex orc "ORCC=${BROOT}/usr/bin/orcc" '')
- $(use_enable glib glib2)
- $(use_enable asyncns)
- $(use_enable cpu_flags_arm_neon neon-opt)
- $(use_enable tcpd tcpwrap)
- $(use_enable dbus)
- $(use_enable X x11)
- $(use_enable systemd systemd-daemon)
- # systemd-login isn't necessary for non-native, but the rest of systemd are; not changing it at this point close to a meson port
- $(use_enable systemd systemd-login)
- $(use_enable systemd systemd-journal)
- $(use_enable ipv6)
- $(use_with caps)
- )
-
- if use elogind && multilib_is_native_abi; then
- local PKGCONFIG="$(tc-getPKG_CONFIG)"
- myconf+=(
- --enable-systemd-login
- SYSTEMDLOGIN_CFLAGS="$(${PKGCONFIG} --cflags "libelogind")"
- SYSTEMDLOGIN_LIBS="$(${PKGCONFIG} --libs "libelogind")"
- )
- fi
-
- if use bluetooth; then
- myconf+=(
- $(multilib_native_use_enable native-headset bluez5-native-headset)
- $(multilib_native_use_enable ofono-headset bluez5-ofono-headset)
- )
- fi
-
- if ! multilib_is_native_abi; then
- myconf+=(
- # hack around unnecessary checks
- # (results don't matter, we're not building anything using it)
- ac_cv_lib_ltdl_lt_dladvise_init=yes
- LIBSPEEX_CFLAGS=' '
- LIBSPEEX_LIBS=' '
- )
- else
- # Make padsp work for non-native ABI, supposedly only possible with glibc; this is used by /usr/bin/padsp that comes from native build, thus we need this argument for native build
- if use elibc_glibc ; then
- myconf+=( --with-pulsedsp-location="${EPREFIX}"'/usr/\\$$LIB/pulseaudio' )
- fi
- 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
- if use doc ; then
- docinto html
- dodoc -r doxygen/html/
- fi
- 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() {
- 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"
-
- # We need /var/run/pulse, bug #442852
- newtmpfiles "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
- else
- # Prevent warnings when system-wide is not used, bug #447694
- if use dbus ; then
- rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf || die
- fi
- fi
-
- if use zeroconf ; then
- sed -e '/module-zeroconf-publish/s:^#::' \
- -i "${ED}/etc/pulse/default.pa" || die
- fi
-
- dodoc NEWS README todo
-
- find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-}
-
-pkg_postinst() {
- gnome2_schemas_update
- if use system-wide; then
- tmpfiles_process "${PN}.conf"
-
- 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"
- 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 equalizer && use qt5; then
- elog "You will need to load some extra modules to make qpaeq work."
- elog "You can do that by adding the following two lines in"
- elog "/etc/pulse/default.pa and restarting pulseaudio:"
- elog "load-module module-equalizer-sink"
- elog "load-module module-dbus-protocol"
- 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
-}
-
-pkg_postrm() {
- gnome2_schemas_update
-}
diff --git a/media-sound/pulseaudio/pulseaudio-15.0-r2.ebuild b/media-sound/pulseaudio/pulseaudio-15.0-r2.ebuild
deleted file mode 100644
index 91cc01e8a068..000000000000
--- a/media-sound/pulseaudio/pulseaudio-15.0-r2.ebuild
+++ /dev/null
@@ -1,375 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-MY_PV="${PV/_pre*}"
-MY_P="${PN}-${MY_PV}"
-
-inherit bash-completion-r1 gnome2-utils meson-multilib optfeature systemd tmpfiles udev
-
-DESCRIPTION="A networked sound server with an advanced plugin system"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
-
-if [[ ${PV} = 9999 ]]; then
- inherit git-r3
- EGIT_BRANCH="master"
- EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}"
-else
- SRC_URI="https://freedesktop.org/software/${PN}/releases/${MY_P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-# 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"
-
-# +alsa-plugin as discussed in bug #519530
-# TODO: Deal with bluez5-gstreamer - requires ldacenc and rtpldacpay gstreamer elements
-# TODO: Find out why webrtc-aec is + prefixed - there's already the always available speexdsp-aec
-# NOTE: The current ebuild sets +X almost certainly just for the pulseaudio.desktop file
-IUSE="+alsa +alsa-plugin +asyncns bluetooth dbus +daemon doc elogind equalizer +gdbm
-gstreamer +glib gtk ipv6 jack lirc native-headset ofono-headset +orc oss selinux sox ssl systemd
-system-wide tcpd test +udev +webrtc-aec +X zeroconf"
-
-RESTRICT="!test? ( test )"
-
-# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
-# Basically all IUSE are either ${MULTILIB_USEDEP} for client libs or they belong under !daemon ()
-# We duplicate alsa-plugin, {native,ofono}-headset under daemon to let users deal with them at once
-REQUIRED_USE="
- alsa-plugin? ( alsa )
- bluetooth? ( dbus )
- daemon? ( ?? ( elogind systemd ) )
- !daemon? (
- !alsa
- !alsa-plugin
- !bluetooth
- !equalizer
- !gdbm
- !gstreamer
- !gtk
- !jack
- !lirc
- !native-headset
- !ofono-headset
- !orc
- !oss
- !sox
- !ssl
- !system-wide
- !udev
- !webrtc-aec
- !zeroconf
- )
- equalizer? ( dbus )
- native-headset? ( bluetooth )
- ofono-headset? ( bluetooth )
- udev? ( || ( alsa oss ) )
- zeroconf? ( dbus )
-"
-
-BDEPEND="
- dev-lang/perl
- dev-perl/XML-Parser
- sys-devel/gettext
- sys-devel/m4
- virtual/libiconv
- virtual/libintl
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
- orc? ( >=dev-lang/orc-0.4.15 )
- system-wide? ( dev-util/unifdef )
-"
-
-# NOTE:
-# - libpcre needed in some cases, bug #472228
-# - media-libs/speexdsp is providing echo canceller implementation
-COMMON_DEPEND="
- >=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}]
- >=media-libs/speexdsp-1.2[${MULTILIB_USEDEP}]
- virtual/libc
- alsa? ( >=media-libs/alsa-lib-1.0.24 )
- asyncns? ( >=net-libs/libasyncns-0.1[${MULTILIB_USEDEP}] )
- bluetooth? (
- >=net-wireless/bluez-5
- media-libs/sbc
- )
- daemon? (
- dev-libs/libltdl
- sys-kernel/linux-headers
- >=sys-libs/libcap-2.22-r2
- )
- dbus? ( >=sys-apps/dbus-1.4.12[${MULTILIB_USEDEP}] )
- elogind? ( sys-auth/elogind )
- equalizer? (
- sci-libs/fftw:3.0
- )
- gdbm? ( sys-libs/gdbm:= )
- glib? ( >=dev-libs/glib-2.28.0:2[${MULTILIB_USEDEP}] )
- gstreamer? (
- media-libs/gst-plugins-base
- >=media-libs/gstreamer-1.14
- )
- gtk? ( x11-libs/gtk+:3 )
- jack? ( virtual/jack )
- lirc? ( app-misc/lirc )
- ofono-headset? ( >=net-misc/ofono-1.13 )
- orc? ( >=dev-lang/orc-0.4.15 )
- selinux? ( sec-policy/selinux-pulseaudio )
- sox? ( >=media-libs/soxr-0.1.1 )
- ssl? ( dev-libs/openssl:= )
- systemd? ( sys-apps/systemd:= )
- tcpd? ( sys-apps/tcp-wrappers )
- udev? ( >=virtual/udev-143[hwdb(+)] )
- webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 )
- X? (
- x11-libs/libX11[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
- daemon? (
- x11-libs/libICE
- x11-libs/libSM
- >=x11-libs/libX11-1.4.0
- >=x11-libs/libXtst-1.0.99.2
- )
- )
- zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
-"
-
-# pulseaudio ships a bundle xmltoman, which uses XML::Parser
-DEPEND="
- ${COMMON_DEPEND}
- dev-libs/libatomic_ops
- dev-libs/libpcre:*
- test? ( >=dev-libs/check-0.9.10 )
- X? ( x11-base/xorg-proto )
-"
-
-# alsa-utils dep is for the alsasound init.d script (see bug 155707); TODO: read it
-# NOTE: Only system-wide needs acct-group/audio unless elogind/systemd is not used
-RDEPEND="
- ${COMMON_DEPEND}
- system-wide? (
- alsa? ( media-sound/alsa-utils )
- acct-user/pulse
- acct-group/audio
- acct-group/pulse-access
- )
-"
-
-# This is a PDEPEND to avoid a circular dep
-PDEPEND="
- alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}] ) )
-"
-
-DOCS=( NEWS README )
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch
-)
-
-src_prepare() {
- default
-
- gnome2_environment_reset
-}
-
-multilib_src_configure() {
- local emesonargs=(
- --localstatedir="${EPREFIX}"/var
-
- $(meson_native_use_bool daemon)
- $(meson_native_use_bool doc doxygen)
- -Dgcov=false
- # tests involve random modules, so just do them for the native # TODO: tests should run always
- $(meson_native_use_bool test tests)
- -Ddatabase=$(multilib_native_usex gdbm gdbm simple) # tdb is also an option but no one cares about it
- -Dstream-restore-clear-old-devices=true
- -Drunning-from-build-tree=false
-
- # Paths
- -Dmodlibexecdir="${EPREFIX}/usr/$(get_libdir)/${PN}/modules" # Was $(get_libdir)/${P}
- -Dsystemduserunitdir=$(systemd_get_userunitdir)
- -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
- -Dbashcompletiondir="$(get_bashcompdir)" # Alternatively DEPEND on app-shells/bash-completion for pkg-config to provide the value
-
- # Optional features
- $(meson_native_use_feature alsa)
- $(meson_feature asyncns)
- $(meson_native_use_feature zeroconf avahi)
- $(meson_native_use_feature bluetooth bluez5)
- -Dbluez5-gstreamer=disabled # no ldacenc/rtpldacpay gst elements packaged yet
- $(meson_native_use_bool native-headset bluez5-native-headset)
- $(meson_native_use_bool ofono-headset bluez5-ofono-headset)
- $(meson_feature dbus)
- $(meson_native_use_feature elogind)
- $(meson_native_use_feature equalizer fftw)
- $(meson_feature glib) # WARNING: toggling this likely changes ABI
- $(meson_native_use_feature glib gsettings) # Supposedly correct?
- $(meson_native_use_feature gstreamer)
- $(meson_native_use_feature gtk)
- -Dhal-compat=true # Consider disabling on next revbump
- $(meson_use ipv6)
- $(meson_native_use_feature jack)
- $(meson_native_use_feature lirc)
- $(meson_native_use_feature ssl openssl)
- $(meson_native_use_feature orc)
- $(meson_native_use_feature oss oss-output)
- -Dsamplerate=disabled # Matches upstream
- $(meson_native_use_feature sox soxr)
- -Dspeex=enabled
- $(meson_native_use_feature systemd)
- $(meson_native_use_feature tcpd tcpwrap) # TODO: This should technically be enabled for 32bit too, but at runtime it probably is never used without daemon?
- $(meson_native_use_feature udev)
- -Dvalgrind=auto
- $(meson_feature X x11)
-
- # Echo cancellation
- -Dadrian-aec=false # Not packaged?
- $(meson_native_use_feature webrtc-aec)
- )
-
- if multilib_is_native_abi; then
- # Make padsp work for non-native ABI, supposedly only possible with glibc;
- # this is used by /usr/bin/padsp that comes from native build, thus we need
- # this argument for native build
- if use elibc_glibc; then
- emesonargs+=( -Dpulsedsp-location="${EPREFIX}"'/usr/\\$$LIB/pulseaudio' )
- fi
- else
- emesonargs+=( -Dman=false )
- if ! use elibc_glibc; then
- # Non-glibc multilib is probably non-existent but just in case:
- ewarn "padsp wrapper for OSS emulation will only work with native ABI applications!"
- fi
- fi
-
- meson_src_configure
-}
-
-multilib_src_compile() {
- meson_src_compile
-
- if multilib_is_native_abi; then
- if use doc; then
- einfo "Generating documentation ..."
- meson_src_compile doxygen
- fi
- fi
-}
-
-multilib_src_install() {
- # The files referenced in the DOCS array do not exist in the multilib source directory,
- # therefore clear the variable when calling the function that will access it.
- DOCS= meson_src_install
-
- if multilib_is_native_abi; then
- if use doc; then
- einfo "Installing documentation ..."
- docinto html
- dodoc -r doxygen/html/.
- fi
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- 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 -x 1 \
- $(use_define zeroconf AVAHI) \
- $(use_define alsa) \
- $(use_define bluetooth) \
- $(use_define udev) \
- "${FILESDIR}"/pulseaudio.init.d-5 \
- > "${T}"/pulseaudio \
- || die
-
- doinitd "${T}"/pulseaudio
-
- systemd_dounit "${FILESDIR}"/${PN}.service
-
- # We need /var/run/pulse, bug 442852
- newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf
- else
- # Prevent warnings when system-wide is not used, bug 447694
- if use dbus && use daemon; then
- rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf || die
- fi
- fi
-
- if use zeroconf; then
- sed -i \
- -e '/module-zeroconf-publish/s:^#::' \
- "${ED}/etc/pulse/default.pa" \
- || die
- fi
-
- find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-}
-
-pkg_postinst() {
- gnome2_schemas_update
-
- if use system-wide; then
- tmpfiles_process "${PN}.conf"
-
- 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 ""
- 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"
- elog ""
- fi
-
- if use equalizer; then
- elog "You will need to load some extra modules to make qpaeq work."
- elog "You can do that by adding the following two lines in"
- elog "/etc/pulse/default.pa and restarting pulseaudio:"
- elog "load-module module-equalizer-sink"
- elog "load-module module-dbus-protocol"
- elog ""
- 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."
- elog ""
- fi
-
- if use systemd && use daemon; then
- elog "It's recommended to start pulseaudio via its systemd user units:"
- elog ""
- elog " systemctl --user enable pulseaudio.service pulseaudio.socket"
- elog ""
- elog "The change from autospawn to user units will take effect after restarting."
- elog ""
- fi
-
- optfeature_header "PulseAudio can be enhanced by installing the following:"
- use equalizer && optfeature "using the qpaeq script" dev-python/PyQt5[dbus,widgets]
- use dbus && optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
-}
-
-pkg_postrm() {
- gnome2_schemas_update
-}
diff --git a/media-sound/pulseaudio/pulseaudio-15.0-r3.ebuild b/media-sound/pulseaudio/pulseaudio-15.0-r3.ebuild
deleted file mode 100644
index 85f1d2a7a9a7..000000000000
--- a/media-sound/pulseaudio/pulseaudio-15.0-r3.ebuild
+++ /dev/null
@@ -1,382 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-MY_PV="${PV/_pre*}"
-MY_P="${PN}-${MY_PV}"
-
-inherit bash-completion-r1 gnome2-utils meson-multilib optfeature systemd tmpfiles udev
-
-DESCRIPTION="A networked sound server with an advanced plugin system"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
-
-if [[ ${PV} = 9999 ]]; then
- inherit git-r3
- EGIT_BRANCH="master"
- EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}"
-else
- SRC_URI="https://freedesktop.org/software/${PN}/releases/${MY_P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-# 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"
-
-# +alsa-plugin as discussed in bug #519530
-# TODO: Find out why webrtc-aec is + prefixed - there's already the always available speexdsp-aec
-# NOTE: The current ebuild sets +X almost certainly just for the pulseaudio.desktop file
-IUSE="+alsa +alsa-plugin aptx +asyncns bluetooth dbus +daemon doc elogind equalizer +gdbm
-gstreamer +glib gtk ipv6 jack ldac lirc native-headset ofono-headset +orc oss selinux sox ssl systemd
-system-wide tcpd test +udev +webrtc-aec +X zeroconf"
-
-RESTRICT="!test? ( test )"
-
-# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
-# Basically all IUSE are either ${MULTILIB_USEDEP} for client libs or they belong under !daemon ()
-# We duplicate alsa-plugin, {native,ofono}-headset under daemon to let users deal with them at once
-REQUIRED_USE="
- alsa-plugin? ( alsa )
- bluetooth? ( dbus )
- daemon? ( ?? ( elogind systemd ) )
- !daemon? (
- !alsa
- !alsa-plugin
- !bluetooth
- !equalizer
- !gdbm
- !gstreamer
- !gtk
- !jack
- !lirc
- !native-headset
- !ofono-headset
- !orc
- !oss
- !sox
- !ssl
- !system-wide
- !udev
- !webrtc-aec
- !zeroconf
- )
- equalizer? ( dbus )
- native-headset? ( bluetooth )
- ofono-headset? ( bluetooth )
- udev? ( || ( alsa oss ) )
- zeroconf? ( dbus )
-"
-
-BDEPEND="
- dev-lang/perl
- dev-perl/XML-Parser
- sys-devel/gettext
- sys-devel/m4
- virtual/libiconv
- virtual/libintl
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
- orc? ( >=dev-lang/orc-0.4.15 )
- system-wide? ( dev-util/unifdef )
-"
-
-# NOTE:
-# - libpcre needed in some cases, bug #472228
-# - media-libs/speexdsp is providing echo canceller implementation
-COMMON_DEPEND="
- >=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}]
- >=media-libs/speexdsp-1.2[${MULTILIB_USEDEP}]
- virtual/libc
- alsa? ( >=media-libs/alsa-lib-1.0.24 )
- asyncns? ( >=net-libs/libasyncns-0.1[${MULTILIB_USEDEP}] )
- bluetooth? (
- >=net-wireless/bluez-5
- media-libs/sbc
- )
- daemon? (
- dev-libs/libltdl
- sys-kernel/linux-headers
- >=sys-libs/libcap-2.22-r2
- )
- dbus? ( >=sys-apps/dbus-1.4.12[${MULTILIB_USEDEP}] )
- elogind? ( sys-auth/elogind )
- equalizer? (
- sci-libs/fftw:3.0
- )
- gdbm? ( sys-libs/gdbm:= )
- glib? ( >=dev-libs/glib-2.28.0:2[${MULTILIB_USEDEP}] )
- gstreamer? (
- media-libs/gst-plugins-base
- >=media-libs/gstreamer-1.14
- )
- gtk? ( x11-libs/gtk+:3 )
- jack? ( virtual/jack )
- lirc? ( app-misc/lirc )
- ofono-headset? ( >=net-misc/ofono-1.13 )
- orc? ( >=dev-lang/orc-0.4.15 )
- selinux? ( sec-policy/selinux-pulseaudio )
- sox? ( >=media-libs/soxr-0.1.1 )
- ssl? ( dev-libs/openssl:= )
- systemd? ( sys-apps/systemd:= )
- tcpd? ( sys-apps/tcp-wrappers )
- udev? ( >=virtual/udev-143[hwdb(+)] )
- webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 )
- X? (
- x11-libs/libX11[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
- daemon? (
- x11-libs/libICE
- x11-libs/libSM
- >=x11-libs/libX11-1.4.0
- >=x11-libs/libXtst-1.0.99.2
- )
- )
- zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
-"
-
-# pulseaudio ships a bundle xmltoman, which uses XML::Parser
-DEPEND="
- ${COMMON_DEPEND}
- dev-libs/libatomic_ops
- dev-libs/libpcre:*
- test? ( >=dev-libs/check-0.9.10 )
- X? ( x11-base/xorg-proto )
-"
-
-# alsa-utils dep is for the alsasound init.d script (see bug 155707); TODO: read it
-# NOTE: Only system-wide needs acct-group/audio unless elogind/systemd is not used
-RDEPEND="
- ${COMMON_DEPEND}
- system-wide? (
- alsa? ( media-sound/alsa-utils )
- acct-user/pulse
- acct-group/audio
- acct-group/pulse-access
- )
- daemon? (
- bluetooth? (
- gstreamer? (
- ldac? ( media-plugins/gst-plugins-ldac )
- aptx? ( media-plugins/gst-plugins-openaptx )
- )
- )
- )
-"
-
-# This is a PDEPEND to avoid a circular dep
-PDEPEND="
- alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}] ) )
-"
-
-DOCS=( NEWS README )
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch
-)
-
-src_prepare() {
- default
-
- gnome2_environment_reset
-}
-
-multilib_src_configure() {
- local emesonargs=(
- --localstatedir="${EPREFIX}"/var
-
- $(meson_native_use_bool daemon)
- $(meson_native_use_bool doc doxygen)
- -Dgcov=false
- # tests involve random modules, so just do them for the native # TODO: tests should run always
- $(meson_native_use_bool test tests)
- -Ddatabase=$(multilib_native_usex gdbm gdbm simple) # tdb is also an option but no one cares about it
- -Dstream-restore-clear-old-devices=true
- -Drunning-from-build-tree=false
-
- # Paths
- -Dmodlibexecdir="${EPREFIX}/usr/$(get_libdir)/${PN}/modules" # Was $(get_libdir)/${P}
- -Dsystemduserunitdir=$(systemd_get_userunitdir)
- -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
- -Dbashcompletiondir="$(get_bashcompdir)" # Alternatively DEPEND on app-shells/bash-completion for pkg-config to provide the value
-
- # Optional features
- $(meson_native_use_feature alsa)
- $(meson_feature asyncns)
- $(meson_native_use_feature zeroconf avahi)
- $(meson_native_use_feature bluetooth bluez5)
- $(meson_native_use_feature gstreamer bluez5-gstreamer)
- $(meson_native_use_bool native-headset bluez5-native-headset)
- $(meson_native_use_bool ofono-headset bluez5-ofono-headset)
- $(meson_feature dbus)
- $(meson_native_use_feature elogind)
- $(meson_native_use_feature equalizer fftw)
- $(meson_feature glib) # WARNING: toggling this likely changes ABI
- $(meson_native_use_feature glib gsettings) # Supposedly correct?
- $(meson_native_use_feature gstreamer)
- $(meson_native_use_feature gtk)
- -Dhal-compat=true # Consider disabling on next revbump
- $(meson_use ipv6)
- $(meson_native_use_feature jack)
- $(meson_native_use_feature lirc)
- $(meson_native_use_feature ssl openssl)
- $(meson_native_use_feature orc)
- $(meson_native_use_feature oss oss-output)
- -Dsamplerate=disabled # Matches upstream
- $(meson_native_use_feature sox soxr)
- -Dspeex=enabled
- $(meson_native_use_feature systemd)
- $(meson_native_use_feature tcpd tcpwrap) # TODO: This should technically be enabled for 32bit too, but at runtime it probably is never used without daemon?
- $(meson_native_use_feature udev)
- -Dvalgrind=auto
- $(meson_feature X x11)
-
- # Echo cancellation
- -Dadrian-aec=false # Not packaged?
- $(meson_native_use_feature webrtc-aec)
- )
-
- if multilib_is_native_abi; then
- # Make padsp work for non-native ABI, supposedly only possible with glibc;
- # this is used by /usr/bin/padsp that comes from native build, thus we need
- # this argument for native build
- if use elibc_glibc; then
- emesonargs+=( -Dpulsedsp-location="${EPREFIX}"'/usr/\\$$LIB/pulseaudio' )
- fi
- else
- emesonargs+=( -Dman=false )
- if ! use elibc_glibc; then
- # Non-glibc multilib is probably non-existent but just in case:
- ewarn "padsp wrapper for OSS emulation will only work with native ABI applications!"
- fi
- fi
-
- meson_src_configure
-}
-
-multilib_src_compile() {
- meson_src_compile
-
- if multilib_is_native_abi; then
- if use doc; then
- einfo "Generating documentation ..."
- meson_src_compile doxygen
- fi
- fi
-}
-
-multilib_src_install() {
- # The files referenced in the DOCS array do not exist in the multilib source directory,
- # therefore clear the variable when calling the function that will access it.
- DOCS= meson_src_install
-
- if multilib_is_native_abi; then
- if use doc; then
- einfo "Installing documentation ..."
- docinto html
- dodoc -r doxygen/html/.
- fi
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- 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 -x 1 \
- $(use_define zeroconf AVAHI) \
- $(use_define alsa) \
- $(use_define bluetooth) \
- $(use_define udev) \
- "${FILESDIR}"/pulseaudio.init.d-5 \
- > "${T}"/pulseaudio \
- || die
-
- doinitd "${T}"/pulseaudio
-
- systemd_dounit "${FILESDIR}"/${PN}.service
-
- # We need /var/run/pulse, bug 442852
- newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf
- else
- # Prevent warnings when system-wide is not used, bug 447694
- if use dbus && use daemon; then
- rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf || die
- fi
- fi
-
- if use zeroconf; then
- sed -i \
- -e '/module-zeroconf-publish/s:^#::' \
- "${ED}/etc/pulse/default.pa" \
- || die
- fi
-
- find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-}
-
-pkg_postinst() {
- gnome2_schemas_update
-
- if use system-wide; then
- tmpfiles_process "${PN}.conf"
-
- 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 ""
- 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"
- elog ""
- fi
-
- if use equalizer; then
- elog "You will need to load some extra modules to make qpaeq work."
- elog "You can do that by adding the following two lines in"
- elog "/etc/pulse/default.pa and restarting pulseaudio:"
- elog "load-module module-equalizer-sink"
- elog "load-module module-dbus-protocol"
- elog ""
- 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."
- elog ""
- fi
-
- if use systemd && use daemon; then
- elog "It's recommended to start pulseaudio via its systemd user units:"
- elog ""
- elog " systemctl --user enable pulseaudio.service pulseaudio.socket"
- elog ""
- elog "The change from autospawn to user units will take effect after restarting."
- elog ""
- fi
-
- optfeature_header "PulseAudio can be enhanced by installing the following:"
- use equalizer && optfeature "using the qpaeq script" dev-python/PyQt5[dbus,widgets]
- use dbus && optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
-}
-
-pkg_postrm() {
- gnome2_schemas_update
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-07-31 3:40 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-02 17:09 [gentoo-commits] repo/gentoo:master commit in: media-sound/pulseaudio/, media-sound/pulseaudio/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2018-12-28 7:48 Mart Raudsepp
2019-06-30 11:23 Pacho Ramos
2021-06-21 0:26 Thomas Deutschmann
2021-06-21 11:18 Thomas Deutschmann
2021-08-18 20:10 Sam James
2022-07-31 3:40 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox