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 new file mode 100644 index 0000000..4d40b82 --- /dev/null +++ b/0001-ffado-mixer-Fix-another-Python-3.10-int-float-crash.patch @@ -0,0 +1,28 @@ +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 172bcd0..9062a3b 100644 --- a/libffado.spec +++ b/libffado.spec @@ -7,7 +7,7 @@ Summary: Free firewire audio driver library Name: libffado Version: 2.4.6 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 or GPLv3 URL: http://www.ffado.org/ Source0: http://www.ffado.org/files/%{name}-%{version}.tgz @@ -18,6 +18,8 @@ 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 @@ -80,6 +82,7 @@ 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|' \ @@ -162,6 +165,9 @@ appstream-util validate-relax --nonet \ %changelog +* Sat Sep 03 2022 Nils Philippsen - 2.4.6-3 +- Fix yet another int/float crash, this time in the crossbar router + * Thu Jul 21 2022 Fedora Release Engineering - 2.4.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild