diff options
| author | dvzrv <dvzrv@9fca08f4-af9d-4005-b8df-a31f2cc04f65> | 2019-11-24 20:10:22 +0000 |
|---|---|---|
| committer | dvzrv <dvzrv@9fca08f4-af9d-4005-b8df-a31f2cc04f65> | 2019-11-24 20:10:22 +0000 |
| commit | 3cace3a152b38d0a8e9ff2601c1c04a4fa6fecb0 (patch) | |
| tree | 63e48aa092e1890c60400402e3df32b0cf50d430 | |
| parent | 9de0a74acec00fa382d082a149c88aee35ed96f1 (diff) | |
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).
git-svn-id: file:///srv/repos/svn-community/svn@533091 9fca08f4-af9d-4005-b8df-a31f2cc04f65
| -rw-r--r-- | libffado/trunk/PKGBUILD | 19 | ||||
| -rw-r--r-- | libffado/trunk/libffado-2.4.2-python38.patch | 24 |
2 files changed, 36 insertions, 7 deletions
diff --git a/libffado/trunk/PKGBUILD b/libffado/trunk/PKGBUILD index e82136f1fbf..7c757a56756 100644 --- a/libffado/trunk/PKGBUILD +++ b/libffado/trunk/PKGBUILD @@ -1,28 +1,33 @@ -# Maintainer: David Runge <dave@sleepmap.de> +# Maintainer: David Runge <dvzrv@archlinux.org> # Contributor: Ray Rashif <schiv@archlinux.org> # Contributor: galiyosha@gmail.com # Contributor: Jon Kristian Nilsen <jokr.nilsen@gmail.com> 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}" # 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() { diff --git a/libffado/trunk/libffado-2.4.2-python38.patch b/libffado/trunk/libffado-2.4.2-python38.patch new file mode 100644 index 00000000000..d0ad2e956d1 --- /dev/null +++ b/libffado/trunk/libffado-2.4.2-python38.patch @@ -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 \ |