[arch-commits] Commit in libffado/trunk (3 files)

[David Runge]

    Date: Saturday, September 21, 2019 @ 13:03:43
  Author: dvzrv
Revision: 511359

upgpkg: libffado 2.4.2-1

Upgrading to 2.4.2. Dropping all patches in regards to python3/qt5 for ffado-mixer and python3 based scons, as they have been upstreamed.

Modified:
  libffado/trunk/PKGBUILD
Deleted:
  libffado/trunk/libffado-2.4.1-fix-python3-pyqt5.diff
  libffado/trunk/libffado-2.4.1-fix-scons.diff

---------------------------------------+
 PKGBUILD                              |   14 ++------
 libffado-2.4.1-fix-python3-pyqt5.diff |   55 --------------------------------
 libffado-2.4.1-fix-scons.diff         |   39 ----------------------
 3 files changed, 4 insertions(+), 104 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-21 12:17:19 UTC (rev 511358)
+++ PKGBUILD	2019-09-21 13:03:43 UTC (rev 511359)
@@ -4,8 +4,8 @@
 # Contributor: Jon Kristian Nilsen <jokr.nilsen at gmail.com>
 
 pkgname=libffado
-pkgver=2.4.1
-pkgrel=5
+pkgver=2.4.2
+pkgrel=1
 pkgdesc="Driver for FireWire audio devices"
 arch=('x86_64')
 url="http://www.ffado.org/"
@@ -15,17 +15,11 @@
 makedepends=('jack' 'python-pyqt5' 'scons')
 optdepends=('python-pyqt5: ffado-mixer')
 provides=('libffado.so')
-source=("http://www.ffado.org/files/${pkgname}-${pkgver}.tgz"
-        "${pkgname}-2.4.1-fix-python3-pyqt5.diff"
-        "${pkgname}-2.4.1-fix-scons.diff")
-sha512sums=('0859f17b87c68108bbde726d1cf8ab0b99f6f7f02cbe36acd8b451e112688a4d1edc21134eb4a2edc8c92dcf5f5da52efeabb2ad0dc07804ed1aa664a3b38d74'
-            '39beb2399377d7ee13a43ddd7a80907eb94a2f8f146c5a94a4ba0e1471b3369d2b1519cb8b15c3e2352d9854048882cc037058a1992e6e87270fe9e17fdba91e'
-            '69d0771a1abf5e40473e4b46fa53fdeead44de78108b3901841b68649f203c64ac6afe4f925c57f1126792def3be246a3600d9032f1a558bb536c0b28fe61f68')
+source=("http://www.ffado.org/files/${pkgname}-${pkgver}.tgz")
+sha512sums=('96533ed15f95153bf34dffb55ab97cf0f3f6127c5b7a86edeeb55fe74540bbc23b40f494abfa41074176a04f18db311a56e436a0ef7b8afae612f2d1f641ab10')
 
 prepare() {
   cd "${pkgname}-${pkgver}"
-  patch -Np1 -i "../${pkgname}-2.4.1-fix-python3-pyqt5.diff"
-  patch -Np1 -i "../${pkgname}-2.4.1-fix-scons.diff"
   # fix icon name, so it's coherent with XDG desktop file name
   sed -e 's/hi64-apps-ffado/ffado-mixer/g' \
       -i support/xdg/ffado.org-ffadomixer.desktop

Deleted: libffado-2.4.1-fix-python3-pyqt5.diff
===================================================================
--- libffado-2.4.1-fix-python3-pyqt5.diff	2019-09-21 12:17:19 UTC (rev 511358)
+++ libffado-2.4.1-fix-python3-pyqt5.diff	2019-09-21 13:03:43 UTC (rev 511359)
@@ -1,55 +0,0 @@
---- libffado-2.4.1-a/support/mixer-qt4/ffado/import_pyqt.py	2017-06-03 10:34:29.000000000 +0200
-+++ libffado-2.4.1-b/support/mixer-qt4/ffado/import_pyqt.py	2018-03-06 17:19:15.024087729 +0100
-@@ -20,27 +20,37 @@
- # along with this program.  If not, see <http://www.gnu.org/licenses/>.
- #
- 
-+import sys
-+ffado_python3 = sys.version_info >= (3,)
- ffado_pyqt_version = 4
- 
--# This module handles the importing of PyQt modules for both PyQt4 and PyQt5.
--# The idea is to first try importing PyQt4.  If there's an import error it's
-+# This module handles the importing of PyQt modules for both PyQt4 and PyQt5 on
-+# python2 or python3.
-+# Using python2 the first try is to import PyQt4. If there's an import error it's
- # assumed PyQt5 is present instead and that is tried.
-+# Using python3 PyQt5 is assumed (PyQt4 is missing the old APIs and can
-+# therefore not be used).
- #
- # All modules used by any part of ffado-mixer are imported.  This greatly
- # simplifies the process.  Otherwise the modules to import would be delivered
- # by string variables, and there isn't a supported way to do this across 
- # Python2 and Python3.
--try:
--    from PyQt4 import QtGui, QtCore, Qt, uic
--    from PyQt4.QtCore import QByteArray, QObject, QTimer, Qt, pyqtSignal, QString, pyqtSlot
--    from PyQt4.QtGui import *
--    ffado_pyqt_version = 4
--except ImportError:
--    from PyQt5 import QtGui, Qt, QtCore, Qt, QtWidgets, uic
--    from PyQt5.QtCore import QByteArray, QObject, pyqtSignal, pyqtSlot, QTimer, Qt
--    from PyQt5.QtGui import *
--    from PyQt5.QtWidgets import *
--    ffado_pyqt_version = 5
-+if ffado_python3:
-+  from PyQt5 import QtGui, Qt, QtCore, Qt, QtWidgets, uic
-+  from PyQt5.QtCore import QByteArray, QObject, pyqtSignal, pyqtSlot, QTimer, Qt
-+  from PyQt5.QtGui import *
-+  from PyQt5.QtWidgets import *
-+  ffado_pyqt_version = 5
-+else:
-+  try:
-+      from PyQt4 import QtGui, QtCore, Qt, uic
-+      from PyQt4.QtCore import QByteArray, QObject, QTimer, Qt, pyqtSignal, QString, pyqtSlot
-+      from PyQt4.QtGui import *
-+      ffado_pyqt_version = 4
-+  except ImportError:
-+      from PyQt5 import QtGui, Qt, QtCore, Qt, QtWidgets, uic
-+      from PyQt5.QtCore import QByteArray, QObject, pyqtSignal, pyqtSlot, QTimer, Qt
-+      from PyQt5.QtGui import *
-+      from PyQt5.QtWidgets import *
-+      ffado_pyqt_version = 5
- 
--import sys
--ffado_python3 = sys.version_info >= (3,)

Deleted: libffado-2.4.1-fix-scons.diff
===================================================================
--- libffado-2.4.1-fix-scons.diff	2019-09-21 12:17:19 UTC (rev 511358)
+++ libffado-2.4.1-fix-scons.diff	2019-09-21 13:03:43 UTC (rev 511359)
@@ -1,39 +0,0 @@
-diff -ruN a/SConstruct b/SConstruct
---- a/SConstruct	2018-03-04 07:13:17.000000000 +0100
-+++ b/SConstruct	2019-08-07 20:13:43.578850445 +0200
-@@ -719,8 +719,8 @@
-         # /bin/mount:     file format elf64-x86-64
-         # or like this:
-         # /bin/mount:     file format elf32-powerpc
--        for line in x.split(b'\n'):
--            line = line.strip().decode()
-+        for line in x.split('\n'):
-+            line = line.strip()
-             if line.startswith(real_exe):
-                 x, fmt = line.rsplit(None, 1)
-                 answer = 'elf32' in fmt
-diff -ruN a/support/mixer-qt4/SConscript b/support/mixer-qt4/SConscript
---- a/support/mixer-qt4/SConscript	2015-04-12 13:18:15.000000000 +0200
-+++ b/support/mixer-qt4/SConscript	2019-08-07 20:12:52.849369440 +0200
-@@ -29,16 +29,12 @@
- if env['BUILD_MIXER'] == 'true':
-     e = env.Clone()
- 
--    def findfiles( arg, dirname, names ):
--        for name in names:
--            if name.startswith("."):
--                names.remove(name)
--        for name in names:
--            if '.pyc' not in name and '.in' not in name:
--                arg.append( os.path.join( dirname, name ) )
--
-     pythonfiles = [ 'ffado/config.py' ]
--    os.path.walk( "ffado", findfiles, pythonfiles )
-+    for root, dirs, files in os.walk( "ffado" ):
-+        for name in files:
-+            if name.endswith( '.pyc' ) or '.in' in name or name.startswith("."):
-+                continue
-+            pythonfiles.append( os.path.join( root, name ) )
- 
-     e.ScanReplace( "ffado/config.py.in" )
-     e.Depends( "ffado/config.py", "#/SConstruct" )