Date: Sunday, November 24, 2019 @ 20:10:22 Author: dvzrv Revision: 533091
upgpkg: libffado 2.4.2-3 Updating maintainer info. Switching to correct license (GPL3). Adding all direct library dependencies. Adding patch to fix a type conversion problem with dbus.Int32 in ffado-mixer, introduced with python3.8 (upstreamed). Added: libffado/trunk/libffado-2.4.2-python38.patch Modified: libffado/trunk/PKGBUILD -------------------------------+ PKGBUILD | 19 ++++++++++++------- libffado-2.4.2-python38.patch | 24 ++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 7 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-11-24 19:22:24 UTC (rev 533090) +++ PKGBUILD 2019-11-24 20:10:22 UTC (rev 533091) @@ -1,4 +1,4 @@ -# Maintainer: David Runge <[email protected]> +# Maintainer: David Runge <[email protected]> # Contributor: Ray Rashif <[email protected]> # Contributor: [email protected] # Contributor: Jon Kristian Nilsen <[email protected]> @@ -5,18 +5,21 @@ pkgname=libffado pkgver=2.4.2 -pkgrel=2 +pkgrel=3 pkgdesc="Driver for FireWire audio devices" arch=('x86_64') url="http://www.ffado.org/"; -license=('GPL') -depends=('alsa-lib' 'dbus-c++' 'hicolor-icon-theme' 'libavc1394' 'libconfig' -'libiec61883' 'libxml++' 'python-dbus') +license=('GPL3') +depends=('alsa-lib' 'gcc-libs' 'glibc' 'glibmm' 'hicolor-icon-theme' +'libavc1394' 'libdbus-c++-1.so' 'libconfig++.so' 'libiec61883' 'libxml++' +'python-dbus') makedepends=('jack' 'python-pyqt5' 'scons') optdepends=('python-pyqt5: ffado-mixer') provides=('libffado.so') -source=("http://www.ffado.org/files/${pkgname}-${pkgver}.tgz";) -sha512sums=('96533ed15f95153bf34dffb55ab97cf0f3f6127c5b7a86edeeb55fe74540bbc23b40f494abfa41074176a04f18db311a56e436a0ef7b8afae612f2d1f641ab10') +source=("http://www.ffado.org/files/${pkgname}-${pkgver}.tgz"; + "${pkgname}-2.4.2-python38.patch") +sha512sums=('96533ed15f95153bf34dffb55ab97cf0f3f6127c5b7a86edeeb55fe74540bbc23b40f494abfa41074176a04f18db311a56e436a0ef7b8afae612f2d1f641ab10' + '5087aef1dd9bb2aa3c9c768d2ae8edffc11b6a3491f5df8df097b9ea0c7ff88d29f7c98d014d86805cd1b81fc5eb0f7b937a4607daf705a41310c20c66db93b3') prepare() { cd "${pkgname}-${pkgver}" @@ -23,6 +26,8 @@ # 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 + # fix missing type conversion for python >= 3.8 + patch -Np1 -i "../${pkgname}-2.4.2-python38.patch" } build() { Added: libffado-2.4.2-python38.patch =================================================================== --- libffado-2.4.2-python38.patch (rev 0) +++ libffado-2.4.2-python38.patch 2019-11-24 20:10:22 UTC (rev 533091) @@ -0,0 +1,24 @@ +diff -ruN a/support/mixer-qt4/ffado/configuration.py b/support/mixer-qt4/ffado/configuration.py +--- a/support/mixer-qt4/ffado/configuration.py 2017-03-28 13:38:34.000000000 +0200 ++++ b/support/mixer-qt4/ffado/configuration.py 2019-11-24 20:55:05.284341627 +0100 +@@ -20,7 +20,8 @@ + # along with this program. If not, see <http://www.gnu.org/licenses/>. + # + +-import re, os ++import os ++import dbus + + import shlex + +@@ -53,6 +54,10 @@ + self.addDevice( dev ) + + def getDeviceById( self, vendor, model ): ++ if isinstance(vendor, dbus.Int32): ++ vendor = str(int(vendor)) ++ if isinstance(model, dbus.Int32): ++ model = str(int(model)) + log.debug("DeviceList::getDeviceById( %s, %s )" % (vendor, model )) + for dev in self.devices: + if int("%s" % dev['vendorid'], 0) == int("%s" % vendor, 0) and \
