From ec8f8321251c6bc1126dd383ae1a128f6080ee65 Mon Sep 17 00:00:00 2001 From: kth5 Date: Sat, 24 Aug 2024 08:54:32 +0200 Subject: [PATCH] * update libffado to 2.4.9-1 --- libffado/.SRCINFO | 43 +++++++++++++ libffado/.nvchecker.toml | 4 ++ libffado/PKGBUILD | 29 +++------ .../libffado-2.4.8-remove_imp_module.patch | 63 +++++++++++++++++++ 4 files changed, 120 insertions(+), 19 deletions(-) create mode 100644 libffado/.SRCINFO create mode 100644 libffado/.nvchecker.toml create mode 100644 libffado/libffado-2.4.8-remove_imp_module.patch diff --git a/libffado/.SRCINFO b/libffado/.SRCINFO new file mode 100644 index 0000000000..bf99869e0a --- /dev/null +++ b/libffado/.SRCINFO @@ -0,0 +1,43 @@ +pkgbase = libffado + pkgdesc = Driver for FireWire audio devices + pkgver = 2.4.9 + pkgrel = 1 + url = http://www.ffado.org/ + arch = x86_64 + license = GPL-2.0-only or GPL-3.0-only + makedepends = alsa-lib + makedepends = dbus-c++ + makedepends = jack + makedepends = libconfig + makedepends = python-pyqt5 + makedepends = python-setuptools + makedepends = scons + depends = gcc-libs + depends = glibc + depends = glibmm + depends = hicolor-icon-theme + depends = libiec61883 + depends = libraw1394 + depends = libxml++ + depends = python-dbus + optdepends = python-pyqt5: ffado-mixer + provides = libffado.so + source = http://www.ffado.org/files/libffado-2.4.9.tgz + sha512sums = 0a0c61cf9339ab542c85eaefbe017b7613f716ae0ed08d11a37782dd7ef5815b18256c5d1b9240f077c9f59bbf4b4878019cefbd6cab78140477bcad6a9d3e44 + b2sums = ec8300066d47d685aa701316efa6831f05d678c509de341d1b74551bf8a3f04b59dcd80d592e2111670212d4056bd1c150cc23dbf43a797a915bf65ae441c85e + +pkgname = libffado + depends = gcc-libs + depends = glibc + depends = glibmm + depends = hicolor-icon-theme + depends = libiec61883 + depends = libraw1394 + depends = libxml++ + depends = python-dbus + depends = alsa-lib + depends = libasound.so + depends = dbus-c++ + depends = libdbus-c++-1.so + depends = libconfig + depends = libconfig++.so diff --git a/libffado/.nvchecker.toml b/libffado/.nvchecker.toml new file mode 100644 index 0000000000..b567bc765e --- /dev/null +++ b/libffado/.nvchecker.toml @@ -0,0 +1,4 @@ +[libffado] +source = "regex" +regex = "libffado-([\\d.]+)\\.tgz?" +url = "http://ffado.org/" diff --git a/libffado/PKGBUILD b/libffado/PKGBUILD index 0665e9583d..b788d95234 100644 --- a/libffado/PKGBUILD +++ b/libffado/PKGBUILD @@ -5,7 +5,7 @@ # Contributor: Jon Kristian Nilsen pkgname=libffado -pkgver=2.4.8 +pkgver=2.4.9 pkgrel=1 pkgdesc="Driver for FireWire audio devices" arch=(x86_64 powerpc64le powerpc64 powerpc riscv64) @@ -27,21 +27,16 @@ makedepends=( jack libconfig python-pyqt5 + python-setuptools scons ) optdepends=('python-pyqt5: ffado-mixer') provides=(libffado.so) -source=(http://www.ffado.org/files/$pkgname-$pkgver.tgz) -sha512sums=('fbbcd30640c55315f2e65fc6c07afc71a77dd2c9d1b6127ee55cd17e76511ad5f0563135e52397dbf113fb0d5925021a38780f231409bdd920da52e6c1ce3acc') -b2sums=('14b83d55fc9a7b33c888b893c808f8419292fefaa2c2239b4b51c2b84070a584ea72821c8469bb8d965a9a5e6473b6fcfb5e85f4eecd2d424e3167322f8abb81') - -prepare() { - cd $pkgname-$pkgver/$pkgname - # 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 -} +source=( + http://www.ffado.org/files/$pkgname-$pkgver.tgz +) +sha512sums=('0a0c61cf9339ab542c85eaefbe017b7613f716ae0ed08d11a37782dd7ef5815b18256c5d1b9240f077c9f59bbf4b4878019cefbd6cab78140477bcad6a9d3e44') +b2sums=('ec8300066d47d685aa701316efa6831f05d678c509de341d1b74551bf8a3f04b59dcd80d592e2111670212d4056bd1c150cc23dbf43a797a915bf65ae441c85e') build() { local site_packages=$(python -c "import site; print(site.getsitepackages()[0])") @@ -59,7 +54,7 @@ build() { powerpc64*|riscv64) scons_options+=(DETECT_USERSPACE_ENV=false) ;; esac - cd $pkgname-$pkgver/$pkgname + cd $pkgname-$pkgver scons "${scons_options[@]}" } @@ -70,11 +65,7 @@ package() { libconfig libconfig++.so ) - cd $pkgname-$pkgver/$pkgname - scons DESTDIR="$pkgdir" WILL_DEAL_WITH_XDG_MYSELF=True install - 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" + cd $pkgname-$pkgver + scons DESTDIR="$pkgdir" install install -vDm 644 {AUTHORS,README} -t "$pkgdir/usr/share/doc/$pkgname/" } - -# vim:set ts=2 sw=2 et: diff --git a/libffado/libffado-2.4.8-remove_imp_module.patch b/libffado/libffado-2.4.8-remove_imp_module.patch new file mode 100644 index 0000000000..717c100794 --- /dev/null +++ b/libffado/libffado-2.4.8-remove_imp_module.patch @@ -0,0 +1,63 @@ +diff -ruN a/libffado/admin/pyuic.py b/libffado/admin/pyuic.py +--- a/libffado/admin/pyuic.py 2022-02-25 13:25:10.000000000 +0100 ++++ b/libffado/admin/pyuic.py 2024-04-06 20:43:09.741707732 +0200 +@@ -21,7 +21,7 @@ + # along with this program. If not, see . + # + +-import imp ++from importlib import util + + def pyuic_action( target, source, env ): + env.Execute( "pyuic " + str( source[0] ) + " > " + str( target[0] ) ) +@@ -34,7 +34,7 @@ + context.Message( "Checking for pyuic (by checking for the python module pyqtconfig) " ) + ret = True + try: +- imp.find_module( "pyqtconfig" ) ++ util.find_spec( "pyqtconfig" ) + except ImportError: + ret = False + context.Result( ret ) +diff -ruN a/libffado/admin/pyuic4.py b/libffado/admin/pyuic4.py +--- a/libffado/admin/pyuic4.py 2022-02-25 13:25:10.000000000 +0100 ++++ b/libffado/admin/pyuic4.py 2024-04-06 20:43:42.868641509 +0200 +@@ -21,7 +21,7 @@ + # along with this program. If not, see . + # + +-import imp ++from importlib import util + + def pyuic4_action( target, source, env ): + env.Execute( "pyuic4 " + str( source[0] ) + " > " + str( target[0] ) ) +@@ -34,7 +34,7 @@ + context.Message( "Checking for pyuic4 (by checking for the python module pyqtconfig) " ) + ret = True + try: +- imp.find_module( "pyqtconfig" ) ++ util.find_spec( "pyqtconfig" ) + except ImportError: + ret = False + context.Result( ret ) +diff -ruN a/libffado/admin/pyuic5.py b/libffado/admin/pyuic5.py +--- a/libffado/admin/pyuic5.py 2022-02-25 13:25:10.000000000 +0100 ++++ b/libffado/admin/pyuic5.py 2024-04-06 20:42:25.674679876 +0200 +@@ -22,7 +22,7 @@ + # along with this program. If not, see . + # + +-import imp ++from importlib import util + + def pyuic5_action( target, source, env ): + env.Execute( "pyuic5 " + str( source[0] ) + " > " + str( target[0] ) ) +@@ -35,7 +35,7 @@ + context.Message( "Checking for pyuic5 (by checking for the python module pyqtconfig) " ) + ret = True + try: +- imp.find_module( "pyqtconfig" ) ++ util.find_spec( "pyqtconfig" ) + except ImportError: + ret = False + context.Result( ret )