Date: Sunday, May 16, 2021 @ 19:28:04 Author: bgyorgy Revision: 935943
archrelease: copy trunk to community-x86_64 Added: libffado/repos/community-x86_64/PKGBUILD (from rev 935942, libffado/trunk/PKGBUILD) libffado/repos/community-x86_64/libffado-2.4.2-python38.patch (from rev 935942, libffado/trunk/libffado-2.4.2-python38.patch) Deleted: libffado/repos/community-x86_64/PKGBUILD libffado/repos/community-x86_64/libffado-2.4.2-python38.patch -------------------------------+ PKGBUILD | 115 ++++++++++++++++++++-------------------- libffado-2.4.2-python38.patch | 48 ++++++++-------- 2 files changed, 83 insertions(+), 80 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-05-16 19:27:58 UTC (rev 935942) +++ PKGBUILD 2021-05-16 19:28:04 UTC (rev 935943) @@ -1,56 +0,0 @@ -# Maintainer: David Runge <dv...@archlinux.org> -# Contributor: Ray Rashif <sc...@archlinux.org> -# Contributor: galiyo...@gmail.com -# Contributor: Jon Kristian Nilsen <jokr.nil...@gmail.com> - -pkgname=libffado -pkgver=2.4.4 -pkgrel=2 -pkgdesc="Driver for FireWire audio devices" -arch=('x86_64') -url="http://www.ffado.org/" -license=('GPL3') -depends=('gcc-libs' 'glibc' 'glibmm' 'hicolor-icon-theme' 'libavc1394' -'libiec61883' 'libxml++' 'python-dbus') -makedepends=('alsa-lib' 'dbus-c++' 'jack' 'libconfig' 'python-pyqt5' 'scons') -optdepends=('python-pyqt5: ffado-mixer') -provides=('libffado.so') -source=("http://www.ffado.org/files/${pkgname}-${pkgver}.tgz") -sha512sums=('065b7f9ce9bf58320c02353b63ed17b3610d0ee8a2de58de27159b2190e39c779094b01ae1123c087387e6077375e646b564b9e7717b192865b2f1f22a3acc80') -b2sums=('70d3b17f7d7317acc63351faaefb27fa850664015134887f0508b4a76aabbf6e9573f87eb2dd9792ac5f4f4b06ac7c872afa33af6af0341e6cceeb43e7a79526') - -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 -} - -build() { - local python_version=$(python -c 'import sys; print(".".join(map(str, sys.version_info[:2])))') - cd "${pkgname}-${pkgver}" - scons PREFIX=/usr \ - DEBUG=no \ - CUSTOM_ENV=True \ - MANDIR='/usr/share/man' \ - PYTHON_INTERPRETER='/usr/bin/python3' \ - PYPKGDIR="/usr/lib/python${python_version}/site-packages" \ - UDEVDIR='/usr/lib/udev/rules.d' -} - -package() { - depends+=('libasound.so' 'libconfig++.so' 'libdbus-c++-1.so' ) - cd "${pkgname}-${pkgver}" - scons DESTDIR="${pkgdir}" WILL_DEAL_WITH_XDG_MYSELF="True" install - - # XDG - install -vDm 644 support/xdg/ffado.org-ffadomixer.desktop \ - "${pkgdir}/usr/share/applications/ffado-mixer.desktop" - install -vDm 644 support/xdg/hi64-apps-ffado.png \ - "${pkgdir}/usr/share/icons/hicolor/64x64/apps/ffado-mixer.png" - - # docs - install -t "${pkgdir}/usr/share/doc/${pkgname}" -vDm 644 {AUTHORS,README} -} - -# vim:set ts=2 sw=2 et: Copied: libffado/repos/community-x86_64/PKGBUILD (from rev 935942, libffado/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-05-16 19:28:04 UTC (rev 935943) @@ -0,0 +1,59 @@ +# Maintainer: David Runge <dv...@archlinux.org> +# Contributor: Ray Rashif <sc...@archlinux.org> +# Contributor: galiyo...@gmail.com +# Contributor: Jon Kristian Nilsen <jokr.nil...@gmail.com> + +pkgname=libffado +pkgver=2.4.4 +pkgrel=3 +pkgdesc="Driver for FireWire audio devices" +arch=('x86_64') +url="http://www.ffado.org/" +license=('GPL3') +depends=('gcc-libs' 'glibc' 'glibmm' 'hicolor-icon-theme' 'libavc1394' +'libiec61883' 'libxml++' 'python-dbus') +makedepends=('alsa-lib' 'dbus-c++' 'jack' 'libconfig' 'python-pyqt5' 'scons') +optdepends=('python-pyqt5: ffado-mixer') +provides=('libffado.so') +source=("http://www.ffado.org/files/${pkgname}-${pkgver}.tgz") +sha512sums=('065b7f9ce9bf58320c02353b63ed17b3610d0ee8a2de58de27159b2190e39c779094b01ae1123c087387e6077375e646b564b9e7717b192865b2f1f22a3acc80') +b2sums=('70d3b17f7d7317acc63351faaefb27fa850664015134887f0508b4a76aabbf6e9573f87eb2dd9792ac5f4f4b06ac7c872afa33af6af0341e6cceeb43e7a79526') + +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 id, so it's coherent with XDG desktop file name + sed -e 's/ffado.org-ffadomixer.desktop/ffado-mixer.desktop/g' \ + -i support/xdg/ffado-mixer.appdata.xml +} + +build() { + local python_version=$(python -c 'import sys; print(".".join(map(str, sys.version_info[:2])))') + cd "${pkgname}-${pkgver}" + scons PREFIX=/usr \ + DEBUG=no \ + CUSTOM_ENV=True \ + MANDIR='/usr/share/man' \ + PYTHON_INTERPRETER='/usr/bin/python3' \ + PYPKGDIR="/usr/lib/python${python_version}/site-packages" \ + UDEVDIR='/usr/lib/udev/rules.d' +} + +package() { + depends+=('libasound.so' 'libconfig++.so' 'libdbus-c++-1.so' ) + cd "${pkgname}-${pkgver}" + scons DESTDIR="${pkgdir}" WILL_DEAL_WITH_XDG_MYSELF="True" install + + # XDG + install -vDm 644 support/xdg/ffado.org-ffadomixer.desktop \ + "${pkgdir}/usr/share/applications/ffado-mixer.desktop" + install -vDm 644 support/xdg/hi64-apps-ffado.png \ + "${pkgdir}/usr/share/icons/hicolor/64x64/apps/ffado-mixer.png" + + # docs + install -t "${pkgdir}/usr/share/doc/${pkgname}" -vDm 644 {AUTHORS,README} +} + +# vim:set ts=2 sw=2 et: Deleted: libffado-2.4.2-python38.patch =================================================================== --- libffado-2.4.2-python38.patch 2021-05-16 19:27:58 UTC (rev 935942) +++ libffado-2.4.2-python38.patch 2021-05-16 19:28:04 UTC (rev 935943) @@ -1,24 +0,0 @@ -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 \ Copied: libffado/repos/community-x86_64/libffado-2.4.2-python38.patch (from rev 935942, libffado/trunk/libffado-2.4.2-python38.patch) =================================================================== --- libffado-2.4.2-python38.patch (rev 0) +++ libffado-2.4.2-python38.patch 2021-05-16 19:28:04 UTC (rev 935943) @@ -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 \