diff --git a/.gitignore b/.gitignore index f61690c..33bd3ab 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ libffado-2.0.1-svn1864.tar.bz2 /libffado-2.4.3.tgz /libffado-2.4.4.tgz /libffado-2.4.5.tgz +/libffado-2.4.6.tgz diff --git a/0001-Cast-more-values-to-int-to-avoid-crashes.patch b/0001-Cast-more-values-to-int-to-avoid-crashes.patch deleted file mode 100644 index 211538b..0000000 --- a/0001-Cast-more-values-to-int-to-avoid-crashes.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 9d4f2266ee06acc69f312cf2d67047ff74d60b95 Mon Sep 17 00:00:00 2001 -From: Nils Philippsen -Date: Thu, 7 Apr 2022 17:09:57 +0200 -Subject: [PATCH] Cast more values to int to avoid crashes - -Signed-off-by: Nils Philippsen ---- - .../support/mixer-qt4/ffado/widgets/matrixmixer.py | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/libffado/support/mixer-qt4/ffado/widgets/matrixmixer.py b/libffado/support/mixer-qt4/ffado/widgets/matrixmixer.py -index f63f6fc7..6da8bf40 100644 ---- a/libffado/support/mixer-qt4/ffado/widgets/matrixmixer.py -+++ b/libffado/support/mixer-qt4/ffado/widgets/matrixmixer.py -@@ -210,7 +210,9 @@ class MixerNode(QAbstractSlider): - newpos = ev.posF() if ffado_pyqt_version == 4 else ev.localPos() - change = newpos.y() - self.pos.y() - #log.debug("MixerNode.mouseReleaseEvent() change %s" % (str(change))) -- self.setValue( self.tmpvalue - math.copysign(pow(abs(change), 2), change) ) -+ self.setValue( -+ int(self.tmpvalue - math.copysign(pow(abs(change), 2), change)) -+ ) - ev.accept() - - def mouseReleaseEvent(self, ev): -@@ -218,7 +220,9 @@ class MixerNode(QAbstractSlider): - newpos = ev.posF() if ffado_pyqt_version == 4 else ev.localPos() - change = newpos.y() - self.pos.y() - #log.debug("MixerNode.mouseReleaseEvent() change %s" % (str(change))) -- self.setValue( self.tmpvalue - math.copysign(pow(abs(change), 2), change) ) -+ self.setValue( -+ int(self.tmpvalue - math.copysign(pow(abs(change), 2), change)) -+ ) - self.pos = QtCore.QPointF(0, 0) - del self.tmpvalue - ev.accept() -@@ -229,7 +233,9 @@ class MixerNode(QAbstractSlider): - if (ev.modifiers() & Qt.ControlModifier): - tmpvalue = self.value() - change = ev.delta()/8 -- self.setValue( tmpvalue + math.copysign(pow(abs(change), 2), change) ) -+ self.setValue( -+ int(self.tmpvalue - math.copysign(pow(abs(change), 2), change)) -+ ) - ev.accept() - else: - ev.ignore() --- -2.35.1 - diff --git a/libffado.spec b/libffado.spec index 8e7c839..da96c9d 100644 --- a/libffado.spec +++ b/libffado.spec @@ -6,8 +6,8 @@ Summary: Free firewire audio driver library Name: libffado -Version: 2.4.5 -Release: 3%{?dist} +Version: 2.4.6 +Release: 1%{?dist} License: GPLv2 or GPLv3 URL: http://www.ffado.org/ Source0: http://www.ffado.org/files/%{name}-%{version}.tgz @@ -18,7 +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 -Patch3: 0001-Cast-more-values-to-int-to-avoid-crashes.patch BuildRequires: alsa-lib-devel BuildRequires: dbus-c++-devel @@ -81,7 +80,6 @@ Applications and utilities for use with libffado. %if %needs_scons_quirk %patch2 -p1 -b .scons-quirk %endif -%patch3 -p2 -b .cast-more-values # Fix Python shebangs sed -i 's|/usr/bin/.*python$|/usr/bin/python3|' \ @@ -164,6 +162,9 @@ appstream-util validate-relax --nonet \ %changelog +* Mon Jul 18 2022 Nils Philippsen - 2.4.6-1 +- Version 2.4.6 + * Mon Jun 13 2022 Python Maint - 2.4.5-3 - Rebuilt for Python 3.11 diff --git a/sources b/sources index 8224679..5895210 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libffado-2.4.5.tgz) = a2c1d0515e14015b7803c4d52d67605afec27ae2569888dec085375ed4a488f4885b5033369e52305e668a35289d3bd749a9babb5778df339fa93553c23af30f +SHA512 (libffado-2.4.6.tgz) = dac651233ea94c19834e810c64230bcbd5516de9e694ced1b6497ad927d734c527b3a556281676393674d33da768cb2431e7da1a0fdfc6ceb268e897029aa584