1 |
commit: 9f37b84b5d01e0d465aedb75a664c1994bd7bee1 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 14 17:04:31 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 14 18:36:11 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f37b84b |
7 |
|
8 |
media-libs/libffado: Drop 2.4.0 |
9 |
|
10 |
Package-Manager: Portage-2.3.60, Repoman-2.3.12 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
media-libs/libffado/Manifest | 1 - |
14 |
.../libffado-2.4.0-additional-py3-fixes.patch | 96 ---------- |
15 |
.../files/libffado-2.4.0-crossbar-router-fix.patch | 11 -- |
16 |
.../files/libffado-2.4.0-py3-pyqt5-fixes.patch | 197 --------------------- |
17 |
.../libffado-2.4.0-pyqt5-dbus-detection.patch | 30 ---- |
18 |
.../files/libffado-2.4.0-rme-bigendian-fix.patch | 50 ------ |
19 |
media-libs/libffado/libffado-2.4.0.ebuild | 119 ------------- |
20 |
7 files changed, 504 deletions(-) |
21 |
|
22 |
diff --git a/media-libs/libffado/Manifest b/media-libs/libffado/Manifest |
23 |
index f0bb141ce4c..d3949e14d04 100644 |
24 |
--- a/media-libs/libffado/Manifest |
25 |
+++ b/media-libs/libffado/Manifest |
26 |
@@ -1,2 +1 @@ |
27 |
-DIST libffado-2.4.0.tgz 1228916 BLAKE2B 21a3a2a96377f698e7c1a43912c761624aabe5401f0e147fee4fa203c4534166494de8867320b4b6bc3ff200b65c77bb62ab2c4e98948ed0ee74e6171d162deb SHA512 7df37584925cc908cc284dba344609928d39e006f71ae4ede62e4531b2628271ebd0db00407418e943fb569b5b8b919a76c90aaeed03005cefbd3c1c16ee1627 |
28 |
DIST libffado-2.4.1.tgz 1229295 BLAKE2B 3b42493b68fc8648e116784e04baee2278c21e01fa92b22d990340ef329f67c898e247891e76d494410a758009fcf186ba556e900598eaca539a9879664cc704 SHA512 0859f17b87c68108bbde726d1cf8ab0b99f6f7f02cbe36acd8b451e112688a4d1edc21134eb4a2edc8c92dcf5f5da52efeabb2ad0dc07804ed1aa664a3b38d74 |
29 |
|
30 |
diff --git a/media-libs/libffado/files/libffado-2.4.0-additional-py3-fixes.patch b/media-libs/libffado/files/libffado-2.4.0-additional-py3-fixes.patch |
31 |
deleted file mode 100644 |
32 |
index fd5d2f44bab..00000000000 |
33 |
--- a/media-libs/libffado/files/libffado-2.4.0-additional-py3-fixes.patch |
34 |
+++ /dev/null |
35 |
@@ -1,96 +0,0 @@ |
36 |
---- a/support/mixer-qt4/ffado/panelmanager.py 2018-01-11 12:27:20.518923209 +0900 |
37 |
-+++ a/support/mixer-qt4/ffado/panelmanager.py 2018-01-11 12:31:03.956299962 +0900 |
38 |
-@@ -38,6 +38,7 @@ |
39 |
- |
40 |
- import sys |
41 |
- import time |
42 |
-+import importlib |
43 |
- |
44 |
- import logging |
45 |
- log = logging.getLogger('panelmanager') |
46 |
-@@ -302,20 +303,15 @@ |
47 |
- # |
48 |
- # Specific (or dummy) mixer widgets get loaded in the following |
49 |
- # |
50 |
-+ found = False |
51 |
- if 'mixer' in dev and dev['mixer'] != None: |
52 |
- mixerapp = dev['mixer'] |
53 |
-- global mixerwidget |
54 |
-- exec( """ |
55 |
--try: |
56 |
-- import ffado.mixer.%s |
57 |
-- globals()["mixerwidget"] = ffado.mixer.%s.%s( w ) |
58 |
-- found = True |
59 |
--except ImportError: |
60 |
-- log.debug("bypassdbus set, %s module not available: ignored") |
61 |
-- found = False |
62 |
--""" % (mixerapp.lower(), mixerapp.lower(), mixerapp, mixerapp.lower()) ) |
63 |
-- else: |
64 |
-- found = False |
65 |
-+ try: |
66 |
-+ mixer_module = importlib.import_module("ffado.mixer.%s" % mixerapp.lower()) |
67 |
-+ mixerwidget = getattr(mixer_module, mixerapp)(w) |
68 |
-+ found = True |
69 |
-+ except ImportError: |
70 |
-+ log.debug("bypassdbus set, %s module not available: ignored" % mixerapp.lower()) |
71 |
- |
72 |
- if not found: |
73 |
- mixerwidget = Dummy( w ) |
74 |
---- a/support/mixer-qt4/ffado/widgets/crossbarrouter.py 2018-01-11 12:34:10.200777889 +0900 |
75 |
-+++ b/support/mixer-qt4/ffado/widgets/crossbarrouter.py 2018-01-11 12:45:13.278911705 +0900 |
76 |
-@@ -194,7 +194,7 @@ |
77 |
- #log.debug("Got %i peaks" % len(peakvalues)) |
78 |
- for peak in peakvalues: |
79 |
- #log.debug("peak = [%s,%s]" % (str(peak[0]),str(peak[1]))) |
80 |
-- if peak[0] >= 0: |
81 |
-+ if peak[1] >= 0: |
82 |
- self.switchers[peak[0]].peakValue(peak[1]) |
83 |
- |
84 |
- def updateMixerRouting(self): |
85 |
---- a/support/mixer-qt4/ffado/widgets/matrixmixer.py 2018-01-11 12:54:27.545361864 +0900 |
86 |
-+++ b/support/mixer-qt4/ffado/widgets/matrixmixer.py 2018-01-11 12:56:36.899124318 +0900 |
87 |
-@@ -512,7 +512,7 @@ |
88 |
- self.rowHeaders[j].lbl.setText(row_name) |
89 |
- |
90 |
- def updateValues(self, n): |
91 |
-- nbitems = len(n)/3 |
92 |
-+ nbitems = len(n) // 3 |
93 |
- for i in range(nbitems): |
94 |
- n_0 = n[3*i] |
95 |
- n_1 = n[3*i+1] |
96 |
-@@ -951,7 +951,7 @@ |
97 |
- return self.interface.setValue(In, Out, val) |
98 |
- |
99 |
- def updateValues(self, n): |
100 |
-- nbitems = len(n)/3 |
101 |
-+ nbitems = len(n) // 3 |
102 |
- for j in range(nbitems): |
103 |
- n_0 = n[3*j] |
104 |
- n_1 = n[3*j+1] |
105 |
-@@ -1406,7 +1406,7 @@ |
106 |
- def matrixControlChanged(self, n): |
107 |
- # Update value needed for "per Out" view |
108 |
- #log.debug("Update per Output( %s )" % str(n)) |
109 |
-- nbitems = len(n)/3 |
110 |
-+ nbitems = len(n) // 3 |
111 |
- if (self.rule == "Columns_are_inputs"): |
112 |
- n_t = n |
113 |
- else: |
114 |
-@@ -1420,7 +1420,7 @@ |
115 |
- def sliderControlChanged(self, n): |
116 |
- # Update value needed for matrix view |
117 |
- #log.debug("Update Matrix( %s )" % str(n)) |
118 |
-- nbitems = len(n)/3 |
119 |
-+ nbitems = len(n) // 3 |
120 |
- if (((self.rule == "Columns_are_inputs") and not self.transpose) or ((self.rule != "Columns_are_inputs") and self.transpose)): |
121 |
- n_t = () |
122 |
- for i in range(nbitems): |
123 |
-@@ -1512,7 +1512,7 @@ |
124 |
- log.debug("Number of stereo output channels must be specified") |
125 |
- return False |
126 |
- n = int(readMixerString[idx+2]) |
127 |
-- if n > self.perOut.nbOut/2: |
128 |
-+ if n > self.perOut.nbOut // 2: |
129 |
- log.debug("Incoherent number of stereo channels") |
130 |
- return False |
131 |
- if n > 0: |
132 |
|
133 |
diff --git a/media-libs/libffado/files/libffado-2.4.0-crossbar-router-fix.patch b/media-libs/libffado/files/libffado-2.4.0-crossbar-router-fix.patch |
134 |
deleted file mode 100644 |
135 |
index 99861abe284..00000000000 |
136 |
--- a/media-libs/libffado/files/libffado-2.4.0-crossbar-router-fix.patch |
137 |
+++ /dev/null |
138 |
@@ -1,11 +0,0 @@ |
139 |
---- a/support/mixer-qt4/ffado/widgets/crossbarrouter.py 2018-01-11 12:34:10.200777889 +0900 |
140 |
-+++ b/support/mixer-qt4/ffado/widgets/crossbarrouter.py 2018-01-11 12:45:13.278911705 +0900 |
141 |
-@@ -98,7 +98,7 @@ |
142 |
- self.combo.setCurrentIndex(self.combo.findText(src)) |
143 |
- else: |
144 |
- self.combo.setCurrentIndex(0) |
145 |
-- self.combo.activated.connect(self.comboCurrentChanged) |
146 |
-+ self.combo.activated[str].connect(self.comboCurrentChanged) |
147 |
- |
148 |
- |
149 |
- def peakValue(self, value): |
150 |
|
151 |
diff --git a/media-libs/libffado/files/libffado-2.4.0-py3-pyqt5-fixes.patch b/media-libs/libffado/files/libffado-2.4.0-py3-pyqt5-fixes.patch |
152 |
deleted file mode 100644 |
153 |
index f0937559b8e..00000000000 |
154 |
--- a/media-libs/libffado/files/libffado-2.4.0-py3-pyqt5-fixes.patch |
155 |
+++ /dev/null |
156 |
@@ -1,197 +0,0 @@ |
157 |
------------------------------------------------------------------------- |
158 |
-r2726 | jwoithe | 2018-01-05 18:56:40 +0900 (Fri, 05 Jan 2018) | 13 lines |
159 |
- |
160 |
-Further Python3/PyQt5 compatibility fixes, enhance "About" dialog box. |
161 |
- |
162 |
-This patch was prepared by Orcan Ogetbil on Fedora and tested on that |
163 |
-distribution with PyQt4-4.12.1 and PyQt5-5.9.1. It is primarily concerned |
164 |
-with additional compatibility between Python2/3 and PyQt4/5. It has also |
165 |
-been tested under python 2 with pyqt 4.11.4. Further testing under |
166 |
-different python/pyqt environments would be welcomed. |
167 |
- |
168 |
-An enhancement to the "About" dialog is also included which adds version |
169 |
-strings and updates the copyright year range. |
170 |
- |
171 |
-The patch was submitted to the ffado-devel mailing list. |
172 |
- |
173 |
- |
174 |
-Index: support/mixer-qt4/ffado/ffadowindow.py |
175 |
-=================================================================== |
176 |
---- a/support/mixer-qt4/ffado/ffadowindow.py (revision 2725) |
177 |
-+++ b/support/mixer-qt4/ffado/ffadowindow.py (revision 2726) |
178 |
-@@ -22,6 +22,8 @@ |
179 |
- # along with this program. If not, see <http://www.gnu.org/licenses/>. |
180 |
- # |
181 |
- |
182 |
-+import ctypes |
183 |
-+import datetime |
184 |
- import os |
185 |
- |
186 |
- from ffado.config import * |
187 |
-@@ -92,7 +94,8 @@ |
188 |
- self.menuTheme[theme].setCheckable(True) |
189 |
- |
190 |
- if (ffado_python3 and (self.style().objectName().lower() == theme.lower()) or |
191 |
-- not(ffado_python3) and (self.style().objectName().toLower() == theme.toLower())): |
192 |
-+ not(ffado_python3) and (self.style().objectName().toLower() == theme.toLower() if ffado_pyqt_version == 4 else |
193 |
-+ self.style().objectName().lower() == theme.lower())): |
194 |
- self.menuTheme[theme].setDisabled(True) |
195 |
- self.menuTheme[theme].setChecked(True) |
196 |
- self.menuTheme[theme].triggered.connect(self.switchTheme ) |
197 |
-@@ -174,9 +177,11 @@ |
198 |
- QMessageBox.about( self, "About FFADO", """ |
199 |
- <h1>ffado.org</h1> |
200 |
- |
201 |
-+<p>{ffado_version}</p> |
202 |
-+ |
203 |
- <p>FFADO is the new approach to have firewire audio on linux.</p> |
204 |
- |
205 |
--<p>© 2006-2014 by the FFADO developers<br />ffado is licensed under the GPLv3, for the full license text see <a href="http://www.gnu.org/licenses/">www.gnu.org/licenses</a> or the LICENSE.* files shipped with ffado.</p> |
206 |
-+ <p>© 2006-2018 by the FFADO developers<br />ffado is licensed under the GPLv3, for the full license text see <a href="http://www.gnu.org/licenses/">www.gnu.org/licenses</a> or the LICENSE.* files shipped with ffado.</p> |
207 |
- |
208 |
- <p>FFADO developers are:<ul> |
209 |
- <li>Pieter Palmers |
210 |
-@@ -191,8 +196,17 @@ |
211 |
- <li>Stefan Richter |
212 |
- <li>Jano Svitok |
213 |
- </ul> |
214 |
--""" ) |
215 |
-+ """.format(ffado_version=get_ffado_version(), thisyear=datetime.datetime.now().year)) |
216 |
- |
217 |
-+def get_ffado_version(): |
218 |
-+ try: |
219 |
-+ # call the C function ffado_get_version() to figure out the version |
220 |
-+ lib = ctypes.cdll.LoadLibrary('libffado.so') |
221 |
-+ func = ctypes.CFUNCTYPE(ctypes.c_char_p) |
222 |
-+ ffado_get_version = func(('ffado_get_version', lib)) |
223 |
-+ return ffado_get_version() |
224 |
-+ except: |
225 |
-+ return "libffado" |
226 |
- |
227 |
- def get_lock(process_name): |
228 |
- import socket |
229 |
-@@ -252,6 +266,7 @@ |
230 |
- logging.getLogger('global').setLevel(debug_level) |
231 |
- |
232 |
- log = logging.getLogger('main') |
233 |
-+ log.debug("Using %s with Qt: %s PyQt: %s" % (get_ffado_version(), QtCore.QT_VERSION_STR, QtCore.PYQT_VERSION_STR)) |
234 |
- |
235 |
- app = QApplication(args) |
236 |
- app.setWindowIcon( QIcon( SHAREDIR + "/icons/hi64-apps-ffado.png" ) ) |
237 |
-Index: support/mixer-qt4/ffado/logginghandler.py |
238 |
-=================================================================== |
239 |
---- a/support/mixer-qt4/ffado/logginghandler.py (revision 2725) |
240 |
-+++ b/support/mixer-qt4/ffado/logginghandler.py (revision 2726) |
241 |
-@@ -28,7 +28,7 @@ |
242 |
- log = logging.getLogger('logginghandler') |
243 |
- |
244 |
- class QStatusLogger( QObject, logging.Handler ): |
245 |
-- log = pyqtSignal(QString, int, name='log') |
246 |
-+ log = pyqtSignal(QString if ffado_pyqt_version == 4 else str, int, name='log') |
247 |
- def __init__( self, parent, statusbar, level=logging.NOTSET ): |
248 |
- QObject.__init__( self, parent ) |
249 |
- logging.Handler.__init__( self, level ) |
250 |
-Index: support/mixer-qt4/ffado/panelmanager.py |
251 |
-=================================================================== |
252 |
---- a/support/mixer-qt4/ffado/panelmanager.py (revision 2725) |
253 |
-+++ b/support/mixer-qt4/ffado/panelmanager.py (revision 2726) |
254 |
-@@ -378,7 +378,7 @@ |
255 |
- action = self.sender() |
256 |
- # Extract the action data and store as a dbus.String type so |
257 |
- # it is usable as a key into self.panels[]. |
258 |
-- panel_key = dbus.String(action.data().toString()) |
259 |
-+ panel_key = dbus.String(action.data().toString() if ffado_pyqt_version == 4 else action.data()) |
260 |
- self.tabs.setCurrentIndex(self.tabs.indexOf(self.panels[panel_key])) |
261 |
- |
262 |
- def displayPanels(self): |
263 |
-@@ -515,6 +515,8 @@ |
264 |
- saveString.append('</device>\n') |
265 |
- # file saving |
266 |
- savefilename = QFileDialog.getSaveFileName(self, 'Save File', os.getenv('HOME')) |
267 |
-+ if isinstance(savefilename, tuple): # newer PyQt5 |
268 |
-+ savefilename = savefilename[0] |
269 |
- try: |
270 |
- f = open(savefilename, 'w') |
271 |
- except IOError: |
272 |
-@@ -526,6 +528,8 @@ |
273 |
- |
274 |
- def readSettings(self): |
275 |
- readfilename = QFileDialog.getOpenFileName(self, 'Open File', os.getenv('HOME')) |
276 |
-+ if isinstance(readfilename, tuple): # newer PyQt5 |
277 |
-+ readfilename = readfilename[0] |
278 |
- try: |
279 |
- f = open(readfilename, 'r') |
280 |
- except IOError: |
281 |
-Index: support/mixer-qt4/ffado/widgets/crossbarrouter.py |
282 |
-=================================================================== |
283 |
---- a/support/mixer-qt4/ffado/widgets/crossbarrouter.py (revision 2725) |
284 |
-+++ b/support/mixer-qt4/ffado/widgets/crossbarrouter.py (revision 2726) |
285 |
-@@ -168,7 +168,10 @@ |
286 |
- self.timer.setInterval(200) |
287 |
- self.timer.timeout.connect(self.updateLevels) |
288 |
- |
289 |
-- self.vubtn.setChecked(self.settings.value("crossbarrouter/runvu", False).toBool()) |
290 |
-+ if ffado_pyqt_version == 4: |
291 |
-+ self.vubtn.setChecked(self.settings.value("crossbarrouter/runvu", False).toBool()) |
292 |
-+ else: |
293 |
-+ self.vubtn.setChecked(self.settings.value("crossbarrouter/runvu", False) == u'true') |
294 |
- |
295 |
- def __del__(self): |
296 |
- print( "CrossbarRouter.__del__()" ) |
297 |
-Index: support/mixer-qt4/ffado/widgets/matrixmixer.py |
298 |
-=================================================================== |
299 |
---- a/support/mixer-qt4/ffado/widgets/matrixmixer.py (revision 2725) |
300 |
-+++ b/support/mixer-qt4/ffado/widgets/matrixmixer.py (revision 2726) |
301 |
-@@ -200,7 +200,7 @@ |
302 |
- |
303 |
- def mousePressEvent(self, ev): |
304 |
- if ev.buttons() & Qt.LeftButton: |
305 |
-- self.pos = ev.posF() |
306 |
-+ self.pos = ev.posF() if ffado_pyqt_version == 4 else ev.localPos() |
307 |
- self.tmpvalue = self.value() |
308 |
- ev.accept() |
309 |
- #log.debug("MixerNode.mousePressEvent() %s" % str(self.pos)) |
310 |
-@@ -207,7 +207,7 @@ |
311 |
- |
312 |
- def mouseMoveEvent(self, ev): |
313 |
- if hasattr(self, "tmpvalue") and self.pos is not QtCore.QPointF(0, 0): |
314 |
-- newpos = ev.posF() |
315 |
-+ newpos = ev.posF() if ffado_pyqt_version == 4 else ev.localPos() |
316 |
- change = newpos.y() - self.pos.y() |
317 |
- #log.debug("MixerNode.mouseReleaseEvent() change %s" % (str(change))) |
318 |
- self.setValue( self.tmpvalue - math.copysign(pow(abs(change), 2), change) ) |
319 |
-@@ -215,7 +215,7 @@ |
320 |
- |
321 |
- def mouseReleaseEvent(self, ev): |
322 |
- if hasattr(self, "tmpvalue") and self.pos is not QtCore.QPointF(0, 0): |
323 |
-- newpos = ev.posF() |
324 |
-+ newpos = ev.posF() if ffado_pyqt_version == 4 else ev.localPos() |
325 |
- change = newpos.y() - self.pos.y() |
326 |
- #log.debug("MixerNode.mouseReleaseEvent() change %s" % (str(change))) |
327 |
- self.setValue( self.tmpvalue - math.copysign(pow(abs(change), 2), change) ) |
328 |
-@@ -257,19 +257,19 @@ |
329 |
- if v == 0: |
330 |
- symb_inf = u"\u221E" |
331 |
- text = "-" + symb_inf + " dB" |
332 |
-- if ffado_python3: |
333 |
-+ if ffado_python3 or ffado_pyqt_version == 5: |
334 |
- # Python3 uses native python UTF strings rather than QString. |
335 |
- # This therefore appears to be the correct way to display this |
336 |
- # UTF8 string, but testing may prove otherwise. |
337 |
- p.drawText(rect, Qt.AlignCenter, text) |
338 |
- else: |
339 |
-- p.drawText(rect, Qt.AlignCenter, QtCore.QString.fromUtf8(text)) |
340 |
-+ p.drawText(rect, Qt.AlignCenter, QString.fromUtf8(text)) |
341 |
- if (self.inv_action!=None and self.inv_action.isChecked()): |
342 |
-- if ffado_python3: |
343 |
-+ if ffado_python3 or ffado_pyqt_version == 5: |
344 |
- # Refer to the comment about about Python UTF8 strings. |
345 |
- p.drawText(rect, Qt.AlignLeft|Qt.AlignTop, " Ï•") |
346 |
- else: |
347 |
-- p.drawText(rect, Qt.AlignLeft|Qt.AlignTop, QtCore.QString.fromUtf8(" Ï•")) |
348 |
-+ p.drawText(rect, Qt.AlignLeft|Qt.AlignTop, QString.fromUtf8(" Ï•")) |
349 |
- |
350 |
- def internalValueChanged(self, value): |
351 |
- #log.debug("MixerNode.internalValueChanged( %i )" % value) |
352 |
- |
353 |
------------------------------------------------------------------------- |
354 |
|
355 |
diff --git a/media-libs/libffado/files/libffado-2.4.0-pyqt5-dbus-detection.patch b/media-libs/libffado/files/libffado-2.4.0-pyqt5-dbus-detection.patch |
356 |
deleted file mode 100644 |
357 |
index 9064a59a6bc..00000000000 |
358 |
--- a/media-libs/libffado/files/libffado-2.4.0-pyqt5-dbus-detection.patch |
359 |
+++ /dev/null |
360 |
@@ -1,30 +0,0 @@ |
361 |
------------------------------------------------------------------------- |
362 |
-r2725 | jwoithe | 2018-01-05 18:40:19 +0900 (Fri, 05 Jan 2018) | 11 lines |
363 |
- |
364 |
-SCons: fix detection of dbus on PyQt5 systems. |
365 |
- |
366 |
-The detection of the dbus python modules was qualified on the presence of |
367 |
-pyuic4. On systems with only PyQt5 this would obviously fail. Patch from |
368 |
-Orcan Ogetbil via the ffado-devel mailing list. |
369 |
- |
370 |
-r2724 inadvertently included a change to SConstruct to import sys. This is |
371 |
-needed since sys.stdout is referenced in some situations (in particular, if |
372 |
-jack is not installed in the build environment). This patch was also from |
373 |
-Orcan Ogetbil, via the ffado-devel mailing list. |
374 |
- |
375 |
- |
376 |
-Index: SConstruct |
377 |
-=================================================================== |
378 |
---- a/SConstruct (revision 2724) |
379 |
-+++ b/SConstruct (revision 2725) |
380 |
-@@ -396,7 +396,7 @@ |
381 |
- |
382 |
- # PyQT checks |
383 |
- if env['BUILD_MIXER'] != 'false': |
384 |
-- have_dbus = (conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 'dbus.mainloop.qt' )) |
385 |
-+ have_dbus = ((conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 'dbus.mainloop.qt' )) or (conf.CheckForApp( 'which pyuic5' ) and conf.CheckForPyModule( 'dbus.mainloop.pyqt5' ))) |
386 |
- have_pyqt4 = (conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 'PyQt4' )) |
387 |
- have_pyqt5 = (conf.CheckForApp( 'which pyuic5' ) and conf.CheckForPyModule( 'PyQt5' )) |
388 |
- if ((have_pyqt4 or have_pyqt5) and have_dbus): |
389 |
- |
390 |
------------------------------------------------------------------------- |
391 |
|
392 |
diff --git a/media-libs/libffado/files/libffado-2.4.0-rme-bigendian-fix.patch b/media-libs/libffado/files/libffado-2.4.0-rme-bigendian-fix.patch |
393 |
deleted file mode 100644 |
394 |
index 8e0158a03c5..00000000000 |
395 |
--- a/media-libs/libffado/files/libffado-2.4.0-rme-bigendian-fix.patch |
396 |
+++ /dev/null |
397 |
@@ -1,50 +0,0 @@ |
398 |
------------------------------------------------------------------------- |
399 |
-r2724 | jwoithe | 2018-01-05 18:33:39 +0900 (Fri, 05 Jan 2018) | 8 lines |
400 |
- |
401 |
-RME: ensure byte swap macros are available for all components. |
402 |
- |
403 |
-The byte swap macros (ByteSwap32() in particular) are required on big-endian |
404 |
-architectures for more than just the rme_avdevice module. Including these |
405 |
-in the RME device header file is a reasonable way to fix this. |
406 |
- |
407 |
-Patch from Orcan Ogetbil via the ffado-devel mailing list. |
408 |
- |
409 |
- |
410 |
-Index: SConstruct |
411 |
-=================================================================== |
412 |
---- a/SConstruct (revision 2723) |
413 |
-+++ b/SConstruct (revision 2724) |
414 |
-@@ -29,6 +29,7 @@ |
415 |
- from subprocess import Popen, PIPE |
416 |
- import os |
417 |
- import re |
418 |
-+import sys |
419 |
- from string import Template |
420 |
- import imp |
421 |
- import distutils.sysconfig |
422 |
-Index: src/rme/rme_avdevice.cpp |
423 |
-=================================================================== |
424 |
---- a/src/rme/rme_avdevice.cpp (revision 2723) |
425 |
-+++ b/src/rme/rme_avdevice.cpp (revision 2724) |
426 |
-@@ -42,7 +42,6 @@ |
427 |
- #include <stdint.h> |
428 |
- #include <assert.h> |
429 |
- #include <unistd.h> |
430 |
--#include "libutil/ByteSwap.h" |
431 |
- |
432 |
- #include <iostream> |
433 |
- #include <sstream> |
434 |
-Index: src/rme/rme_avdevice.h |
435 |
-=================================================================== |
436 |
---- a/src/rme/rme_avdevice.h (revision 2723) |
437 |
-+++ b/src/rme/rme_avdevice.h (revision 2724) |
438 |
-@@ -31,6 +31,7 @@ |
439 |
- #include "libavc/avc_definitions.h" |
440 |
- |
441 |
- #include "libutil/Configuration.h" |
442 |
-+#include "libutil/ByteSwap.h" |
443 |
- |
444 |
- #include "fireface_def.h" |
445 |
- #include "libstreaming/rme/RmeReceiveStreamProcessor.h" |
446 |
- |
447 |
------------------------------------------------------------------------- |
448 |
|
449 |
diff --git a/media-libs/libffado/libffado-2.4.0.ebuild b/media-libs/libffado/libffado-2.4.0.ebuild |
450 |
deleted file mode 100644 |
451 |
index 10e673c6113..00000000000 |
452 |
--- a/media-libs/libffado/libffado-2.4.0.ebuild |
453 |
+++ /dev/null |
454 |
@@ -1,119 +0,0 @@ |
455 |
-# Copyright 1999-2018 Gentoo Foundation |
456 |
-# Distributed under the terms of the GNU General Public License v2 |
457 |
- |
458 |
-EAPI="6" |
459 |
- |
460 |
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) |
461 |
- |
462 |
-inherit desktop python-single-r1 scons-utils toolchain-funcs udev multilib-minimal |
463 |
- |
464 |
-DESCRIPTION="Driver for IEEE1394 (Firewire) audio interfaces" |
465 |
-HOMEPAGE="http://www.ffado.org" |
466 |
- |
467 |
-if [[ "${PV}" = "9999" ]]; then |
468 |
- inherit subversion |
469 |
- ESVN_REPO_URI="http://subversion.ffado.org/ffado/trunk/${PN}" |
470 |
-else |
471 |
- SRC_URI="http://www.ffado.org/files/${P}.tgz" |
472 |
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" |
473 |
-fi |
474 |
- |
475 |
-LICENSE="GPL-2 GPL-3" |
476 |
-SLOT="0" |
477 |
-IUSE="debug qt5 test-programs" |
478 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
479 |
- |
480 |
-COMMON_DEPEND="${PYTHON_DEPS} |
481 |
- dev-cpp/libxmlpp:2.6[${MULTILIB_USEDEP}] |
482 |
- dev-libs/dbus-c++ |
483 |
- dev-libs/libconfig[cxx,${MULTILIB_USEDEP}] |
484 |
- media-libs/alsa-lib |
485 |
- media-libs/libiec61883[${MULTILIB_USEDEP}] |
486 |
- sys-apps/dbus |
487 |
- sys-libs/libavc1394[${MULTILIB_USEDEP}] |
488 |
- sys-libs/libraw1394[${MULTILIB_USEDEP}] |
489 |
- qt5? ( |
490 |
- dev-python/dbus-python[${PYTHON_USEDEP}] |
491 |
- dev-python/PyQt5[dbus,${PYTHON_USEDEP}] |
492 |
- x11-misc/xdg-utils |
493 |
- )" |
494 |
-DEPEND="${COMMON_DEPEND} |
495 |
- virtual/pkgconfig" |
496 |
-RDEPEND="${COMMON_DEPEND} |
497 |
- !<media-sound/jack-audio-connection-kit-0.122.0:0 |
498 |
- !<media-sound/jack-audio-connection-kit-1.9.9:2" |
499 |
- |
500 |
-PATCHES=( |
501 |
- "${FILESDIR}/${P}-rme-bigendian-fix.patch" |
502 |
- "${FILESDIR}/${P}-pyqt5-dbus-detection.patch" |
503 |
- "${FILESDIR}/${P}-py3-pyqt5-fixes.patch" |
504 |
- "${FILESDIR}/${P}-additional-py3-fixes.patch" |
505 |
- "${FILESDIR}/${P}-crossbar-router-fix.patch" |
506 |
-) |
507 |
- |
508 |
-myescons() { |
509 |
- local myesconsargs=( |
510 |
- PREFIX="${EPREFIX}/usr" |
511 |
- LIBDIR="${EPREFIX}/usr/$(get_libdir)" |
512 |
- MANDIR="${EPREFIX}/usr/share/man" |
513 |
- UDEVDIR="$(get_udevdir)/rules.d" |
514 |
- CUSTOM_ENV=true |
515 |
- DETECT_USERSPACE_ENV=false |
516 |
- DEBUG=$(usex debug) |
517 |
- PYPKGDIR="$(python_get_sitedir)" |
518 |
- # ENABLE_OPTIMIZATIONS detects cpu type and sets flags accordingly |
519 |
- # -fomit-frame-pointer is added also which can cripple debugging. |
520 |
- # we set flags from portage instead |
521 |
- ENABLE_OPTIMIZATIONS=false |
522 |
- # This only works for JACK1>=0.122.0 or JACK2>=1.9.9, so we block |
523 |
- # lower versions. |
524 |
- ENABLE_SETBUFFERSIZE_API_VER=force |
525 |
- ) |
526 |
- if multilib_is_native_abi; then |
527 |
- myesconsargs+=( |
528 |
- BUILD_MIXER=$(usex qt5 true false) |
529 |
- BUILD_TESTS=$(usex test-programs) |
530 |
- ) |
531 |
- else |
532 |
- myesconsargs+=( |
533 |
- BUILD_MIXER=false |
534 |
- BUILD_TESTS=false |
535 |
- ) |
536 |
- fi |
537 |
- escons "${myesconsargs[@]}" "${@}" |
538 |
-} |
539 |
- |
540 |
-src_prepare() { |
541 |
- default |
542 |
- |
543 |
- # Python3 fixes |
544 |
- sed -i -e 's/\t/ /g' support/mixer-qt4/ffado/mixer/phase88control.py || die |
545 |
- sed -i -e 's/\t/ /g' support/mixer-qt4/ffado/mixer/audiofire.py || die |
546 |
- sed -i -e 's/\bprint \(.*\)$/print(\1)/g' -e '/import commands/d' support/tools/ffado-diag-static || die |
547 |
- |
548 |
- # Always use Qt5 |
549 |
- sed -i -e 's/try:/if False:/' -e 's/except.*/else:/' support/mixer-qt4/ffado/import_pyqt.py || die |
550 |
- |
551 |
- multilib_copy_sources |
552 |
-} |
553 |
- |
554 |
-multilib_src_compile() { |
555 |
- tc-export CC CXX |
556 |
- myescons |
557 |
-} |
558 |
- |
559 |
-multilib_src_install() { |
560 |
- myescons DESTDIR="${D}" WILL_DEAL_WITH_XDG_MYSELF="True" install |
561 |
-} |
562 |
- |
563 |
-multilib_src_install_all() { |
564 |
- einstalldocs |
565 |
- |
566 |
- python_fix_shebang "${D}" |
567 |
- python_optimize "${D}" |
568 |
- |
569 |
- if use qt5; then |
570 |
- newicon "support/xdg/hi64-apps-ffado.png" "ffado.png" |
571 |
- newmenu "support/xdg/ffado.org-ffadomixer.desktop" "ffado-mixer.desktop" |
572 |
- fi |
573 |
-} |