Gentoo Archives: gentoo-commits

From: Jory Pratt <anarchy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/musl:master commit in: media-sound/pulseaudio/, media-sound/pulseaudio/files/
Date: Tue, 05 Jun 2018 00:21:28
Message-Id: 1528158053.f36379f0f00305d698e6ba41194142fffb1e14fb.anarchy@gentoo
1 commit: f36379f0f00305d698e6ba41194142fffb1e14fb
2 Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jun 5 00:20:53 2018 +0000
4 Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 5 00:20:53 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=f36379f0
7
8 media-sound/pulseaudio: sync with changes in main tree
9
10 media-sound/pulseaudio/Manifest | 2 +-
11 .../pulseaudio-11.1-disable-flat-volumes.patch | 48 +++
12 .../files/pulseaudio-11.1-glibc-2.27.patch | 59 ++++
13 .../files/pulseaudio-11.1-qpaeq-pyqt5-1.patch | 198 +++++++++++
14 .../files/pulseaudio-11.1-qpaeq-pyqt5-2.patch | 31 ++
15 media-sound/pulseaudio/pulseaudio-11.1-r1.ebuild | 364 +++++++++++++++++++++
16 6 files changed, 701 insertions(+), 1 deletion(-)
17
18 diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
19 index 24a4d7c..cc69a64 100644
20 --- a/media-sound/pulseaudio/Manifest
21 +++ b/media-sound/pulseaudio/Manifest
22 @@ -1,3 +1,3 @@
23 DIST pulseaudio-10.0.tar.xz 1608040 SHA256 a3186824de9f0d2095ded5d0d0db0405dc73133983c2fbb37291547e37462f57 SHA512 11d98b4b2000a41bdea92df253409452bc9b77d8bb309b6d14c439e3b902e3f90c69da00daff409e3859a54ad01c63a75be5723616bdcb492801d622a6406481 WHIRLPOOL 6d03d8cf7b96cbb46a8cc5f7810f7cf1c4187aa9321483d5e56435874b218d437bc66860d25a149be59ca73de7118916e05e481758e04619e099cb9a50dcb119
24 DIST pulseaudio-10.99.1.tar.xz 1635836 SHA256 c9791844569d8d0adb468c183d0d9fb6ac12b9db34a4a078a7773c8bac993f32 SHA512 410758da3cf3431b5810b9a5790d60ed8fe0bba58f621f4ca8e7ba66be8dcdd53cbd8284105ee6694b04f81a37791c3e8c5fe4af3ee034e89dff0b66fdbde006 WHIRLPOOL c8dfe0e4ab54029fdc3b47fb43282406908b7993ee155d6aaa9919419fb4e58a8f1df34bc569a33697a02533979c6ff4002944a20ed96c1246993eb3b97b7eb3
25 -DIST pulseaudio-11.1.tar.xz 1648924 SHA256 f2521c525a77166189e3cb9169f75c2ee2b82fa3fcf9476024fbc2c3a6c9cd9e SHA512 8863d8d7aede0d9a4d158e84e7bece91747c335f9ac98c7b21fafe76b762f8817e1125307aa46e561e540d2c40525e91f51a55ec34ac55d58fd5980199856a7a WHIRLPOOL 53e6d83853dff5dc4291403506277fc832e60d8e55f555e39e377903856668c2f158a600019719902f30827d707850391aa4cc0bb07664864d87d5fc175c912f
26 +DIST pulseaudio-11.1.tar.xz 1648924 BLAKE2B eea767efb6529436a6c2aa7d5ccaccdbda2338ad8db639ad333598b1589d259acf71ef34e904a240710f5343864fa868789eaa7f7cae1b07902ebd989fe83e12 SHA512 8863d8d7aede0d9a4d158e84e7bece91747c335f9ac98c7b21fafe76b762f8817e1125307aa46e561e540d2c40525e91f51a55ec34ac55d58fd5980199856a7a
27
28 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
29 new file mode 100644
30 index 0000000..40b23ec
31 --- /dev/null
32 +++ b/media-sound/pulseaudio/files/pulseaudio-11.1-disable-flat-volumes.patch
33 @@ -0,0 +1,48 @@
34 +diff -up a/man/pulse-daemon.conf.5.xml.in b/man/pulse-daemon.conf.5.xml.in
35 +--- a/man/pulse-daemon.conf.5.xml.in 2016-05-26 23:21:17.000000000 -0500
36 ++++ b/man/pulse-daemon.conf.5.xml.in 2016-05-31 10:01:55.679976730 -0500
37 +@@ -220,7 +220,7 @@ License along with PulseAudio; if not, s
38 + <p><opt>flat-volumes=</opt> Enable 'flat' volumes, i.e. where
39 + possible let the sink volume equal the maximum of the volumes of
40 + the inputs connected to it. Takes a boolean argument, defaults
41 +- to <opt>yes</opt>.</p>
42 ++ to <opt>no</opt>.</p>
43 + </option>
44 +
45 + </section>
46 +diff -up a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c
47 +--- a/src/daemon/daemon-conf.c 2016-05-26 23:21:17.000000000 -0500
48 ++++ b/src/daemon/daemon-conf.c 2016-05-31 10:01:55.680976735 -0500
49 +@@ -68,7 +68,7 @@ static const pa_daemon_conf default_conf
50 + .realtime_priority = 5, /* Half of JACK's default rtprio */
51 + .disallow_module_loading = false,
52 + .disallow_exit = false,
53 +- .flat_volumes = true,
54 ++ .flat_volumes = false,
55 + .exit_idle_time = 20,
56 + .scache_idle_time = 20,
57 + .script_commands = NULL,
58 +diff -up a/src/daemon/daemon.conf.in b/src/daemon/daemon.conf.in
59 +--- a/src/daemon/daemon.conf.in 2016-05-31 10:01:55.680976735 -0500
60 ++++ b/src/daemon/daemon.conf.in 2016-05-31 10:02:28.048133267 -0500
61 +@@ -57,7 +57,7 @@ ifelse(@HAVE_DBUS@, 1, [dnl
62 + ; enable-lfe-remixing = no
63 + ; lfe-crossover-freq = 0
64 +
65 +-; flat-volumes = yes
66 ++; flat-volumes = no
67 +
68 + ifelse(@HAVE_SYS_RESOURCE_H@, 1, [dnl
69 + ; rlimit-fsize = -1
70 +diff -up a/src/pulsecore/core.c b/src/pulsecore/core.c
71 +--- a/src/pulsecore/core.c 2016-05-26 23:21:17.000000000 -0500
72 ++++ b/src/pulsecore/core.c 2016-05-31 10:01:55.681976740 -0500
73 +@@ -135,7 +135,7 @@ pa_core* pa_core_new(pa_mainloop_api *m,
74 + c->exit_idle_time = -1;
75 + c->scache_idle_time = 20;
76 +
77 +- c->flat_volumes = true;
78 ++ c->flat_volumes = false;
79 + c->disallow_module_loading = false;
80 + c->disallow_exit = false;
81 + c->running_as_daemon = false;
82
83 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
84 new file mode 100644
85 index 0000000..a89167b
86 --- /dev/null
87 +++ b/media-sound/pulseaudio/files/pulseaudio-11.1-glibc-2.27.patch
88 @@ -0,0 +1,59 @@
89 +From: Tanu Kaskinen <tanuk@×××.fi>
90 +Date: Wed, 24 Jan 2018 03:51:49 +0200
91 +Subject: memfd-wrappers: only define memfd_create() if not already defined
92 +
93 +glibc 2.27 is to be released soon, and it will provide memfd_create().
94 +If glibc provides the function, we must not define it ourselves,
95 +otherwise building fails due to conflict between the two implementations
96 +of the same function.
97 +
98 +BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=104733
99 +(cherry picked from commit dfb0460fb4743aec047cdf755a660a9ac2d0f3fb)
100 +---
101 + configure.ac | 3 +++
102 + src/pulsecore/memfd-wrappers.h | 7 ++++---
103 + 2 files changed, 7 insertions(+), 3 deletions(-)
104 +
105 +diff --git a/configure.ac b/configure.ac
106 +index 77b5ff5..3a71fd8 100644
107 +--- a/configure.ac
108 ++++ b/configure.ac
109 +@@ -607,6 +607,9 @@ AS_IF([test "x$enable_memfd" = "xyes" && test "x$HAVE_MEMFD" = "x0"],
110 + [AC_MSG_ERROR([*** Your Linux kernel does not support memfd shared memory.
111 + *** Use linux v3.17 or higher for such a feature.])])
112 +
113 ++AS_IF([test "x$HAVE_MEMFD" = "x1"],
114 ++ AC_CHECK_FUNCS([memfd_create]))
115 ++
116 + AC_SUBST(HAVE_MEMFD)
117 + AM_CONDITIONAL([HAVE_MEMFD], [test "x$HAVE_MEMFD" = x1])
118 + AS_IF([test "x$HAVE_MEMFD" = "x1"], AC_DEFINE([HAVE_MEMFD], 1, [Have memfd shared memory.]))
119 +diff --git a/src/pulsecore/memfd-wrappers.h b/src/pulsecore/memfd-wrappers.h
120 +index 3bed9b2..c7aadfd 100644
121 +--- a/src/pulsecore/memfd-wrappers.h
122 ++++ b/src/pulsecore/memfd-wrappers.h
123 +@@ -20,13 +20,14 @@
124 + License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
125 + ***/
126 +
127 +-#ifdef HAVE_MEMFD
128 ++#if defined(HAVE_MEMFD) && !defined(HAVE_MEMFD_CREATE)
129 +
130 + #include <sys/syscall.h>
131 + #include <fcntl.h>
132 +
133 + /*
134 +- * No glibc wrappers exist for memfd_create(2), so provide our own.
135 ++ * Before glibc version 2.27 there was no wrapper for memfd_create(2),
136 ++ * so we have to provide our own.
137 + *
138 + * Also define memfd fcntl sealing macros. While they are already
139 + * defined in the kernel header file <linux/fcntl.h>, that file as
140 +@@ -63,6 +64,6 @@ static inline int memfd_create(const char *name, unsigned int flags) {
141 + #define F_SEAL_WRITE 0x0008 /* prevent writes */
142 + #endif
143 +
144 +-#endif /* HAVE_MEMFD */
145 ++#endif /* HAVE_MEMFD && !HAVE_MEMFD_CREATE */
146 +
147 + #endif
148
149 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
150 new file mode 100644
151 index 0000000..62012c1
152 --- /dev/null
153 +++ b/media-sound/pulseaudio/files/pulseaudio-11.1-qpaeq-pyqt5-1.patch
154 @@ -0,0 +1,198 @@
155 +From: =?utf-8?q?Andrius_=C5=A0tikonas?= <andrius@××××××××.eu>
156 +Date: Mon, 20 Nov 2017 19:56:53 +0000
157 +Subject: qpaeq: port to PyQt5
158 +
159 +(cherry picked from commit 480e0e74f43565d7ece72141666961ae8cc2ed75)
160 +---
161 + src/utils/qpaeq | 68 ++++++++++++++++++++++++++++-----------------------------
162 + 1 file changed, 34 insertions(+), 34 deletions(-)
163 +
164 +diff --git a/src/utils/qpaeq b/src/utils/qpaeq
165 +index ac4b9e4..508b233 100755
166 +--- a/src/utils/qpaeq
167 ++++ b/src/utils/qpaeq
168 +@@ -18,13 +18,13 @@
169 +
170 + import os,math,sys
171 + try:
172 +- import PyQt4,sip
173 +- from PyQt4 import QtGui,QtCore
174 ++ import PyQt5,sip
175 ++ from PyQt5 import QtWidgets,QtCore
176 + import dbus.mainloop.qt
177 + import dbus
178 + except ImportError as e:
179 + sys.stderr.write('There was an error importing needed libraries\n'
180 +- 'Make sure you have qt4 and dbus-python installed\n'
181 ++ 'Make sure you have qt5 and dbus-python installed\n'
182 + 'The error that occured was:\n'
183 + '\t%s\n' % (str(e)))
184 + sys.exit(-1)
185 +@@ -62,7 +62,7 @@ def connect():
186 + prop_iface='org.freedesktop.DBus.Properties'
187 + eq_iface='org.PulseAudio.Ext.Equalizing1.Equalizer'
188 + device_iface='org.PulseAudio.Core1.Device'
189 +-class QPaeq(QtGui.QWidget):
190 ++class QPaeq(QtWidgets.QWidget):
191 + manager_path='/org/pulseaudio/equalizing1'
192 + manager_iface='org.PulseAudio.Ext.Equalizing1.Manager'
193 + core_iface='org.PulseAudio.Core1'
194 +@@ -70,7 +70,7 @@ class QPaeq(QtGui.QWidget):
195 + module_name='module-equalizer-sink'
196 +
197 + def __init__(self):
198 +- QtGui.QWidget.__init__(self)
199 ++ QtWidgets.QWidget.__init__(self)
200 + self.setWindowTitle('qpaeq')
201 + self.slider_widget=None
202 + self.sink_name=None
203 +@@ -84,50 +84,50 @@ class QPaeq(QtGui.QWidget):
204 + self.setMinimumSize(self.sizeHint())
205 +
206 + def create_layout(self):
207 +- self.main_layout=QtGui.QVBoxLayout()
208 ++ self.main_layout=QtWidgets.QVBoxLayout()
209 + self.setLayout(self.main_layout)
210 +- toprow_layout=QtGui.QHBoxLayout()
211 +- sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed)
212 ++ toprow_layout=QtWidgets.QHBoxLayout()
213 ++ sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
214 + sizePolicy.setHorizontalStretch(0)
215 + sizePolicy.setVerticalStretch(0)
216 + #sizePolicy.setHeightForWidth(self.profile_box.sizePolicy().hasHeightForWidth())
217 +
218 +- toprow_layout.addWidget(QtGui.QLabel('Sink'))
219 +- self.sink_box = QtGui.QComboBox()
220 ++ toprow_layout.addWidget(QtWidgets.QLabel('Sink'))
221 ++ self.sink_box = QtWidgets.QComboBox()
222 + self.sink_box.setSizePolicy(sizePolicy)
223 + self.sink_box.setDuplicatesEnabled(False)
224 +- self.sink_box.setInsertPolicy(QtGui.QComboBox.InsertAlphabetically)
225 +- #self.sink_box.setSizeAdjustPolicy(QtGui.QComboBox.AdjustToContents)
226 ++ self.sink_box.setInsertPolicy(QtWidgets.QComboBox.InsertAlphabetically)
227 ++ #self.sink_box.setSizeAdjustPolicy(QtWidgets.QComboBox.AdjustToContents)
228 + toprow_layout.addWidget(self.sink_box)
229 +
230 +- toprow_layout.addWidget(QtGui.QLabel('Channel'))
231 +- self.channel_box = QtGui.QComboBox()
232 ++ toprow_layout.addWidget(QtWidgets.QLabel('Channel'))
233 ++ self.channel_box = QtWidgets.QComboBox()
234 + self.channel_box.setSizePolicy(sizePolicy)
235 + toprow_layout.addWidget(self.channel_box)
236 +
237 +- toprow_layout.addWidget(QtGui.QLabel('Preset'))
238 +- self.profile_box = QtGui.QComboBox()
239 ++ toprow_layout.addWidget(QtWidgets.QLabel('Preset'))
240 ++ self.profile_box = QtWidgets.QComboBox()
241 + self.profile_box.setSizePolicy(sizePolicy)
242 +- self.profile_box.setInsertPolicy(QtGui.QComboBox.InsertAlphabetically)
243 +- #self.profile_box.setSizeAdjustPolicy(QtGui.QComboBox.AdjustToContents)
244 ++ self.profile_box.setInsertPolicy(QtWidgets.QComboBox.InsertAlphabetically)
245 ++ #self.profile_box.setSizeAdjustPolicy(QtWidgets.QComboBox.AdjustToContents)
246 + toprow_layout.addWidget(self.profile_box)
247 +
248 +- large_icon_size=self.style().pixelMetric(QtGui.QStyle.PM_LargeIconSize)
249 ++ large_icon_size=self.style().pixelMetric(QtWidgets.QStyle.PM_LargeIconSize)
250 + large_icon_size=QtCore.QSize(large_icon_size,large_icon_size)
251 +- save_profile=QtGui.QToolButton()
252 +- save_profile.setIcon(self.style().standardIcon(QtGui.QStyle.SP_DriveFDIcon))
253 ++ save_profile=QtWidgets.QToolButton()
254 ++ save_profile.setIcon(self.style().standardIcon(QtWidgets.QStyle.SP_DriveFDIcon))
255 + save_profile.setIconSize(large_icon_size)
256 + save_profile.setToolButtonStyle(QtCore.Qt.ToolButtonIconOnly)
257 + save_profile.clicked.connect(self.save_profile)
258 +- remove_profile=QtGui.QToolButton()
259 +- remove_profile.setIcon(self.style().standardIcon(QtGui.QStyle.SP_TrashIcon))
260 ++ remove_profile=QtWidgets.QToolButton()
261 ++ remove_profile.setIcon(self.style().standardIcon(QtWidgets.QStyle.SP_TrashIcon))
262 + remove_profile.setIconSize(large_icon_size)
263 + remove_profile.setToolButtonStyle(QtCore.Qt.ToolButtonIconOnly)
264 + remove_profile.clicked.connect(self.remove_profile)
265 + toprow_layout.addWidget(save_profile)
266 + toprow_layout.addWidget(remove_profile)
267 +
268 +- reset_button = QtGui.QPushButton('Reset')
269 ++ reset_button = QtWidgets.QPushButton('Reset')
270 + reset_button.clicked.connect(self.reset)
271 + toprow_layout.addStretch()
272 + toprow_layout.addWidget(reset_button)
273 +@@ -192,11 +192,11 @@ class QPaeq(QtGui.QWidget):
274 + def save_profile(self):
275 + #popup dialog box for name
276 + current=self.profile_box.currentIndex()
277 +- profile,ok=QtGui.QInputDialog.getItem(self,'Preset Name','Preset',self.profiles,current)
278 ++ profile,ok=QtWidgets.QInputDialog.getItem(self,'Preset Name','Preset',self.profiles,current)
279 + if not ok or profile=='':
280 + return
281 + if profile in self.profiles:
282 +- mbox=QtGui.QMessageBox(self)
283 ++ mbox=QtWidgets.QMessageBox(self)
284 + mbox.setText('%s preset already exists'%(profile,))
285 + mbox.setInformativeText('Do you want to save over it?')
286 + mbox.setStandardButtons(mbox.Save|mbox.Discard|mbox.Cancel)
287 +@@ -217,7 +217,7 @@ class QPaeq(QtGui.QWidget):
288 + profile=self.profile_box.itemText(x)
289 + self.filter_state.load_profile(profile)
290 + def select_channel(self,x):
291 +- self.filter_state.channel = self.channel_box.itemData(x).toPyObject()
292 ++ self.filter_state.channel = self.channel_box.itemData(x)
293 + self._set_profile_name()
294 + self.filter_state.readback()
295 +
296 +@@ -295,13 +295,13 @@ class QPaeq(QtGui.QWidget):
297 + self.profile_box.blockSignals(False)
298 +
299 +
300 +-class SliderArray(QtGui.QWidget):
301 ++class SliderArray(QtWidgets.QWidget):
302 + def __init__(self,filter_state,parent=None):
303 + super(SliderArray,self).__init__(parent)
304 + #self.setStyleSheet('padding: 0px; border-width: 0px; margin: 0px;')
305 + #self.setStyleSheet('font-family: monospace;'+outline%('blue'))
306 + self.filter_state=filter_state
307 +- self.setLayout(QtGui.QHBoxLayout())
308 ++ self.setLayout(QtWidgets.QHBoxLayout())
309 + self.sub_array=None
310 + self.set_sub_array(SliderArraySub(self.filter_state))
311 + self.inhibit_resize=0
312 +@@ -359,11 +359,11 @@ class SliderArray(QtGui.QWidget):
313 + self.set_sub_array(SliderArraySub(self.filter_state))
314 + self.inhibit_resize-=1
315 +
316 +-class SliderArraySub(QtGui.QWidget):
317 ++class SliderArraySub(QtWidgets.QWidget):
318 + def __init__(self,filter_state,parent=None):
319 + super(SliderArraySub,self).__init__(parent)
320 + self.filter_state=filter_state
321 +- self.setLayout(QtGui.QGridLayout())
322 ++ self.setLayout(QtWidgets.QGridLayout())
323 + self.slider=[None]*len(self.filter_state.frequencies)
324 + self.label=[None]*len(self.slider)
325 + #self.setStyleSheet('padding: 0px; border-width: 0px; margin: 0px;')
326 +@@ -375,7 +375,7 @@ class SliderArraySub(QtGui.QWidget):
327 + self.layout().addWidget(label,1,c,qt.AlignHCenter)
328 + self.layout().setColumnMinimumWidth(c,max(label.sizeHint().width(),slider.sizeHint().width()))
329 + def create_slider(slider_label):
330 +- slider=QtGui.QSlider(QtCore.Qt.Vertical,self)
331 ++ slider=QtWidgets.QSlider(QtCore.Qt.Vertical,self)
332 + label=SliderLabel(slider_label,filter_state,self)
333 + slider.setRange(-1000,2000)
334 + slider.setSingleStep(1)
335 +@@ -461,7 +461,7 @@ class SliderArraySub(QtGui.QWidget):
336 + return int((x-1.0)*1000)
337 + outline='border-width: 1px; border-style: solid; border-color: %s;'
338 +
339 +-class SliderLabel(QtGui.QLabel):
340 ++class SliderLabel(QtWidgets.QLabel):
341 + clicked=QtCore.pyqtSignal()
342 + def __init__(self,label_text,filter_state,parent=None):
343 + super(SliderLabel,self).__init__(parent)
344 +@@ -566,7 +566,7 @@ def subdivide(xs, t_points):
345 +
346 + def main():
347 + dbus.mainloop.qt.DBusQtMainLoop(set_as_default=True)
348 +- app=QtGui.QApplication(sys.argv)
349 ++ app=QtWidgets.QApplication(sys.argv)
350 + qpaeq_main=QPaeq()
351 + qpaeq_main.show()
352 + sys.exit(app.exec_())
353
354 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
355 new file mode 100644
356 index 0000000..7706bfb
357 --- /dev/null
358 +++ b/media-sound/pulseaudio/files/pulseaudio-11.1-qpaeq-pyqt5-2.patch
359 @@ -0,0 +1,31 @@
360 +From: Felipe Sateler <fsateler@××××××.org>
361 +Date: Thu, 5 Apr 2018 15:44:26 -0300
362 +Subject: Use the pyqt5 dbus mainloop integration
363 +
364 +Forwarded: https://bugs.freedesktop.org/show_bug.cgi?id=102572
365 +---
366 + src/utils/qpaeq | 4 ++--
367 + 1 file changed, 2 insertions(+), 2 deletions(-)
368 +
369 +diff --git a/src/utils/qpaeq b/src/utils/qpaeq
370 +index 508b233..a319dad 100755
371 +--- a/src/utils/qpaeq
372 ++++ b/src/utils/qpaeq
373 +@@ -20,7 +20,7 @@ import os,math,sys
374 + try:
375 + import PyQt5,sip
376 + from PyQt5 import QtWidgets,QtCore
377 +- import dbus.mainloop.qt
378 ++ import dbus.mainloop.pyqt5
379 + import dbus
380 + except ImportError as e:
381 + sys.stderr.write('There was an error importing needed libraries\n'
382 +@@ -565,7 +565,7 @@ def subdivide(xs, t_points):
383 + return left+right
384 +
385 + def main():
386 +- dbus.mainloop.qt.DBusQtMainLoop(set_as_default=True)
387 ++ dbus.mainloop.pyqt5.DBusQtMainLoop(set_as_default=True)
388 + app=QtWidgets.QApplication(sys.argv)
389 + qpaeq_main=QPaeq()
390 + qpaeq_main.show()
391
392 diff --git a/media-sound/pulseaudio/pulseaudio-11.1-r1.ebuild b/media-sound/pulseaudio/pulseaudio-11.1-r1.ebuild
393 new file mode 100644
394 index 0000000..cc82065
395 --- /dev/null
396 +++ b/media-sound/pulseaudio/pulseaudio-11.1-r1.ebuild
397 @@ -0,0 +1,364 @@
398 +# Copyright 1999-2018 Gentoo Foundation
399 +# Distributed under the terms of the GNU General Public License v2
400 +
401 +EAPI=6
402 +
403 +inherit autotools bash-completion-r1 eutils flag-o-matic gnome2-utils linux-info systemd user versionator udev multilib-minimal
404 +
405 +DESCRIPTION="A networked sound server with an advanced plugin system"
406 +HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
407 +SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
408 +
409 +# libpulse-simple and libpulse link to libpulse-core; this is daemon's
410 +# library and can link to gdbm and other GPL-only libraries. In this
411 +# cases, we have a fully GPL-2 package. Leaving the rest of the
412 +# GPL-forcing USE flags for those who use them.
413 +# qpaeq equalizer pyqt GUI frontend is AGPL-3+
414 +LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 ) equalizer? ( AGPL-3+ )"
415 +
416 +SLOT="0"
417 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
418 +
419 +# +alsa-plugin as discussed in bug #519530
420 +IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib
421 +gnome gtk ipv6 jack libsamplerate libressl lirc native-headset neon ofono-headset
422 ++orc oss qt5 realtime selinux sox ssl systemd system-wide tcpd test +udev
423 ++webrtc-aec +X zeroconf"
424 +
425 +# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
426 +REQUIRED_USE="
427 + bluetooth? ( dbus )
428 + equalizer? ( dbus )
429 + ofono-headset? ( bluetooth )
430 + native-headset? ( bluetooth )
431 + udev? ( || ( alsa oss ) )
432 +"
433 +
434 +# libpcre needed in some cases, bug #472228
435 +RDEPEND="
436 + || (
437 + elibc_glibc? ( virtual/libc )
438 + elibc_uclibc? ( virtual/libc )
439 + dev-libs/libpcre
440 + )
441 + >=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}]
442 + X? (
443 + >=x11-libs/libX11-1.4.0[${MULTILIB_USEDEP}]
444 + >=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
445 + x11-libs/libSM[${MULTILIB_USEDEP}]
446 + x11-libs/libICE[${MULTILIB_USEDEP}]
447 + x11-libs/libXtst[${MULTILIB_USEDEP}]
448 + )
449 + caps? ( >=sys-libs/libcap-2.22-r2[${MULTILIB_USEDEP}] )
450 + libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 )
451 + alsa? ( >=media-libs/alsa-lib-1.0.19 )
452 + glib? ( >=dev-libs/glib-2.4.0:2[${MULTILIB_USEDEP}] )
453 + zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
454 + jack? ( virtual/jack )
455 + tcpd? ( sys-apps/tcp-wrappers[${MULTILIB_USEDEP}] )
456 + lirc? ( app-misc/lirc )
457 + dbus? ( >=sys-apps/dbus-1.0.0[${MULTILIB_USEDEP}] )
458 + gtk? ( x11-libs/gtk+:3 )
459 + gnome? ( >=gnome-base/gconf-2.4.0 )
460 + bluetooth? (
461 + >=net-wireless/bluez-5
462 + >=sys-apps/dbus-1.0.0
463 + media-libs/sbc
464 + )
465 + asyncns? ( net-libs/libasyncns[${MULTILIB_USEDEP}] )
466 + udev? ( >=virtual/udev-143[hwdb(+)] )
467 + realtime? ( sys-auth/rtkit )
468 + equalizer? ( sci-libs/fftw:3.0 )
469 + ofono-headset? ( >=net-misc/ofono-1.13 )
470 + orc? ( >=dev-lang/orc-0.4.15 )
471 + sox? ( >=media-libs/soxr-0.1.1 )
472 + ssl? (
473 + !libressl? ( dev-libs/openssl:0= )
474 + libressl? ( dev-libs/libressl:= )
475 + )
476 + media-libs/speexdsp
477 + gdbm? ( sys-libs/gdbm:= )
478 + webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 )
479 + systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] )
480 + dev-libs/libltdl:0
481 + selinux? ( sec-policy/selinux-pulseaudio )
482 +"
483 +# it's a valid RDEPEND, libltdl.so is used for native abi
484 +
485 +DEPEND="${RDEPEND}
486 + sys-devel/m4
487 + doc? ( app-doc/doxygen )
488 + test? ( >=dev-libs/check-0.9.10 )
489 + X? (
490 + x11-base/xorg-proto
491 + >=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}]
492 + )
493 + dev-libs/libatomic_ops
494 + virtual/pkgconfig
495 + system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) )
496 + dev-util/intltool
497 + >=sys-devel/gettext-0.18.1
498 +"
499 +# This is a PDEPEND to avoid a circular dep
500 +PDEPEND="
501 + alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}] ) )
502 +"
503 +
504 +# alsa-utils dep is for the alsasound init.d script (see bug #155707)
505 +# bluez dep is for the bluetooth init.d script
506 +# PyQt5 dep is for the qpaeq script
507 +RDEPEND="${RDEPEND}
508 + equalizer? ( qt5? ( dev-python/PyQt5[dbus,widgets] ) )
509 + system-wide? (
510 + alsa? ( media-sound/alsa-utils )
511 + bluetooth? ( >=net-wireless/bluez-5 )
512 + )
513 +"
514 +
515 +PATCHES=(
516 + "${FILESDIR}/${P}"-qpaeq-pyqt5-{1,2}.patch
517 + "${FILESDIR}/${P}"-glibc-2.27.patch
518 + "${FILESDIR}/${P}"-disable-flat-volumes.patch # bug 627894
519 + "${FILESDIR}/${PN}-9.0-musl-padsp.patch"
520 +)
521 +
522 +pkg_pretend() {
523 + CONFIG_CHECK="~HIGH_RES_TIMERS"
524 + WARNING_HIGH_RES_TIMERS="CONFIG_HIGH_RES_TIMERS:\tis not set (required for enabling timer-based scheduling in pulseaudio)\n"
525 + check_extra_config
526 +
527 + if linux_config_exists; then
528 + local snd_hda_prealloc_size=$(linux_chkconfig_string SND_HDA_PREALLOC_SIZE)
529 + if [ -n "${snd_hda_prealloc_size}" ] && [ "${snd_hda_prealloc_size}" -lt 2048 ]; then
530 + ewarn "A preallocated buffer-size of 2048 (kB) or higher is recommended for the HD-audio driver!"
531 + ewarn "CONFIG_SND_HDA_PREALLOC_SIZE=${snd_hda_prealloc_size}"
532 + fi
533 + fi
534 +}
535 +
536 +pkg_setup() {
537 + linux-info_pkg_setup
538 + gnome2_environment_reset #543364
539 +
540 + enewgroup audio 18 # Just make sure it exists
541 +
542 + if use system-wide; then
543 + enewgroup pulse-access
544 + enewgroup pulse
545 + enewuser pulse -1 -1 /var/run/pulse pulse,audio
546 + fi
547 +}
548 +
549 +src_prepare() {
550 + default
551 +
552 + # Skip test that cannot work with sandbox, bug #501846
553 + sed -i -e '/lock-autospawn-test/d' src/Makefile.am || die
554 +
555 + eautoreconf
556 +}
557 +
558 +multilib_src_configure() {
559 + local myconf=()
560 +
561 + if use gdbm; then
562 + myconf+=( --with-database=gdbm )
563 + else
564 + myconf+=( --with-database=simple )
565 + fi
566 +
567 + if use bluetooth; then
568 + if multilib_is_native_abi; then
569 + myconf+=( --enable-bluez5 --disable-bluez4
570 + $(use_enable native-headset bluez5-native-headset)
571 + $(use_enable ofono-headset bluez5-ofono-headset) )
572 + fi
573 + else
574 + myconf+=( --disable-bluez5 --disable-bluez4 )
575 + fi
576 +
577 + myconf+=(
578 + --enable-largefile
579 + $(use_enable glib glib2)
580 + --disable-solaris
581 + $(use_enable asyncns)
582 + $(use_enable oss oss-output)
583 + $(use_enable alsa)
584 + $(use_enable lirc)
585 + $(use_enable neon neon-opt)
586 + $(use_enable tcpd tcpwrap)
587 + $(use_enable jack)
588 + $(use_enable zeroconf avahi)
589 + $(use_enable dbus)
590 + $(use_enable gnome gconf)
591 + $(use_enable gtk gtk3)
592 + $(use_enable libsamplerate samplerate)
593 + $(use_enable orc)
594 + $(use_enable X x11)
595 + $(use_enable test default-build-tests)
596 + $(use_enable udev)
597 + $(use_with sox soxr)
598 + $(use_enable systemd systemd-daemon)
599 + $(use_enable systemd systemd-login)
600 + $(use_enable systemd systemd-journal)
601 + $(use_enable ipv6)
602 + $(use_enable ssl openssl)
603 + $(use_enable webrtc-aec)
604 + $(use_with caps)
605 + $(use_with equalizer fftw)
606 + --disable-adrian-aec
607 + --disable-esound
608 + --localstatedir="${EPREFIX}"/var
609 + --with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
610 + --with-systemduserunitdir=$(systemd_get_userunitdir)
611 + )
612 +
613 + if ! multilib_is_native_abi; then
614 + # disable all the modules and stuff
615 + myconf+=(
616 + --disable-oss-output
617 + --disable-alsa
618 + --disable-lirc
619 + --disable-jack
620 + --disable-avahi
621 + --disable-gconf
622 + --disable-gtk3
623 + --disable-samplerate
624 + --disable-bluez4
625 + --disable-bluez5
626 + --disable-udev
627 + --disable-openssl
628 + --disable-orc
629 + --disable-webrtc-aec
630 + --without-fftw
631 + --without-soxr
632 +
633 + # tests involve random modules, so just do them for the native
634 + --disable-default-build-tests
635 +
636 + # hack around unnecessary checks
637 + # (results don't matter, we're not building anything using it)
638 + ac_cv_lib_ltdl_lt_dladvise_init=yes
639 + --with-database=simple
640 + LIBSPEEX_CFLAGS=' '
641 + LIBSPEEX_LIBS=' '
642 + )
643 + fi
644 +
645 + ECONF_SOURCE=${S} \
646 + econf "${myconf[@]}"
647 +}
648 +
649 +multilib_src_compile() {
650 + if multilib_is_native_abi; then
651 + emake
652 + use doc && emake doxygen
653 + else
654 + local targets=( libpulse.la libpulsedsp.la libpulse-simple.la )
655 + use glib && targets+=( libpulse-mainloop-glib.la )
656 + emake -C src ${targets[*]}
657 + fi
658 +}
659 +
660 +multilib_src_test() {
661 + # We avoid running the toplevel check target because that will run
662 + # po/'s tests too, and they are broken. Officially, it should work
663 + # with intltool 0.41, but that doesn't look like a stable release.
664 + if multilib_is_native_abi; then
665 + emake -C src check
666 + fi
667 +}
668 +
669 +multilib_src_install() {
670 + if multilib_is_native_abi; then
671 + emake -j1 DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" install
672 + use doc && dohtml -r doxygen/html/
673 + else
674 + local targets=( libpulse.la libpulse-simple.la )
675 + use glib && targets+=( libpulse-mainloop-glib.la )
676 + emake DESTDIR="${D}" install-pkgconfigDATA
677 + emake DESTDIR="${D}" -C src \
678 + install-libLTLIBRARIES \
679 + install-padsplibLTLIBRARIES \
680 + lib_LTLIBRARIES="${targets[*]}" \
681 + install-pulseincludeHEADERS
682 + fi
683 +}
684 +
685 +multilib_src_install_all() {
686 + # Drop the script entirely if X is disabled
687 + use X || rm "${ED}"/usr/bin/start-pulseaudio-x11
688 +
689 + if use system-wide; then
690 + newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio
691 +
692 + use_define() {
693 + local define=${2:-$(echo $1 | tr '[:lower:]' '[:upper:]')}
694 +
695 + use "$1" && echo "-D$define" || echo "-U$define"
696 + }
697 +
698 + unifdef $(use_define zeroconf AVAHI) \
699 + $(use_define alsa) \
700 + $(use_define bluetooth) \
701 + $(use_define udev) \
702 + "${FILESDIR}/pulseaudio.init.d-5" \
703 + > "${T}/pulseaudio"
704 +
705 + doinitd "${T}/pulseaudio"
706 +
707 + systemd_dounit "${FILESDIR}/${PN}.service"
708 + fi
709 +
710 + use zeroconf && sed -i -e '/module-zeroconf-publish/s:^#::' "${ED}/etc/pulse/default.pa"
711 +
712 + dodoc NEWS README todo
713 +
714 + # Create the state directory
715 + use prefix || diropts -o pulse -g pulse -m0755
716 +
717 + # We need /var/run/pulse, bug #442852
718 + use system-wide && systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
719 +
720 + # Prevent warnings when system-wide is not used, bug #447694
721 + use system-wide || rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf
722 +
723 + prune_libtool_files --all
724 +}
725 +
726 +pkg_postinst() {
727 + if use system-wide; then
728 + elog "You have enabled the 'system-wide' USE flag for pulseaudio."
729 + elog "This mode should only be used on headless servers, embedded systems,"
730 + elog "or thin clients. It will usually require manual configuration, and is"
731 + elog "incompatible with many expected pulseaudio features."
732 + elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED."
733 + elog "For more information, see"
734 + elog " https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
735 + elog " https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"
736 + elog " https://wiki.gentoo.org/wiki/PulseAudio#Headless_server"
737 + if use gnome ; then
738 + elog
739 + elog "By enabling gnome USE flag, you enabled gconf support. Please note"
740 + elog "that you might need to remove the gnome USE flag or disable the"
741 + elog "gconf module on /etc/pulse/system.pa to be able to use PulseAudio"
742 + elog "with a system-wide instance."
743 + fi
744 + fi
745 +
746 + if use equalizer && ! use qt5; then
747 + elog "You've enabled the 'equalizer' USE-flag but not the 'qt5' USE-flag."
748 + elog "This will build the equalizer module, but the 'qpaeq' tool"
749 + elog "which is required to set equalizer levels will not work."
750 + fi
751 +
752 + if use native-headset && use ofono-headset; then
753 + elog "You have enabled both native and ofono headset profiles. The runtime decision"
754 + elog "which to use is done via the 'headset' argument of module-bluetooth-discover."
755 + fi
756 +
757 + if use libsamplerate; then
758 + elog "The libsamplerate based resamplers are now deprecated, because they offer no"
759 + elog "particular advantage over speex. Upstream suggests disabling them."
760 + fi
761 +}