diff --git a/.gitignore b/.gitignore index 33bd3ab..749eaf7 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ libffado-2.0.1-svn1864.tar.bz2 /libffado-2.4.4.tgz /libffado-2.4.5.tgz /libffado-2.4.6.tgz +/libffado-2.4.7.tgz diff --git a/0001-ffado-mixer-Fix-another-Python-3.10-int-float-crash.patch b/0001-ffado-mixer-Fix-another-Python-3.10-int-float-crash.patch deleted file mode 100644 index 4d40b82..0000000 --- a/0001-ffado-mixer-Fix-another-Python-3.10-int-float-crash.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 96cb4262139d3df7e3fec5b5b775c0a61248b652 Mon Sep 17 00:00:00 2001 -From: Nils Philippsen -Date: Sat, 3 Sep 2022 00:34:39 +0200 -Subject: [PATCH] ffado-mixer: Fix another Python 3.10 int/float crash - -This one let switching to the crossbar router crash ffado-mixer. - -Signed-off-by: Nils Philippsen ---- - libffado/support/mixer-qt4/ffado/widgets/crossbarrouter.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libffado/support/mixer-qt4/ffado/widgets/crossbarrouter.py b/libffado/support/mixer-qt4/ffado/widgets/crossbarrouter.py -index 4a67c23a..bb222889 100644 ---- a/libffado/support/mixer-qt4/ffado/widgets/crossbarrouter.py -+++ b/libffado/support/mixer-qt4/ffado/widgets/crossbarrouter.py -@@ -53,7 +53,7 @@ class VuMeter(QFrame): - p = QPainter(self) - value = self.level/4096 - r = self.rect() -- r.setHeight(r.height() * math.sqrt(value)) -+ r.setHeight(int(r.height() * math.sqrt(value))) - r.moveBottom(self.rect().height()) - p.fillRect(r, self.palette().highlight()) - --- -2.37.2 - diff --git a/libffado.spec b/libffado.spec index c19bdc2..9887eab 100644 --- a/libffado.spec +++ b/libffado.spec @@ -6,7 +6,7 @@ Summary: Free firewire audio driver library Name: libffado -Version: 2.4.6 +Version: 2.4.7 Release: %autorelease License: GPLv2 or GPLv3 URL: http://www.ffado.org/ @@ -18,8 +18,6 @@ Source9: libffado-snapshot.sh Patch0: libffado-2.4.4-no-test-apps.patch Patch1: libffado-2.4.4-icon-name.patch Patch2: libffado-2.4.4-scons-quirk.patch -# Fix int/float crash in crossbar router -Patch3: 0001-ffado-mixer-Fix-another-Python-3.10-int-float-crash.patch BuildRequires: alsa-lib-devel BuildRequires: dbus-c++-devel @@ -82,7 +80,6 @@ Applications and utilities for use with libffado. %if %needs_scons_quirk %patch2 -p1 -b .scons-quirk %endif -%patch3 -p2 -b .crossbar-router-crash # Fix Python shebangs sed -i 's|/usr/bin/.*python$|/usr/bin/python3|' \ diff --git a/sources b/sources index 5895210..e748454 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libffado-2.4.6.tgz) = dac651233ea94c19834e810c64230bcbd5516de9e694ced1b6497ad927d734c527b3a556281676393674d33da768cb2431e7da1a0fdfc6ceb268e897029aa584 +SHA512 (libffado-2.4.7.tgz) = 424a9ca7ded12e72d77a50d7ddf4e50dc0d55b80d725499df7609ce60d0eac8b24a41d9b8e4e74f78bdefe114b61bd5f1ec09a6d083f4a58475e66d61153f075