[arch-commits] Commit in libffado/repos/community-x86_64 (3 files)
David Runge
dvzrv at archlinux.org
Sun Nov 24 20:10:29 UTC 2019
Date: Sunday, November 24, 2019 @ 20:10:28
Author: dvzrv
Revision: 533092
archrelease: copy trunk to community-x86_64
Added:
libffado/repos/community-x86_64/PKGBUILD
(from rev 533091, libffado/trunk/PKGBUILD)
libffado/repos/community-x86_64/libffado-2.4.2-python38.patch
(from rev 533091, libffado/trunk/libffado-2.4.2-python38.patch)
Deleted:
libffado/repos/community-x86_64/PKGBUILD
-------------------------------+
PKGBUILD | 111 ++++++++++++++++++++--------------------
libffado-2.4.2-python38.patch | 24 ++++++++
2 files changed, 82 insertions(+), 53 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-11-24 20:10:22 UTC (rev 533091)
+++ PKGBUILD 2019-11-24 20:10:28 UTC (rev 533092)
@@ -1,53 +0,0 @@
-# Maintainer: David Runge <dave at sleepmap.de>
-# Contributor: Ray Rashif <schiv at archlinux.org>
-# Contributor: galiyosha at gmail.com
-# Contributor: Jon Kristian Nilsen <jokr.nilsen at gmail.com>
-
-pkgname=libffado
-pkgver=2.4.2
-pkgrel=2
-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')
-makedepends=('jack' 'python-pyqt5' 'scons')
-optdepends=('python-pyqt5: ffado-mixer')
-provides=('libffado.so')
-source=("http://www.ffado.org/files/${pkgname}-${pkgver}.tgz")
-sha512sums=('96533ed15f95153bf34dffb55ab97cf0f3f6127c5b7a86edeeb55fe74540bbc23b40f494abfa41074176a04f18db311a56e436a0ef7b8afae612f2d1f641ab10')
-
-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() {
- cd "${pkgname}-${pkgver}"
- scons PREFIX=/usr \
- DEBUG=no \
- CUSTOM_ENV=True \
- MANDIR='/usr/share/man' \
- PYTHON_INTERPRETER='/usr/bin/python3' \
- PYPKGDIR='/usr/lib/python3.8/site-packages' \
- UDEVDIR='/usr/lib/udev/rules.d'
-}
-
-package() {
- 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 533091, libffado/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-11-24 20:10:28 UTC (rev 533092)
@@ -0,0 +1,58 @@
+# Maintainer: David Runge <dvzrv at archlinux.org>
+# Contributor: Ray Rashif <schiv at archlinux.org>
+# Contributor: galiyosha at gmail.com
+# Contributor: Jon Kristian Nilsen <jokr.nilsen at gmail.com>
+
+pkgname=libffado
+pkgver=2.4.2
+pkgrel=3
+pkgdesc="Driver for FireWire audio devices"
+arch=('x86_64')
+url="http://www.ffado.org/"
+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"
+ "${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() {
+ cd "${pkgname}-${pkgver}"
+ scons PREFIX=/usr \
+ DEBUG=no \
+ CUSTOM_ENV=True \
+ MANDIR='/usr/share/man' \
+ PYTHON_INTERPRETER='/usr/bin/python3' \
+ PYPKGDIR='/usr/lib/python3.8/site-packages' \
+ UDEVDIR='/usr/lib/udev/rules.d'
+}
+
+package() {
+ 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/libffado-2.4.2-python38.patch (from rev 533091, libffado/trunk/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:28 UTC (rev 533092)
@@ -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 \
More information about the arch-commits
mailing list