From 938ef10ec59fe750d4a032c36329ba2bd91c7069 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 08:05:37 +0000 Subject: [PATCH 01/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libffado.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libffado.spec b/libffado.spec index 7767978..b79aeec 100644 --- a/libffado.spec +++ b/libffado.spec @@ -1,7 +1,7 @@ Summary: Free firewire audio driver library Name: libffado Version: 2.4.1 -Release: 1%{?dist} +Release: 2%{?dist} # src/libutil/float_cast.h is LGPLv2+. # The rest is (GPLv2 or GPLv3) License: LGPLv2+ and (GPLv2 or GPLv3) @@ -148,6 +148,9 @@ appstream-util validate-relax --nonet \ %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 2.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Apr 25 2018 Orcan Ogetbil - 2.4.1-1 - Update to 2.4.1 - Drop upstreamed patches From 5e9d372469f7aabbe0300f0f85bc6b593c26eeb9 Mon Sep 17 00:00:00 2001 From: Orcan Ogetbil Date: Thu, 19 Jul 2018 22:41:55 -0400 Subject: [PATCH 02/63] Fixed Python shebangs Added BR: python2-enum34 --- libffado.spec | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/libffado.spec b/libffado.spec index b79aeec..179592f 100644 --- a/libffado.spec +++ b/libffado.spec @@ -1,7 +1,7 @@ Summary: Free firewire audio driver library Name: libffado Version: 2.4.1 -Release: 2%{?dist} +Release: 3%{?dist} # src/libutil/float_cast.h is LGPLv2+. # The rest is (GPLv2 or GPLv3) License: LGPLv2+ and (GPLv2 or GPLv3) @@ -31,6 +31,7 @@ BuildRequires: libxml++-devel BuildRequires: pkgconfig BuildRequires: python2-PyQt5-devel BuildRequires: python2-devel +BuildRequires: python2-enum34 BuildRequires: python2-scons BuildRequires: subversion ExcludeArch: s390 s390x @@ -76,6 +77,12 @@ sed -i '/Install/d' tests/{,*/}SConscript # Use standard icon name sed -i 's|hi64-apps-ffado.png|ffado.png|' support/mixer-qt4/ffado/ffadowindow.py +# Fix Python shebangs +sed -i 's|/usr/bin/.*python$|/usr/bin/python2|' \ + admin/*.py doc/SConscript tests/python/*.py tests/*.py \ + support/mixer-qt4/ffado-mixer* support/mixer-qt4/SConscript \ + support/tools/*.py support/tools/SConscript + %build export CFLAGS="%{optflags} -ffast-math" export CXXFLAGS="%{optflags} -ffast-math --std=gnu++11" @@ -90,6 +97,7 @@ scons %{?_smp_mflags} \ MANDIR=%{_mandir} \ UDEVDIR=%{_prefix}/lib/udev/rules.d/ \ PYPKGDIR=%{python_sitelib}/ffado/ \ + PYTHON_INTERPRETER=/usr/bin/python2 \ BUILD_TESTS=1 %install @@ -148,6 +156,10 @@ appstream-util validate-relax --nonet \ %changelog +* Thu Jul 19 2018 Orcan Ogetbil - 2.4.1-3 +- Fixed Python shebangs +- Added BR: python2-enum34 + * Fri Jul 13 2018 Fedora Release Engineering - 2.4.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From aa1c1a036bffe33d832e2986302a817ae71c3bd3 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 24 Jul 2018 15:53:58 -0400 Subject: [PATCH 03/63] rebuild for new libconfig --- libffado.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libffado.spec b/libffado.spec index 179592f..6bec459 100644 --- a/libffado.spec +++ b/libffado.spec @@ -1,7 +1,7 @@ Summary: Free firewire audio driver library Name: libffado Version: 2.4.1 -Release: 3%{?dist} +Release: 4%{?dist} # src/libutil/float_cast.h is LGPLv2+. # The rest is (GPLv2 or GPLv3) License: LGPLv2+ and (GPLv2 or GPLv3) @@ -156,6 +156,9 @@ appstream-util validate-relax --nonet \ %changelog +* Tue Jul 24 2018 Tom Callaway - 2.4.1-4 +- rebuild for new libconfig + * Thu Jul 19 2018 Orcan Ogetbil - 2.4.1-3 - Fixed Python shebangs - Added BR: python2-enum34 From 5e7a2d9f5f2684ace2db28dddc1311626293c9f2 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 29 Jul 2018 23:12:03 +0200 Subject: [PATCH 04/63] =?UTF-8?q?%{python=5Fsitelib}=20=E2=86=92=20%{pytho?= =?UTF-8?q?n2=5Fsitelib}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Igor Gnatenko --- libffado.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libffado.spec b/libffado.spec index 6bec459..3dcb906 100644 --- a/libffado.spec +++ b/libffado.spec @@ -152,7 +152,7 @@ appstream-util validate-relax --nonet \ %{_datadir}/applications/ffado.org-ffadomixer.desktop %{_datadir}/icons/hicolor/64x64/apps/ffado.png %{_datadir}/metainfo/ffado-mixer.appdata.xml -%{python_sitelib}/ffado/ +%{python2_sitelib}/ffado/ %changelog From 8f953bda516bb9bc2e5704301ba32fb40500ac15 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:51 +0100 Subject: [PATCH 05/63] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- libffado.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/libffado.spec b/libffado.spec index 3dcb906..8558ca4 100644 --- a/libffado.spec +++ b/libffado.spec @@ -5,7 +5,6 @@ Release: 4%{?dist} # src/libutil/float_cast.h is LGPLv2+. # The rest is (GPLv2 or GPLv3) License: LGPLv2+ and (GPLv2 or GPLv3) -Group: System Environment/Libraries URL: http://www.ffado.org/ Source0: http://www.ffado.org/files/%{name}-%{version}.tgz # The trunk is tarballed as follows: @@ -44,7 +43,6 @@ successor of the FreeBoB project. %package devel Summary: Free firewire audio driver library development headers -Group: Development/Libraries License: GPLv2 or GPLv3 Requires: %{name}%{?_isa} = %{version}-%{release} @@ -53,7 +51,6 @@ Development files needed to build applications against libffado. %package -n ffado Summary: Free firewire audio driver library applications and utilities -Group: Applications/Multimedia # support/tools/* is GPLv3 # Some files in support/mixer-qt4/ffado are GPLv3+ # The rest is GPLv2 or GPLv3 From 3d2fc9013bfb81942dde35c6f2304a4372460994 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 07:07:18 +0000 Subject: [PATCH 06/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libffado.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libffado.spec b/libffado.spec index 8558ca4..089fcbd 100644 --- a/libffado.spec +++ b/libffado.spec @@ -1,7 +1,7 @@ Summary: Free firewire audio driver library Name: libffado Version: 2.4.1 -Release: 4%{?dist} +Release: 5%{?dist} # src/libutil/float_cast.h is LGPLv2+. # The rest is (GPLv2 or GPLv3) License: LGPLv2+ and (GPLv2 or GPLv3) @@ -153,6 +153,9 @@ appstream-util validate-relax --nonet \ %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 2.4.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Jul 24 2018 Tom Callaway - 2.4.1-4 - rebuild for new libconfig From ad109209e614a269b99c02119dec7637beeb7dae Mon Sep 17 00:00:00 2001 From: Orcan Ogetbil Date: Thu, 7 Feb 2019 21:23:42 -0500 Subject: [PATCH 07/63] Added BR: python2-rpm-macros --- libffado.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libffado.spec b/libffado.spec index 089fcbd..12a9f5a 100644 --- a/libffado.spec +++ b/libffado.spec @@ -1,7 +1,7 @@ Summary: Free firewire audio driver library Name: libffado Version: 2.4.1 -Release: 5%{?dist} +Release: 6%{?dist} # src/libutil/float_cast.h is LGPLv2+. # The rest is (GPLv2 or GPLv3) License: LGPLv2+ and (GPLv2 or GPLv3) @@ -17,6 +17,7 @@ BuildRequires: dbus-c++-devel BuildRequires: dbus-devel # the following got renamed to python2-dbus on F28. We are using the backward-compatible Provides BuildRequires: python2-dbus +BuildRequires: python2-rpm-macros BuildRequires: desktop-file-utils BuildRequires: doxygen BuildRequires: gcc-c++ @@ -93,7 +94,7 @@ scons %{?_smp_mflags} \ LIBDIR=%{_libdir} \ MANDIR=%{_mandir} \ UDEVDIR=%{_prefix}/lib/udev/rules.d/ \ - PYPKGDIR=%{python_sitelib}/ffado/ \ + PYPKGDIR=%{python2_sitelib}/ffado/ \ PYTHON_INTERPRETER=/usr/bin/python2 \ BUILD_TESTS=1 @@ -153,6 +154,9 @@ appstream-util validate-relax --nonet \ %changelog +* Thu Feb 07 2019 Orcan Ogetbil - 2.4.1-6 +- Added BR: python2-rpm-macros + * Fri Feb 01 2019 Fedora Release Engineering - 2.4.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From cc7b47111487a701fb79ce7049ea2271a747c561 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 13:15:05 +0000 Subject: [PATCH 08/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libffado.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libffado.spec b/libffado.spec index 12a9f5a..3441588 100644 --- a/libffado.spec +++ b/libffado.spec @@ -1,7 +1,7 @@ Summary: Free firewire audio driver library Name: libffado Version: 2.4.1 -Release: 6%{?dist} +Release: 7%{?dist} # src/libutil/float_cast.h is LGPLv2+. # The rest is (GPLv2 or GPLv3) License: LGPLv2+ and (GPLv2 or GPLv3) @@ -154,6 +154,9 @@ appstream-util validate-relax --nonet \ %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 2.4.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Feb 07 2019 Orcan Ogetbil - 2.4.1-6 - Added BR: python2-rpm-macros From c0dd923498e3165b2cbe46e5d020659f36afb15a Mon Sep 17 00:00:00 2001 From: Orcan Ogetbil Date: Sat, 3 Aug 2019 23:27:34 -0400 Subject: [PATCH 09/63] scons renamed to scons-2 in the recent Fedora package --- libffado.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libffado.spec b/libffado.spec index 3441588..e0fa4c8 100644 --- a/libffado.spec +++ b/libffado.spec @@ -1,7 +1,7 @@ Summary: Free firewire audio driver library Name: libffado Version: 2.4.1 -Release: 7%{?dist} +Release: 8%{?dist} # src/libutil/float_cast.h is LGPLv2+. # The rest is (GPLv2 or GPLv3) License: LGPLv2+ and (GPLv2 or GPLv3) @@ -85,7 +85,7 @@ sed -i 's|/usr/bin/.*python$|/usr/bin/python2|' \ export CFLAGS="%{optflags} -ffast-math" export CXXFLAGS="%{optflags} -ffast-math --std=gnu++11" export LDFLAGS="%{build_ldflags}" -scons %{?_smp_mflags} \ +scons-2 %{?_smp_mflags} \ ENABLE_SETBUFFERSIZE_API_VER=True \ ENABLE_OPTIMIZATIONS=True \ CUSTOM_ENV=True \ @@ -103,7 +103,7 @@ scons %{?_smp_mflags} \ export CFLAGS="%{optflags} -ffast-math" export CXXFLAGS="%{optflags} -ffast-math --std=gnu++11" export LDFLAGS="%{build_ldflags}" -scons DESTDIR=%{buildroot} \ +scons-2 DESTDIR=%{buildroot} \ install # We need to install the xdg stuff manually @@ -128,7 +128,8 @@ appstream-util validate-relax --nonet \ %{buildroot}%{_datadir}/metainfo/ffado-mixer.appdata.xml %files -%doc AUTHORS ChangeLog LICENSE.* README +%license LICENSE.* +%doc AUTHORS ChangeLog README %{_libdir}/libffado.so.* %dir %{_datadir}/libffado/ %{_datadir}/libffado/configuration @@ -154,6 +155,9 @@ appstream-util validate-relax --nonet \ %changelog +* Sat Aug 03 2019 Orcan Ogetbil - 2.4.1-8 +- scons renamed to scons-2 in the recent Fedora package + * Thu Jul 25 2019 Fedora Release Engineering - 2.4.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From e6cc72e3cb4587b87469c3825636192d0f8d179a Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 19 Aug 2019 14:03:58 -0500 Subject: [PATCH 10/63] Un-hardcode path. --- libffado.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libffado.spec b/libffado.spec index e0fa4c8..aae2491 100644 --- a/libffado.spec +++ b/libffado.spec @@ -1,7 +1,7 @@ Summary: Free firewire audio driver library Name: libffado Version: 2.4.1 -Release: 8%{?dist} +Release: 9%{?dist} # src/libutil/float_cast.h is LGPLv2+. # The rest is (GPLv2 or GPLv3) License: LGPLv2+ and (GPLv2 or GPLv3) @@ -76,7 +76,7 @@ sed -i '/Install/d' tests/{,*/}SConscript sed -i 's|hi64-apps-ffado.png|ffado.png|' support/mixer-qt4/ffado/ffadowindow.py # Fix Python shebangs -sed -i 's|/usr/bin/.*python$|/usr/bin/python2|' \ +sed -i 's|/usr/bin/.*python$|%{_prefix}/bin/python2|' \ admin/*.py doc/SConscript tests/python/*.py tests/*.py \ support/mixer-qt4/ffado-mixer* support/mixer-qt4/SConscript \ support/tools/*.py support/tools/SConscript @@ -95,7 +95,7 @@ scons-2 %{?_smp_mflags} \ MANDIR=%{_mandir} \ UDEVDIR=%{_prefix}/lib/udev/rules.d/ \ PYPKGDIR=%{python2_sitelib}/ffado/ \ - PYTHON_INTERPRETER=/usr/bin/python2 \ + PYTHON_INTERPRETER=%{_prefix}/bin/python2 \ BUILD_TESTS=1 %install @@ -155,6 +155,9 @@ appstream-util validate-relax --nonet \ %changelog +* Mon Aug 19 2019 Gwyn Ciesla - 2.4.1-9 +- Un-hardcode prefix for flatpak. + * Sat Aug 03 2019 Orcan Ogetbil - 2.4.1-8 - scons renamed to scons-2 in the recent Fedora package From a52a69cce3272644af6dd569a0370eeda665a08e Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 19 Aug 2019 15:33:53 -0500 Subject: [PATCH 11/63] Revert "Un-hardcode path." This reverts commit e6cc72e3cb4587b87469c3825636192d0f8d179a. --- libffado.spec | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libffado.spec b/libffado.spec index aae2491..e0fa4c8 100644 --- a/libffado.spec +++ b/libffado.spec @@ -1,7 +1,7 @@ Summary: Free firewire audio driver library Name: libffado Version: 2.4.1 -Release: 9%{?dist} +Release: 8%{?dist} # src/libutil/float_cast.h is LGPLv2+. # The rest is (GPLv2 or GPLv3) License: LGPLv2+ and (GPLv2 or GPLv3) @@ -76,7 +76,7 @@ sed -i '/Install/d' tests/{,*/}SConscript sed -i 's|hi64-apps-ffado.png|ffado.png|' support/mixer-qt4/ffado/ffadowindow.py # Fix Python shebangs -sed -i 's|/usr/bin/.*python$|%{_prefix}/bin/python2|' \ +sed -i 's|/usr/bin/.*python$|/usr/bin/python2|' \ admin/*.py doc/SConscript tests/python/*.py tests/*.py \ support/mixer-qt4/ffado-mixer* support/mixer-qt4/SConscript \ support/tools/*.py support/tools/SConscript @@ -95,7 +95,7 @@ scons-2 %{?_smp_mflags} \ MANDIR=%{_mandir} \ UDEVDIR=%{_prefix}/lib/udev/rules.d/ \ PYPKGDIR=%{python2_sitelib}/ffado/ \ - PYTHON_INTERPRETER=%{_prefix}/bin/python2 \ + PYTHON_INTERPRETER=/usr/bin/python2 \ BUILD_TESTS=1 %install @@ -155,9 +155,6 @@ appstream-util validate-relax --nonet \ %changelog -* Mon Aug 19 2019 Gwyn Ciesla - 2.4.1-9 -- Un-hardcode prefix for flatpak. - * Sat Aug 03 2019 Orcan Ogetbil - 2.4.1-8 - scons renamed to scons-2 in the recent Fedora package From b0ceebd8bff887c323548222ae1e2001ba7fe5b4 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 19 Aug 2019 15:35:39 -0500 Subject: [PATCH 12/63] set prefix. --- libffado.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libffado.spec b/libffado.spec index e0fa4c8..a5a398a 100644 --- a/libffado.spec +++ b/libffado.spec @@ -103,7 +103,7 @@ scons-2 %{?_smp_mflags} \ export CFLAGS="%{optflags} -ffast-math" export CXXFLAGS="%{optflags} -ffast-math --std=gnu++11" export LDFLAGS="%{build_ldflags}" -scons-2 DESTDIR=%{buildroot} \ +scons-2 DESTDIR=%{buildroot} PREFIX=%{_prefix}\ install # We need to install the xdg stuff manually From 2c8aa1f9242058e20636ecbc7bfdd1f3945d8ff2 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 27 Aug 2019 15:16:11 -0500 Subject: [PATCH 13/63] "Adding package.cfg file" --- package.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package.cfg diff --git a/package.cfg b/package.cfg new file mode 100644 index 0000000..66ea79d --- /dev/null +++ b/package.cfg @@ -0,0 +1,2 @@ +[koji] +targets = epel8 epel8-playground \ No newline at end of file From 5f55c81aebf0c1734944c97ed7da974107b1a92f Mon Sep 17 00:00:00 2001 From: Vasiliy Glazov Date: Wed, 18 Sep 2019 16:45:32 +0300 Subject: [PATCH 14/63] Solve ppc64le build problem. --- libffado.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libffado.spec b/libffado.spec index a5a398a..332055f 100644 --- a/libffado.spec +++ b/libffado.spec @@ -81,6 +81,8 @@ sed -i 's|/usr/bin/.*python$|/usr/bin/python2|' \ support/mixer-qt4/ffado-mixer* support/mixer-qt4/SConscript \ support/tools/*.py support/tools/SConscript +sed -i 's|-m32||' SConstruct + %build export CFLAGS="%{optflags} -ffast-math" export CXXFLAGS="%{optflags} -ffast-math --std=gnu++11" From 237bd26e741f40d67b4d578d5d72471912c5dcf2 Mon Sep 17 00:00:00 2001 From: Orcan Ogetbil Date: Wed, 18 Sep 2019 20:22:54 -0400 Subject: [PATCH 15/63] Convert the package from Python2 to Python3 --- libffado-mixer-py3.patch | 39 +++++++++++++++++++++++++++++++++++++++ libffado.spec | 36 ++++++++++++++++++++---------------- 2 files changed, 59 insertions(+), 16 deletions(-) create mode 100644 libffado-mixer-py3.patch diff --git a/libffado-mixer-py3.patch b/libffado-mixer-py3.patch new file mode 100644 index 0000000..4b49423 --- /dev/null +++ b/libffado-mixer-py3.patch @@ -0,0 +1,39 @@ +diff -rupN libffado-2.4.1.org/SConstruct libffado-2.4.1/SConstruct +--- libffado-2.4.1.org/SConstruct 2018-03-04 01:13:17.000000000 -0500 ++++ libffado-2.4.1/SConstruct 2019-09-18 19:38:12.105388609 -0400 +@@ -719,8 +719,8 @@ def is_userspace_32bit(cpuinfo): + # /bin/mount: file format elf64-x86-64 + # or like this: + # /bin/mount: file format elf32-powerpc +- for line in x.split(b'\n'): +- line = line.strip().decode() ++ for line in x.split('\n'): ++ line = line.strip() + if line.startswith(real_exe): + x, fmt = line.rsplit(None, 1) + answer = 'elf32' in fmt +diff -rupN libffado-2.4.1.org/support/mixer-qt4/SConscript libffado-2.4.1/support/mixer-qt4/SConscript +--- libffado-2.4.1.org/support/mixer-qt4/SConscript 2015-04-12 07:18:15.000000000 -0400 ++++ libffado-2.4.1/support/mixer-qt4/SConscript 2019-09-18 19:37:50.112436538 -0400 +@@ -29,16 +29,13 @@ Import( 'env' ) + if env['BUILD_MIXER'] == 'true': + e = env.Clone() + +- def findfiles( arg, dirname, names ): +- for name in names: ++ pythonfiles = [ 'ffado/config.py' ] ++ for dirpath, dirnames, files in os.walk( "ffado"): ++ for name in files: + if name.startswith("."): +- names.remove(name) +- for name in names: ++ continue + if '.pyc' not in name and '.in' not in name: +- arg.append( os.path.join( dirname, name ) ) +- +- pythonfiles = [ 'ffado/config.py' ] +- os.path.walk( "ffado", findfiles, pythonfiles ) ++ pythonfiles.append(os.path.join(dirpath, name)) + + e.ScanReplace( "ffado/config.py.in" ) + e.Depends( "ffado/config.py", "#/SConstruct" ) diff --git a/libffado.spec b/libffado.spec index 332055f..576eca9 100644 --- a/libffado.spec +++ b/libffado.spec @@ -1,12 +1,14 @@ Summary: Free firewire audio driver library Name: libffado Version: 2.4.1 -Release: 8%{?dist} +Release: 9%{?dist} # src/libutil/float_cast.h is LGPLv2+. # The rest is (GPLv2 or GPLv3) License: LGPLv2+ and (GPLv2 or GPLv3) URL: http://www.ffado.org/ Source0: http://www.ffado.org/files/%{name}-%{version}.tgz +# Convert the package to Python3. Sent upstream via email. +Patch0: libffado-mixer-py3.patch # The trunk is tarballed as follows: # bash libffado-snapshot.sh 2088 # The fetch script @@ -15,9 +17,8 @@ Source9: libffado-snapshot.sh BuildRequires: alsa-lib-devel BuildRequires: dbus-c++-devel BuildRequires: dbus-devel -# the following got renamed to python2-dbus on F28. We are using the backward-compatible Provides -BuildRequires: python2-dbus -BuildRequires: python2-rpm-macros +BuildRequires: python3-dbus +BuildRequires: python3-rpm-macros BuildRequires: desktop-file-utils BuildRequires: doxygen BuildRequires: gcc-c++ @@ -29,10 +30,9 @@ BuildRequires: libiec61883-devel BuildRequires: libraw1394-devel BuildRequires: libxml++-devel BuildRequires: pkgconfig -BuildRequires: python2-PyQt5-devel -BuildRequires: python2-devel -BuildRequires: python2-enum34 -BuildRequires: python2-scons +BuildRequires: python3-qt5-devel +BuildRequires: python3-devel +BuildRequires: python3-scons BuildRequires: subversion ExcludeArch: s390 s390x Requires: udev @@ -59,8 +59,8 @@ License: GPLv3 and GPLv3+ and (GPLv2 or GPLv3) Requires: %{name}%{?_isa} = %{version}-%{release} Requires: dbus # the following got renamed to python2-dbus on F28. We are using the backward-compatible Provides -Requires: python2-dbus -Requires: python2-qt5 +Requires: python3-dbus +Requires: python3-qt5 %description -n ffado Applications and utilities for use with libffado. @@ -68,6 +68,7 @@ Applications and utilities for use with libffado. %prep %setup -q +%patch0 -p1 -b .py3 # We don't want to install all tests sed -i '/Install/d' tests/{,*/}SConscript @@ -76,7 +77,7 @@ sed -i '/Install/d' tests/{,*/}SConscript sed -i 's|hi64-apps-ffado.png|ffado.png|' support/mixer-qt4/ffado/ffadowindow.py # Fix Python shebangs -sed -i 's|/usr/bin/.*python$|/usr/bin/python2|' \ +sed -i 's|/usr/bin/.*python$|/usr/bin/python3|' \ admin/*.py doc/SConscript tests/python/*.py tests/*.py \ support/mixer-qt4/ffado-mixer* support/mixer-qt4/SConscript \ support/tools/*.py support/tools/SConscript @@ -87,7 +88,7 @@ sed -i 's|-m32||' SConstruct export CFLAGS="%{optflags} -ffast-math" export CXXFLAGS="%{optflags} -ffast-math --std=gnu++11" export LDFLAGS="%{build_ldflags}" -scons-2 %{?_smp_mflags} \ +scons-3 %{?_smp_mflags} \ ENABLE_SETBUFFERSIZE_API_VER=True \ ENABLE_OPTIMIZATIONS=True \ CUSTOM_ENV=True \ @@ -96,8 +97,8 @@ scons-2 %{?_smp_mflags} \ LIBDIR=%{_libdir} \ MANDIR=%{_mandir} \ UDEVDIR=%{_prefix}/lib/udev/rules.d/ \ - PYPKGDIR=%{python2_sitelib}/ffado/ \ - PYTHON_INTERPRETER=/usr/bin/python2 \ + PYPKGDIR=%{python3_sitelib}/ffado/ \ + PYTHON_INTERPRETER=/usr/bin/python3 \ BUILD_TESTS=1 %install @@ -105,7 +106,7 @@ scons-2 %{?_smp_mflags} \ export CFLAGS="%{optflags} -ffast-math" export CXXFLAGS="%{optflags} -ffast-math --std=gnu++11" export LDFLAGS="%{build_ldflags}" -scons-2 DESTDIR=%{buildroot} PREFIX=%{_prefix}\ +scons-3 DESTDIR=%{buildroot} PREFIX=%{_prefix}\ install # We need to install the xdg stuff manually @@ -153,10 +154,13 @@ appstream-util validate-relax --nonet \ %{_datadir}/applications/ffado.org-ffadomixer.desktop %{_datadir}/icons/hicolor/64x64/apps/ffado.png %{_datadir}/metainfo/ffado-mixer.appdata.xml -%{python2_sitelib}/ffado/ +%{python3_sitelib}/ffado/ %changelog +* Wed Sep 18 2019 Orcan Ogetbil - 2.4.1-9 +- Convert the package from Python2 to Python3 + * Sat Aug 03 2019 Orcan Ogetbil - 2.4.1-8 - scons renamed to scons-2 in the recent Fedora package From 57b1e96b11cce682a55f07104860f9dc74958e3b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 09:06:49 +0000 Subject: [PATCH 16/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libffado.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libffado.spec b/libffado.spec index 576eca9..0fb5b83 100644 --- a/libffado.spec +++ b/libffado.spec @@ -1,7 +1,7 @@ Summary: Free firewire audio driver library Name: libffado Version: 2.4.1 -Release: 9%{?dist} +Release: 10%{?dist} # src/libutil/float_cast.h is LGPLv2+. # The rest is (GPLv2 or GPLv3) License: LGPLv2+ and (GPLv2 or GPLv3) @@ -158,6 +158,9 @@ appstream-util validate-relax --nonet \ %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 2.4.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Sep 18 2019 Orcan Ogetbil - 2.4.1-9 - Convert the package from Python2 to Python3 From 17d507b5e266ba1e97221a3148d4dfc387883f83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 May 2020 02:50:22 +0200 Subject: [PATCH 17/63] Rebuilt for Python 3.9 --- libffado.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libffado.spec b/libffado.spec index 0fb5b83..a8ae5d5 100644 --- a/libffado.spec +++ b/libffado.spec @@ -1,7 +1,7 @@ Summary: Free firewire audio driver library Name: libffado Version: 2.4.1 -Release: 10%{?dist} +Release: 11%{?dist} # src/libutil/float_cast.h is LGPLv2+. # The rest is (GPLv2 or GPLv3) License: LGPLv2+ and (GPLv2 or GPLv3) @@ -158,6 +158,9 @@ appstream-util validate-relax --nonet \ %changelog +* Tue May 26 2020 Miro Hrončok - 2.4.1-11 +- Rebuilt for Python 3.9 + * Wed Jan 29 2020 Fedora Release Engineering - 2.4.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From f9d33751a53c2e26e98e65e7ffb8362796b1604c Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Sat, 30 May 2020 13:57:22 +0200 Subject: [PATCH 18/63] version 2.4.3 --- .gitignore | 1 + libffado-mixer-py3.patch | 39 --------------------------------------- libffado.spec | 10 +++++----- sources | 2 +- 4 files changed, 7 insertions(+), 45 deletions(-) delete mode 100644 libffado-mixer-py3.patch diff --git a/.gitignore b/.gitignore index 99cfd3d..2662323 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ libffado-2.0.1-svn1864.tar.bz2 /libffado-2.3.0.tgz /libffado-2.4.0.tgz /libffado-2.4.1.tgz +/libffado-2.4.3.tgz diff --git a/libffado-mixer-py3.patch b/libffado-mixer-py3.patch deleted file mode 100644 index 4b49423..0000000 --- a/libffado-mixer-py3.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -rupN libffado-2.4.1.org/SConstruct libffado-2.4.1/SConstruct ---- libffado-2.4.1.org/SConstruct 2018-03-04 01:13:17.000000000 -0500 -+++ libffado-2.4.1/SConstruct 2019-09-18 19:38:12.105388609 -0400 -@@ -719,8 +719,8 @@ def is_userspace_32bit(cpuinfo): - # /bin/mount: file format elf64-x86-64 - # or like this: - # /bin/mount: file format elf32-powerpc -- for line in x.split(b'\n'): -- line = line.strip().decode() -+ for line in x.split('\n'): -+ line = line.strip() - if line.startswith(real_exe): - x, fmt = line.rsplit(None, 1) - answer = 'elf32' in fmt -diff -rupN libffado-2.4.1.org/support/mixer-qt4/SConscript libffado-2.4.1/support/mixer-qt4/SConscript ---- libffado-2.4.1.org/support/mixer-qt4/SConscript 2015-04-12 07:18:15.000000000 -0400 -+++ libffado-2.4.1/support/mixer-qt4/SConscript 2019-09-18 19:37:50.112436538 -0400 -@@ -29,16 +29,13 @@ Import( 'env' ) - if env['BUILD_MIXER'] == 'true': - e = env.Clone() - -- def findfiles( arg, dirname, names ): -- for name in names: -+ pythonfiles = [ 'ffado/config.py' ] -+ for dirpath, dirnames, files in os.walk( "ffado"): -+ for name in files: - if name.startswith("."): -- names.remove(name) -- for name in names: -+ continue - if '.pyc' not in name and '.in' not in name: -- arg.append( os.path.join( dirname, name ) ) -- -- pythonfiles = [ 'ffado/config.py' ] -- os.path.walk( "ffado", findfiles, pythonfiles ) -+ pythonfiles.append(os.path.join(dirpath, name)) - - e.ScanReplace( "ffado/config.py.in" ) - e.Depends( "ffado/config.py", "#/SConstruct" ) diff --git a/libffado.spec b/libffado.spec index a8ae5d5..5d2beb4 100644 --- a/libffado.spec +++ b/libffado.spec @@ -1,14 +1,12 @@ Summary: Free firewire audio driver library Name: libffado -Version: 2.4.1 -Release: 11%{?dist} +Version: 2.4.3 +Release: 1%{?dist} # src/libutil/float_cast.h is LGPLv2+. # The rest is (GPLv2 or GPLv3) License: LGPLv2+ and (GPLv2 or GPLv3) URL: http://www.ffado.org/ Source0: http://www.ffado.org/files/%{name}-%{version}.tgz -# Convert the package to Python3. Sent upstream via email. -Patch0: libffado-mixer-py3.patch # The trunk is tarballed as follows: # bash libffado-snapshot.sh 2088 # The fetch script @@ -68,7 +66,6 @@ Applications and utilities for use with libffado. %prep %setup -q -%patch0 -p1 -b .py3 # We don't want to install all tests sed -i '/Install/d' tests/{,*/}SConscript @@ -158,6 +155,9 @@ appstream-util validate-relax --nonet \ %changelog +* Fri May 29 2020 Nils Philippsen - 2.4.3-1 +- version 2.4.3 + * Tue May 26 2020 Miro Hrončok - 2.4.1-11 - Rebuilt for Python 3.9 diff --git a/sources b/sources index 5ffb408..80b41ef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libffado-2.4.1.tgz) = 0859f17b87c68108bbde726d1cf8ab0b99f6f7f02cbe36acd8b451e112688a4d1edc21134eb4a2edc8c92dcf5f5da52efeabb2ad0dc07804ed1aa664a3b38d74 +SHA512 (libffado-2.4.3.tgz) = d5d3f6b5c446002f3b62d00a215532c208fcc86bedb444bb20872b6b064d48330c6c1ba923bacc4f538ac8e2c73be4dfe0e27f80ea196d5789493d980dfde609 From b41ed9dd6c3227fdbd30d4f6acd4ef408e998747 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Sat, 30 May 2020 18:02:49 +0200 Subject: [PATCH 19/63] work around a bug in scons < 3.0.2 Signed-off-by: Nils Philippsen --- libffado.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/libffado.spec b/libffado.spec index 5d2beb4..1a31939 100644 --- a/libffado.spec +++ b/libffado.spec @@ -1,7 +1,7 @@ Summary: Free firewire audio driver library Name: libffado Version: 2.4.3 -Release: 1%{?dist} +Release: 2%{?dist} # src/libutil/float_cast.h is LGPLv2+. # The rest is (GPLv2 or GPLv3) License: LGPLv2+ and (GPLv2 or GPLv3) @@ -67,6 +67,11 @@ Applications and utilities for use with libffado. %prep %setup -q +# Work around a bug in scons < 3.0.2 +if %{__python3} -c 'import SCons; import sys; sys.exit(not tuple(int(d) for d in SCons.__version__.split(".")) < (3, 0, 2))'; then + sed -i '/^CacheDir/d' SConstruct +fi + # We don't want to install all tests sed -i '/Install/d' tests/{,*/}SConscript @@ -155,6 +160,9 @@ appstream-util validate-relax --nonet \ %changelog +* Sat May 30 2020 Nils Philippsen - 2.4.3-2 +- work around a bug in scons < 3.0.2 + * Fri May 29 2020 Nils Philippsen - 2.4.3-1 - version 2.4.3 From 3ec1b95556e5022df3cbb21b975790ad1c203262 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 04:38:19 +0000 Subject: [PATCH 20/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libffado.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libffado.spec b/libffado.spec index 1a31939..cc5dcc8 100644 --- a/libffado.spec +++ b/libffado.spec @@ -1,7 +1,7 @@ Summary: Free firewire audio driver library Name: libffado Version: 2.4.3 -Release: 2%{?dist} +Release: 3%{?dist} # src/libutil/float_cast.h is LGPLv2+. # The rest is (GPLv2 or GPLv3) License: LGPLv2+ and (GPLv2 or GPLv3) @@ -160,6 +160,9 @@ appstream-util validate-relax --nonet \ %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 2.4.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sat May 30 2020 Nils Philippsen - 2.4.3-2 - work around a bug in scons < 3.0.2 From f1c5f110d15394d51a59e910931749ba0ea7d5b1 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Tue, 5 Jan 2021 16:50:09 +0100 Subject: [PATCH 21/63] Version 2.4.4 Signed-off-by: Nils Philippsen --- .gitignore | 1 + libffado.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2662323..7979b9e 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ libffado-2.0.1-svn1864.tar.bz2 /libffado-2.4.0.tgz /libffado-2.4.1.tgz /libffado-2.4.3.tgz +/libffado-2.4.4.tgz diff --git a/libffado.spec b/libffado.spec index cc5dcc8..9a60c64 100644 --- a/libffado.spec +++ b/libffado.spec @@ -1,7 +1,7 @@ Summary: Free firewire audio driver library Name: libffado -Version: 2.4.3 -Release: 3%{?dist} +Version: 2.4.4 +Release: 1%{?dist} # src/libutil/float_cast.h is LGPLv2+. # The rest is (GPLv2 or GPLv3) License: LGPLv2+ and (GPLv2 or GPLv3) @@ -160,6 +160,9 @@ appstream-util validate-relax --nonet \ %changelog +* Tue Jan 05 2020 Nils Philippsen - 2.4.4-1 +- Version 2.4.4 + * Tue Jul 28 2020 Fedora Release Engineering - 2.4.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 80b41ef..b1e8199 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libffado-2.4.3.tgz) = d5d3f6b5c446002f3b62d00a215532c208fcc86bedb444bb20872b6b064d48330c6c1ba923bacc4f538ac8e2c73be4dfe0e27f80ea196d5789493d980dfde609 +SHA512 (libffado-2.4.4.tgz) = 065b7f9ce9bf58320c02353b63ed17b3610d0ee8a2de58de27159b2190e39c779094b01ae1123c087387e6077375e646b564b9e7717b192865b2f1f22a3acc80 From 306996926fa6e3f273af28f435036265c46bbc0a Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Tue, 5 Jan 2021 16:51:20 +0100 Subject: [PATCH 22/63] Document license of binary package https://fedoraproject.org/wiki/Packaging:LicensingGuidelines#License:_field Signed-off-by: Nils Philippsen --- libffado.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libffado.spec b/libffado.spec index 9a60c64..c86bbc7 100644 --- a/libffado.spec +++ b/libffado.spec @@ -2,9 +2,7 @@ Summary: Free firewire audio driver library Name: libffado Version: 2.4.4 Release: 1%{?dist} -# src/libutil/float_cast.h is LGPLv2+. -# The rest is (GPLv2 or GPLv3) -License: LGPLv2+ and (GPLv2 or GPLv3) +License: GPLv2 or GPLv3 URL: http://www.ffado.org/ Source0: http://www.ffado.org/files/%{name}-%{version}.tgz # The trunk is tarballed as follows: @@ -162,6 +160,7 @@ appstream-util validate-relax --nonet \ %changelog * Tue Jan 05 2020 Nils Philippsen - 2.4.4-1 - Version 2.4.4 +- Document license of binary package * Tue Jul 28 2020 Fedora Release Engineering - 2.4.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 0e22db972d52310b0c9616194bfd4931c95addca Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Tue, 5 Jan 2021 16:55:38 +0100 Subject: [PATCH 23/63] Avoid using sed to patch files where sensible Signed-off-by: Nils Philippsen --- libffado-2.4.4-icon-name.patch | 12 ++++++++++++ libffado-2.4.4-no-test-apps.patch | 30 ++++++++++++++++++++++++++++++ libffado.spec | 23 ++++++++--------------- 3 files changed, 50 insertions(+), 15 deletions(-) create mode 100644 libffado-2.4.4-icon-name.patch create mode 100644 libffado-2.4.4-no-test-apps.patch diff --git a/libffado-2.4.4-icon-name.patch b/libffado-2.4.4-icon-name.patch new file mode 100644 index 0000000..d5fc600 --- /dev/null +++ b/libffado-2.4.4-icon-name.patch @@ -0,0 +1,12 @@ +diff -up libffado-2.4.4/support/mixer-qt4/ffado/ffadowindow.py.icon-name libffado-2.4.4/support/mixer-qt4/ffado/ffadowindow.py +--- libffado-2.4.4/support/mixer-qt4/ffado/ffadowindow.py.icon-name 2020-05-29 08:59:52.000000000 +0200 ++++ libffado-2.4.4/support/mixer-qt4/ffado/ffadowindow.py 2021-01-05 16:30:40.293184745 +0100 +@@ -267,7 +267,7 @@ def ffadomain(args): + log.debug("Using %s with Qt: %s PyQt: %s" % (get_ffado_version(), QtCore.QT_VERSION_STR, QtCore.PYQT_VERSION_STR)) + + app = QApplication(args) +- app.setWindowIcon( QIcon( SHAREDIR + "/icons/hi64-apps-ffado.png" ) ) ++ app.setWindowIcon( QIcon( SHAREDIR + "/icons/ffado.png" ) ) + + app.setOrganizationName("FFADO") + app.setOrganizationDomain("ffado.org") diff --git a/libffado-2.4.4-no-test-apps.patch b/libffado-2.4.4-no-test-apps.patch new file mode 100644 index 0000000..3cffc74 --- /dev/null +++ b/libffado-2.4.4-no-test-apps.patch @@ -0,0 +1,30 @@ +diff -up libffado-2.4.4/tests/SConscript.no-test-apps libffado-2.4.4/tests/SConscript +--- libffado-2.4.4/tests/SConscript.no-test-apps 2018-03-04 07:12:18.000000000 +0100 ++++ libffado-2.4.4/tests/SConscript 2021-01-05 16:26:04.561795120 +0100 +@@ -83,7 +83,7 @@ if env['ENABLE_DICE']: + + for app in apps.keys(): + env.Program( target=app, source = env.Split( apps[app] ) ) +- env.Install( "$bindir", app ) ++ # env.Install( "$bindir", app ) + + env.SConscript( dirs=["streaming", "systemtests"], exports="env" ) + +diff -up libffado-2.4.4/tests/streaming/SConscript.no-test-apps libffado-2.4.4/tests/streaming/SConscript +--- libffado-2.4.4/tests/streaming/SConscript.no-test-apps 2018-03-04 07:12:18.000000000 +0100 ++++ libffado-2.4.4/tests/streaming/SConscript 2021-01-05 16:25:56.357813274 +0100 +@@ -38,4 +38,4 @@ apps = { + + for app in apps.keys(): + env.Program( target=app, source = env.Split( apps[app] ) ) +- env.Install( "$bindir", app ) ++ # env.Install( "$bindir", app ) +diff -up libffado-2.4.4/tests/systemtests/SConscript.no-test-apps libffado-2.4.4/tests/systemtests/SConscript +--- libffado-2.4.4/tests/systemtests/SConscript.no-test-apps 2018-03-04 07:12:18.000000000 +0100 ++++ libffado-2.4.4/tests/systemtests/SConscript 2021-01-05 16:26:07.104789496 +0100 +@@ -49,4 +49,4 @@ apps = { + + for app in apps.keys(): + env.Program( target=app, source = env.Split( apps[app] ) ) +- env.Install( "$bindir", app ) ++ # env.Install( "$bindir", app ) diff --git a/libffado.spec b/libffado.spec index c86bbc7..4d4d3ff 100644 --- a/libffado.spec +++ b/libffado.spec @@ -9,6 +9,8 @@ Source0: http://www.ffado.org/files/%{name}-%{version}.tgz # bash libffado-snapshot.sh 2088 # The fetch script Source9: libffado-snapshot.sh +Patch0: libffado-2.4.4-no-test-apps.patch +Patch1: libffado-2.4.4-icon-name.patch BuildRequires: alsa-lib-devel BuildRequires: dbus-c++-devel @@ -28,7 +30,7 @@ BuildRequires: libxml++-devel BuildRequires: pkgconfig BuildRequires: python3-qt5-devel BuildRequires: python3-devel -BuildRequires: python3-scons +BuildRequires: python3-scons >= 3.0.2 BuildRequires: subversion ExcludeArch: s390 s390x Requires: udev @@ -63,18 +65,9 @@ Applications and utilities for use with libffado. %prep -%setup -q - -# Work around a bug in scons < 3.0.2 -if %{__python3} -c 'import SCons; import sys; sys.exit(not tuple(int(d) for d in SCons.__version__.split(".")) < (3, 0, 2))'; then - sed -i '/^CacheDir/d' SConstruct -fi - -# We don't want to install all tests -sed -i '/Install/d' tests/{,*/}SConscript - -# Use standard icon name -sed -i 's|hi64-apps-ffado.png|ffado.png|' support/mixer-qt4/ffado/ffadowindow.py +%autosetup -N +%patch0 -p1 -b .no-test-apps +%patch1 -p1 -b .icon-name # Fix Python shebangs sed -i 's|/usr/bin/.*python$|/usr/bin/python3|' \ @@ -82,13 +75,12 @@ sed -i 's|/usr/bin/.*python$|/usr/bin/python3|' \ support/mixer-qt4/ffado-mixer* support/mixer-qt4/SConscript \ support/tools/*.py support/tools/SConscript -sed -i 's|-m32||' SConstruct - %build export CFLAGS="%{optflags} -ffast-math" export CXXFLAGS="%{optflags} -ffast-math --std=gnu++11" export LDFLAGS="%{build_ldflags}" scons-3 %{?_smp_mflags} \ + DETECT_USERSPACE_ENV=False \ ENABLE_SETBUFFERSIZE_API_VER=True \ ENABLE_OPTIMIZATIONS=True \ CUSTOM_ENV=True \ @@ -161,6 +153,7 @@ appstream-util validate-relax --nonet \ * Tue Jan 05 2020 Nils Philippsen - 2.4.4-1 - Version 2.4.4 - Document license of binary package +- Avoid using sed to patch files where feasible * Tue Jul 28 2020 Fedora Release Engineering - 2.4.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 035144d89e8dc5d398b5f1fa9695879f08d40634 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Tue, 5 Jan 2021 16:56:19 +0100 Subject: [PATCH 24/63] Don't BR: subversion as we build from released tarball Signed-off-by: Nils Philippsen --- libffado.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libffado.spec b/libffado.spec index 4d4d3ff..4a9d113 100644 --- a/libffado.spec +++ b/libffado.spec @@ -31,7 +31,6 @@ BuildRequires: pkgconfig BuildRequires: python3-qt5-devel BuildRequires: python3-devel BuildRequires: python3-scons >= 3.0.2 -BuildRequires: subversion ExcludeArch: s390 s390x Requires: udev @@ -154,6 +153,7 @@ appstream-util validate-relax --nonet \ - Version 2.4.4 - Document license of binary package - Avoid using sed to patch files where feasible +- Don't BR: subversion as we build from released tarball * Tue Jul 28 2020 Fedora Release Engineering - 2.4.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 816d56aa2cef3dcdaed6aadb0c31150977d65330 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Tue, 5 Jan 2021 17:11:58 +0100 Subject: [PATCH 25/63] Fix bogus changelog date, happy new year! Signed-off-by: Nils Philippsen --- libffado.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libffado.spec b/libffado.spec index 4a9d113..ece7927 100644 --- a/libffado.spec +++ b/libffado.spec @@ -1,7 +1,7 @@ Summary: Free firewire audio driver library Name: libffado Version: 2.4.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 or GPLv3 URL: http://www.ffado.org/ Source0: http://www.ffado.org/files/%{name}-%{version}.tgz @@ -149,7 +149,10 @@ appstream-util validate-relax --nonet \ %changelog -* Tue Jan 05 2020 Nils Philippsen - 2.4.4-1 +* Tue Jan 05 2021 Nils Philippsen - 2.4.4-2 +- Fix bogus changelog date, happy new year! + +* Tue Jan 05 2021 Nils Philippsen - 2.4.4-1 - Version 2.4.4 - Document license of binary package - Avoid using sed to patch files where feasible From eb25fcf37435070acd9fbcc793e8b3776b573d15 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Tue, 5 Jan 2021 17:23:53 +0100 Subject: [PATCH 26/63] Remove outdated comment Signed-off-by: Nils Philippsen --- libffado.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/libffado.spec b/libffado.spec index ece7927..023b3c4 100644 --- a/libffado.spec +++ b/libffado.spec @@ -55,7 +55,6 @@ Summary: Free firewire audio driver library applications and utilities License: GPLv3 and GPLv3+ and (GPLv2 or GPLv3) Requires: %{name}%{?_isa} = %{version}-%{release} Requires: dbus -# the following got renamed to python2-dbus on F28. We are using the backward-compatible Provides Requires: python3-dbus Requires: python3-qt5 From cf61085376187373a38d0bdbf50e5e6c9b8bc732 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Tue, 5 Jan 2021 18:34:32 +0100 Subject: [PATCH 27/63] Fix building on EL8 --- libffado-2.4.4-scons-quirk.patch | 13 +++++++++++++ libffado.spec | 15 +++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 libffado-2.4.4-scons-quirk.patch diff --git a/libffado-2.4.4-scons-quirk.patch b/libffado-2.4.4-scons-quirk.patch new file mode 100644 index 0000000..60f8a39 --- /dev/null +++ b/libffado-2.4.4-scons-quirk.patch @@ -0,0 +1,13 @@ +diff -up libffado-2.4.4/SConstruct.scons-quirk libffado-2.4.4/SConstruct +--- libffado-2.4.4/SConstruct.scons-quirk 2020-08-09 09:29:35.000000000 +0200 ++++ libffado-2.4.4/SConstruct 2021-01-05 18:28:40.865754202 +0100 +@@ -150,7 +150,8 @@ if not os.path.isdir( "cache" ): + if not os.path.isdir( 'cache/objects' ): + os.makedirs( 'cache/objects' ) + +-CacheDir( 'cache/objects' ) ++# Doesn't work with scons < 3.0.2 ++# CacheDir( 'cache/objects' ) + + opts.Save( 'cache/options.cache', env ) + diff --git a/libffado.spec b/libffado.spec index 023b3c4..e694c43 100644 --- a/libffado.spec +++ b/libffado.spec @@ -1,3 +1,9 @@ +%if ! 0%{?rhel} || 0%{?rhel} > 8 +%global needs_scons_quirk 0 +%else +%global needs_scons_quirk 1 +%endif + Summary: Free firewire audio driver library Name: libffado Version: 2.4.4 @@ -11,6 +17,7 @@ Source0: http://www.ffado.org/files/%{name}-%{version}.tgz 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 BuildRequires: alsa-lib-devel BuildRequires: dbus-c++-devel @@ -30,7 +37,11 @@ BuildRequires: libxml++-devel BuildRequires: pkgconfig BuildRequires: python3-qt5-devel BuildRequires: python3-devel +%if ! %needs_scons_quirk BuildRequires: python3-scons >= 3.0.2 +%else +BuildRequires: python3-scons +%endif ExcludeArch: s390 s390x Requires: udev @@ -66,6 +77,9 @@ Applications and utilities for use with libffado. %autosetup -N %patch0 -p1 -b .no-test-apps %patch1 -p1 -b .icon-name +%if %needs_scons_quirk +%patch2 -p1 -b .scons-quirk +%endif # Fix Python shebangs sed -i 's|/usr/bin/.*python$|/usr/bin/python3|' \ @@ -150,6 +164,7 @@ appstream-util validate-relax --nonet \ %changelog * Tue Jan 05 2021 Nils Philippsen - 2.4.4-2 - Fix bogus changelog date, happy new year! +- Fix building on EL8 * Tue Jan 05 2021 Nils Philippsen - 2.4.4-1 - Version 2.4.4 From ec88d293558dcee59164bd935df5eced13053504 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 17:03:24 +0000 Subject: [PATCH 28/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libffado.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libffado.spec b/libffado.spec index e694c43..7ed9703 100644 --- a/libffado.spec +++ b/libffado.spec @@ -7,7 +7,7 @@ Summary: Free firewire audio driver library Name: libffado Version: 2.4.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 or GPLv3 URL: http://www.ffado.org/ Source0: http://www.ffado.org/files/%{name}-%{version}.tgz @@ -162,6 +162,9 @@ appstream-util validate-relax --nonet \ %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 2.4.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jan 05 2021 Nils Philippsen - 2.4.4-2 - Fix bogus changelog date, happy new year! - Fix building on EL8 From 51d2e084731e880da470227f8ac9471c7dbce6f1 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 20:09:07 +0200 Subject: [PATCH 29/63] Rebuilt for Python 3.10 --- libffado.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libffado.spec b/libffado.spec index 7ed9703..b823d64 100644 --- a/libffado.spec +++ b/libffado.spec @@ -7,7 +7,7 @@ Summary: Free firewire audio driver library Name: libffado Version: 2.4.4 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 or GPLv3 URL: http://www.ffado.org/ Source0: http://www.ffado.org/files/%{name}-%{version}.tgz @@ -162,6 +162,9 @@ appstream-util validate-relax --nonet \ %changelog +* Fri Jun 04 2021 Python Maint - 2.4.4-4 +- Rebuilt for Python 3.10 + * Tue Jan 26 2021 Fedora Release Engineering - 2.4.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From d3db13b25cfa7dac990c3076818c49c56040e9cf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 11:21:57 +0000 Subject: [PATCH 30/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libffado.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libffado.spec b/libffado.spec index b823d64..de6ccc1 100644 --- a/libffado.spec +++ b/libffado.spec @@ -7,7 +7,7 @@ Summary: Free firewire audio driver library Name: libffado Version: 2.4.4 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 or GPLv3 URL: http://www.ffado.org/ Source0: http://www.ffado.org/files/%{name}-%{version}.tgz @@ -162,6 +162,9 @@ appstream-util validate-relax --nonet \ %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 2.4.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Jun 04 2021 Python Maint - 2.4.4-4 - Rebuilt for Python 3.10 From 1dd912750ed38047f8c6628f375cc68dffb445ea Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 16:12:17 +0000 Subject: [PATCH 31/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libffado.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libffado.spec b/libffado.spec index de6ccc1..b91571b 100644 --- a/libffado.spec +++ b/libffado.spec @@ -7,7 +7,7 @@ Summary: Free firewire audio driver library Name: libffado Version: 2.4.4 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2 or GPLv3 URL: http://www.ffado.org/ Source0: http://www.ffado.org/files/%{name}-%{version}.tgz @@ -162,6 +162,9 @@ appstream-util validate-relax --nonet \ %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 2.4.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 2.4.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 4fc0174098731e9348422c1e3dc939c8f84c4861 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Sat, 12 Mar 2022 12:12:16 +0100 Subject: [PATCH 32/63] Version 2.4.5 Signed-off-by: Nils Philippsen --- .gitignore | 1 + libffado.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7979b9e..f61690c 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ libffado-2.0.1-svn1864.tar.bz2 /libffado-2.4.1.tgz /libffado-2.4.3.tgz /libffado-2.4.4.tgz +/libffado-2.4.5.tgz diff --git a/libffado.spec b/libffado.spec index b91571b..1bab982 100644 --- a/libffado.spec +++ b/libffado.spec @@ -6,8 +6,8 @@ Summary: Free firewire audio driver library Name: libffado -Version: 2.4.4 -Release: 6%{?dist} +Version: 2.4.5 +Release: 1%{?dist} License: GPLv2 or GPLv3 URL: http://www.ffado.org/ Source0: http://www.ffado.org/files/%{name}-%{version}.tgz @@ -162,6 +162,9 @@ appstream-util validate-relax --nonet \ %changelog +* Sat Mar 12 2022 Nils Philippsen - 2.4.5-1 +- Version 2.4.5 + * Thu Jan 20 2022 Fedora Release Engineering - 2.4.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index b1e8199..8224679 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libffado-2.4.4.tgz) = 065b7f9ce9bf58320c02353b63ed17b3610d0ee8a2de58de27159b2190e39c779094b01ae1123c087387e6077375e646b564b9e7717b192865b2f1f22a3acc80 +SHA512 (libffado-2.4.5.tgz) = a2c1d0515e14015b7803c4d52d67605afec27ae2569888dec085375ed4a488f4885b5033369e52305e668a35289d3bd749a9babb5778df339fa93553c23af30f From 5153fbc39ef951828653663e596afda9352b8eb7 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Thu, 7 Apr 2022 17:57:45 +0200 Subject: [PATCH 33/63] Cast more values to int to avoid crashes Previously, click-dragging values in the matrix mixer would make ffado-mixer crash. Signed-off-by: Nils Philippsen --- ...-more-values-to-int-to-avoid-crashes.patch | 50 +++++++++++++++++++ libffado.spec | 7 ++- 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 0001-Cast-more-values-to-int-to-avoid-crashes.patch diff --git a/0001-Cast-more-values-to-int-to-avoid-crashes.patch b/0001-Cast-more-values-to-int-to-avoid-crashes.patch new file mode 100644 index 0000000..211538b --- /dev/null +++ b/0001-Cast-more-values-to-int-to-avoid-crashes.patch @@ -0,0 +1,50 @@ +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 1bab982..2624bf4 100644 --- a/libffado.spec +++ b/libffado.spec @@ -7,7 +7,7 @@ Summary: Free firewire audio driver library Name: libffado Version: 2.4.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 or GPLv3 URL: http://www.ffado.org/ Source0: http://www.ffado.org/files/%{name}-%{version}.tgz @@ -18,6 +18,7 @@ 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 @@ -80,6 +81,7 @@ 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|' \ @@ -162,6 +164,9 @@ appstream-util validate-relax --nonet \ %changelog +* Thu Apr 07 2022 Nils Philippsen - 2.4.5-2 +- Cast more float values to int to avoid crashes + * Sat Mar 12 2022 Nils Philippsen - 2.4.5-1 - Version 2.4.5 From 0034caf4dd90814e81530deed28ac71417724ee6 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 23:42:48 +0200 Subject: [PATCH 34/63] Rebuilt for Python 3.11 --- libffado.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libffado.spec b/libffado.spec index 2624bf4..8e7c839 100644 --- a/libffado.spec +++ b/libffado.spec @@ -7,7 +7,7 @@ Summary: Free firewire audio driver library Name: libffado Version: 2.4.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 or GPLv3 URL: http://www.ffado.org/ Source0: http://www.ffado.org/files/%{name}-%{version}.tgz @@ -164,6 +164,9 @@ appstream-util validate-relax --nonet \ %changelog +* Mon Jun 13 2022 Python Maint - 2.4.5-3 +- Rebuilt for Python 3.11 + * Thu Apr 07 2022 Nils Philippsen - 2.4.5-2 - Cast more float values to int to avoid crashes From 944cab0bd9542b8d8c6690d7f50332ba01c5a637 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Mon, 18 Jul 2022 23:58:38 +0200 Subject: [PATCH 35/63] Version 2.4.6 Signed-off-by: Nils Philippsen --- .gitignore | 1 + ...-more-values-to-int-to-avoid-crashes.patch | 50 ------------------- libffado.spec | 9 ++-- sources | 2 +- 4 files changed, 7 insertions(+), 55 deletions(-) delete mode 100644 0001-Cast-more-values-to-int-to-avoid-crashes.patch 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 From b452da0ed22761914b3fad8442b9bd0d81d13ef9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 17:47:35 +0000 Subject: [PATCH 36/63] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libffado.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libffado.spec b/libffado.spec index da96c9d..172bcd0 100644 --- a/libffado.spec +++ b/libffado.spec @@ -7,7 +7,7 @@ Summary: Free firewire audio driver library Name: libffado Version: 2.4.6 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 or GPLv3 URL: http://www.ffado.org/ Source0: http://www.ffado.org/files/%{name}-%{version}.tgz @@ -162,6 +162,9 @@ appstream-util validate-relax --nonet \ %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 2.4.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jul 18 2022 Nils Philippsen - 2.4.6-1 - Version 2.4.6 From 0f2308f3e5d5b62390eacef67f8bb96f9d3b0d55 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Sat, 3 Sep 2022 22:05:55 +0200 Subject: [PATCH 37/63] Fix yet another int/float crash This time it was in the crossbar router. Signed-off-by: Nils Philippsen --- ...-another-Python-3.10-int-float-crash.patch | 28 +++++++++++++++++++ libffado.spec | 8 +++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 0001-ffado-mixer-Fix-another-Python-3.10-int-float-crash.patch 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 From 9cf65acfbbac545c2b05a18479cfeeb2382c3f27 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 2 Dec 2022 15:48:24 +0100 Subject: [PATCH 38/63] Drop udev enforcement - rhbz#2132573 --- libffado.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libffado.spec b/libffado.spec index 9062a3b..beed339 100644 --- a/libffado.spec +++ b/libffado.spec @@ -45,7 +45,7 @@ BuildRequires: python3-scons >= 3.0.2 BuildRequires: python3-scons %endif ExcludeArch: s390 s390x -Requires: udev + %description The FFADO project aims to provide a generic, open-source solution for the From df4be692fe74bde236b44cd41cdbf61d71a554f2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 16:19:08 +0000 Subject: [PATCH 39/63] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libffado.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libffado.spec b/libffado.spec index beed339..80c4f76 100644 --- a/libffado.spec +++ b/libffado.spec @@ -7,7 +7,7 @@ Summary: Free firewire audio driver library Name: libffado Version: 2.4.6 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 or GPLv3 URL: http://www.ffado.org/ Source0: http://www.ffado.org/files/%{name}-%{version}.tgz @@ -165,6 +165,9 @@ appstream-util validate-relax --nonet \ %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 2.4.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Sep 03 2022 Nils Philippsen - 2.4.6-3 - Fix yet another int/float crash, this time in the crossbar router From b9421a36c9c5213262ba2e50484d4857ad71b50a Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Mon, 6 Feb 2023 11:31:27 +0100 Subject: [PATCH 40/63] Convert to rpmautospec --- changelog | 257 +++++++++++++++++++++++++++++++++++++++++++++++++ libffado.spec | 260 +------------------------------------------------- 2 files changed, 259 insertions(+), 258 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..4e01d66 --- /dev/null +++ b/changelog @@ -0,0 +1,257 @@ +* Thu Jan 19 2023 Fedora Release Engineering - 2.4.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* 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 + +* 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 + +* Thu Apr 07 2022 Nils Philippsen - 2.4.5-2 +- Cast more float values to int to avoid crashes + +* Sat Mar 12 2022 Nils Philippsen - 2.4.5-1 +- Version 2.4.5 + +* Thu Jan 20 2022 Fedora Release Engineering - 2.4.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 2.4.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Python Maint - 2.4.4-4 +- Rebuilt for Python 3.10 + +* Tue Jan 26 2021 Fedora Release Engineering - 2.4.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jan 05 2021 Nils Philippsen - 2.4.4-2 +- Fix bogus changelog date, happy new year! +- Fix building on EL8 + +* Tue Jan 05 2021 Nils Philippsen - 2.4.4-1 +- Version 2.4.4 +- Document license of binary package +- Avoid using sed to patch files where feasible +- Don't BR: subversion as we build from released tarball + +* Tue Jul 28 2020 Fedora Release Engineering - 2.4.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat May 30 2020 Nils Philippsen - 2.4.3-2 +- work around a bug in scons < 3.0.2 + +* Fri May 29 2020 Nils Philippsen - 2.4.3-1 +- version 2.4.3 + +* Tue May 26 2020 Miro Hrončok - 2.4.1-11 +- Rebuilt for Python 3.9 + +* Wed Jan 29 2020 Fedora Release Engineering - 2.4.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Sep 18 2019 Orcan Ogetbil - 2.4.1-9 +- Convert the package from Python2 to Python3 + +* Sat Aug 03 2019 Orcan Ogetbil - 2.4.1-8 +- scons renamed to scons-2 in the recent Fedora package + +* Thu Jul 25 2019 Fedora Release Engineering - 2.4.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Feb 07 2019 Orcan Ogetbil - 2.4.1-6 +- Added BR: python2-rpm-macros + +* Fri Feb 01 2019 Fedora Release Engineering - 2.4.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Jul 24 2018 Tom Callaway - 2.4.1-4 +- rebuild for new libconfig + +* Thu Jul 19 2018 Orcan Ogetbil - 2.4.1-3 +- Fixed Python shebangs +- Added BR: python2-enum34 + +* Fri Jul 13 2018 Fedora Release Engineering - 2.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Apr 25 2018 Orcan Ogetbil - 2.4.1-1 +- Update to 2.4.1 +- Drop upstreamed patches + +* Wed Apr 18 2018 Iryna Shcherbina - 2.4.0-6 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + +* Sat Feb 10 2018 Orcan Ogetbil - 2.4.0-5 +- Build with RPM_LD_FLAGS exported in install section as well + +* Fri Feb 9 2018 Florian Weimer - 2.4.0-4 +- Use LDFLAGS from redhat-rpm-config + +* Wed Feb 07 2018 Fedora Release Engineering - 2.4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sat Feb 03 2018 Igor Gnatenko - 2.4.0-2 +- Switch to %%ldconfig_scriptlets + +* Fri Jan 05 2018 Orcan Ogetbil - 2.4.0-1 +- Update to 2.4.0 +- Drop upstreamed patches + +* Fri Jan 05 2018 Igor Gnatenko - 2.3.0-8 +- Remove obsolete scriptlets + +* Mon Nov 06 2017 Orcan Ogetbil - 2.3.0-7 +- Build against scons3 +- Build against newer gcc/glibc + +* Thu Aug 10 2017 Orcan Ogetbil - 2.3.0-6 +- Fix FTBFS on F27 +- Backported fixes from trunk for various compilation warnings +- MIPS support RHBZ#1366701 + +* Thu Aug 03 2017 Fedora Release Engineering - 2.3.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 2.3.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Mon May 15 2017 Fedora Release Engineering - 2.3.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild + +* Thu Feb 16 2017 Jonathan Wakely - 2.3.0-2 +- Patch invalid code to build with GCC 7 + +* Fri Feb 10 2017 Fedora Release Engineering - 2.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Aug 08 2016 Orcan Ogetbil - 2.3.0-1 +- Update to 2.3.0. + +* Tue Jul 19 2016 Fedora Release Engineering - 2.2.1-9 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Tue Mar 01 2016 Yaakov Selkowitz - 2.2.1-8 +- Fix FTBFS with GCC 6 (#1307721) + +* Thu Feb 04 2016 Fedora Release Engineering - 2.2.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jan 22 2016 Lubomir Rintel - 2.2.1-6 +- Fix FTBFS + +* Wed Jun 17 2015 Fedora Release Engineering - 2.2.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat May 02 2015 Kalev Lember - 2.2.1-4 +- Rebuilt for GCC 5 C++11 ABI change + +* Sun Aug 17 2014 Fedora Release Engineering - 2.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 2.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Jun 01 2014 Brendan Jones 2.2.1-1 +- Update to 2.2.1 +- Remove incorporated udev rules patch + +* Mon Sep 30 2013 Brendan Jones 2.1.0-4 +- Corrrect udev rules RFBZ#999580 +- Correct changelog + +* Sat Aug 03 2013 Fedora Release Engineering - 2.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Feb 14 2013 Fedora Release Engineering - 2.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Sep 20 2012 Orcan Ogetbil - 2.1.0-1 +- Update to 2.1.0. +- Drop upstreamed & old patches, README.Fedora file. + +* Thu Jul 19 2012 Fedora Release Engineering - 2.1.0-0.10.20120325.svn2088 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Jun 12 2012 Orcan Ogetbil - 2.1.0-0.9.20120325.svn2088 +- Fix multilib confict RHBZ#831405 +- Fix DSO linking #ticket 355 + +* Sun Mar 25 2012 Orcan Ogetbil - 2.1.0-0.8.20120325.svn2088 +- Update to svn2088. +- Drop upstreamed gcc-4.7 patch. + +* Thu Mar 22 2012 Orcan Ogetbil - 2.1.0-0.7.20111030.svn2000 +- Include the ffado-test executable RHBZ#805940 +- Fix .desktop file warning + +* Tue Feb 28 2012 Fedora Release Engineering - 2.1.0-0.6.20111030.svn2000 +- Rebuilt for c++ ABI breakage + +* Tue Jan 10 2012 Orcan Ogetbil - 2.1.0-0.5.20111030.svn2000 +- gcc-4.7 compile fix + +* Sun Oct 30 2011 Orcan Ogetbil - 2.1.0-0.4.20111030.svn2000 +- Update to svn2000. +- Drop the gold linker patch. The issue is properly solved upstream. See upstream tracker #293 + +* Tue Apr 26 2011 Brendan Jones - 2.1.0-0.3.20110426.svn1983 +- Update to svn1983 +- Clean up redundant patches +- Patch to rebuild using gold linker. Fixes RHBZ#684392 + +* Mon Feb 07 2011 Fedora Release Engineering - 2.1.0-0.2.20101015.svn1913 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Oct 15 2010 Orcan Ogetbil - 2.1.0-0.1.20101015.svn1913 +- Update to svn1913. Fixes RHBZ#635315 +- Drop upstreamed patches + +* Thu Aug 26 2010 Dan Horák - 2.0.1-5.20100706.svn1864 +- no Firewire on s390(x) + +* Thu Jul 29 2010 Orcan Ogetbil - 2.0.1-4.20100706.svn1864 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + +* Wed Jul 14 2010 Orcan Ogetbil - 2.0.1-3.20100706.svn1864 +- Remove ENABLE_ALL +- Improve the libffado-dont-use-bundled-libs.patch +- Drop BR: expat-devel libavc1394-devel +- Move configuration file to the library package +- Minor enhancement in the .desktop file +- Add links to upstream tickets for patches +- Add -ffast-math to the compiler flags +- Add patch to compile against libconfig-1.4.5 + +* Tue Jul 13 2010 Orcan Ogetbil - 2.0.1-2.20100706.svn1864 +- Add ENABLE_ALL flag to support more devices +- Don't bundle tests +- Include some preliminary documentation for the tools until the manpages arrive +- Patch out bundled libraries. Also fixes some rpmlints +- Improve the instructions how to create the tarball + +* Wed Jul 07 2010 Orcan Ogetbil - 2.0.1-1.20100706.svn1864 +- Update to trunk, post 2.0.1. + +* Sat Jun 05 2010 Orcan Ogetbil - 2.0.0-1.20100605.svn1845 +- Update to trunk, post 2.0.0. + +* Mon May 18 2009 Jarod Wilson - 2.0-0.4.rc2 +- Update to 2.0.0-rc2 + +* Thu Nov 06 2008 Jarod Wilson - 2.0-0.3.beta7 +- Update to beta7 +- Put arch-dependent helper/test binaries in libexecdir instead of datadir + +* Sun Aug 10 2008 Jarod Wilson - 2.0-0.2.beta6 +- Review clean-ups (#456353) + +* Tue Jul 22 2008 Jarod Wilson - 2.0-0.1.beta6 +- Initial Fedora build of libffado diff --git a/libffado.spec b/libffado.spec index 80c4f76..c19bdc2 100644 --- a/libffado.spec +++ b/libffado.spec @@ -7,7 +7,7 @@ Summary: Free firewire audio driver library Name: libffado Version: 2.4.6 -Release: 4%{?dist} +Release: %autorelease License: GPLv2 or GPLv3 URL: http://www.ffado.org/ Source0: http://www.ffado.org/files/%{name}-%{version}.tgz @@ -165,260 +165,4 @@ appstream-util validate-relax --nonet \ %changelog -* Thu Jan 19 2023 Fedora Release Engineering - 2.4.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* 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 - -* 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 - -* Thu Apr 07 2022 Nils Philippsen - 2.4.5-2 -- Cast more float values to int to avoid crashes - -* Sat Mar 12 2022 Nils Philippsen - 2.4.5-1 -- Version 2.4.5 - -* Thu Jan 20 2022 Fedora Release Engineering - 2.4.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jul 22 2021 Fedora Release Engineering - 2.4.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Jun 04 2021 Python Maint - 2.4.4-4 -- Rebuilt for Python 3.10 - -* Tue Jan 26 2021 Fedora Release Engineering - 2.4.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jan 05 2021 Nils Philippsen - 2.4.4-2 -- Fix bogus changelog date, happy new year! -- Fix building on EL8 - -* Tue Jan 05 2021 Nils Philippsen - 2.4.4-1 -- Version 2.4.4 -- Document license of binary package -- Avoid using sed to patch files where feasible -- Don't BR: subversion as we build from released tarball - -* Tue Jul 28 2020 Fedora Release Engineering - 2.4.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sat May 30 2020 Nils Philippsen - 2.4.3-2 -- work around a bug in scons < 3.0.2 - -* Fri May 29 2020 Nils Philippsen - 2.4.3-1 -- version 2.4.3 - -* Tue May 26 2020 Miro Hrončok - 2.4.1-11 -- Rebuilt for Python 3.9 - -* Wed Jan 29 2020 Fedora Release Engineering - 2.4.1-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Sep 18 2019 Orcan Ogetbil - 2.4.1-9 -- Convert the package from Python2 to Python3 - -* Sat Aug 03 2019 Orcan Ogetbil - 2.4.1-8 -- scons renamed to scons-2 in the recent Fedora package - -* Thu Jul 25 2019 Fedora Release Engineering - 2.4.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Feb 07 2019 Orcan Ogetbil - 2.4.1-6 -- Added BR: python2-rpm-macros - -* Fri Feb 01 2019 Fedora Release Engineering - 2.4.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Jul 24 2018 Tom Callaway - 2.4.1-4 -- rebuild for new libconfig - -* Thu Jul 19 2018 Orcan Ogetbil - 2.4.1-3 -- Fixed Python shebangs -- Added BR: python2-enum34 - -* Fri Jul 13 2018 Fedora Release Engineering - 2.4.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Apr 25 2018 Orcan Ogetbil - 2.4.1-1 -- Update to 2.4.1 -- Drop upstreamed patches - -* Wed Apr 18 2018 Iryna Shcherbina - 2.4.0-6 -- Update Python 2 dependency declarations to new packaging standards - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Sat Feb 10 2018 Orcan Ogetbil - 2.4.0-5 -- Build with RPM_LD_FLAGS exported in install section as well - -* Fri Feb 9 2018 Florian Weimer - 2.4.0-4 -- Use LDFLAGS from redhat-rpm-config - -* Wed Feb 07 2018 Fedora Release Engineering - 2.4.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sat Feb 03 2018 Igor Gnatenko - 2.4.0-2 -- Switch to %%ldconfig_scriptlets - -* Fri Jan 05 2018 Orcan Ogetbil - 2.4.0-1 -- Update to 2.4.0 -- Drop upstreamed patches - -* Fri Jan 05 2018 Igor Gnatenko - 2.3.0-8 -- Remove obsolete scriptlets - -* Mon Nov 06 2017 Orcan Ogetbil - 2.3.0-7 -- Build against scons3 -- Build against newer gcc/glibc - -* Thu Aug 10 2017 Orcan Ogetbil - 2.3.0-6 -- Fix FTBFS on F27 -- Backported fixes from trunk for various compilation warnings -- MIPS support RHBZ#1366701 - -* Thu Aug 03 2017 Fedora Release Engineering - 2.3.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 2.3.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Mon May 15 2017 Fedora Release Engineering - 2.3.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild - -* Thu Feb 16 2017 Jonathan Wakely - 2.3.0-2 -- Patch invalid code to build with GCC 7 - -* Fri Feb 10 2017 Fedora Release Engineering - 2.3.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Aug 08 2016 Orcan Ogetbil - 2.3.0-1 -- Update to 2.3.0. - -* Tue Jul 19 2016 Fedora Release Engineering - 2.2.1-9 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Tue Mar 01 2016 Yaakov Selkowitz - 2.2.1-8 -- Fix FTBFS with GCC 6 (#1307721) - -* Thu Feb 04 2016 Fedora Release Engineering - 2.2.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jan 22 2016 Lubomir Rintel - 2.2.1-6 -- Fix FTBFS - -* Wed Jun 17 2015 Fedora Release Engineering - 2.2.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat May 02 2015 Kalev Lember - 2.2.1-4 -- Rebuilt for GCC 5 C++11 ABI change - -* Sun Aug 17 2014 Fedora Release Engineering - 2.2.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 2.2.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Jun 01 2014 Brendan Jones 2.2.1-1 -- Update to 2.2.1 -- Remove incorporated udev rules patch - -* Mon Sep 30 2013 Brendan Jones 2.1.0-4 -- Corrrect udev rules RFBZ#999580 -- Correct changelog - -* Sat Aug 03 2013 Fedora Release Engineering - 2.1.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Feb 14 2013 Fedora Release Engineering - 2.1.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Sep 20 2012 Orcan Ogetbil - 2.1.0-1 -- Update to 2.1.0. -- Drop upstreamed & old patches, README.Fedora file. - -* Thu Jul 19 2012 Fedora Release Engineering - 2.1.0-0.10.20120325.svn2088 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Jun 12 2012 Orcan Ogetbil - 2.1.0-0.9.20120325.svn2088 -- Fix multilib confict RHBZ#831405 -- Fix DSO linking #ticket 355 - -* Sun Mar 25 2012 Orcan Ogetbil - 2.1.0-0.8.20120325.svn2088 -- Update to svn2088. -- Drop upstreamed gcc-4.7 patch. - -* Thu Mar 22 2012 Orcan Ogetbil - 2.1.0-0.7.20111030.svn2000 -- Include the ffado-test executable RHBZ#805940 -- Fix .desktop file warning - -* Tue Feb 28 2012 Fedora Release Engineering - 2.1.0-0.6.20111030.svn2000 -- Rebuilt for c++ ABI breakage - -* Tue Jan 10 2012 Orcan Ogetbil - 2.1.0-0.5.20111030.svn2000 -- gcc-4.7 compile fix - -* Sun Oct 30 2011 Orcan Ogetbil - 2.1.0-0.4.20111030.svn2000 -- Update to svn2000. -- Drop the gold linker patch. The issue is properly solved upstream. See upstream tracker #293 - -* Tue Apr 26 2011 Brendan Jones - 2.1.0-0.3.20110426.svn1983 -- Update to svn1983 -- Clean up redundant patches -- Patch to rebuild using gold linker. Fixes RHBZ#684392 - -* Mon Feb 07 2011 Fedora Release Engineering - 2.1.0-0.2.20101015.svn1913 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Fri Oct 15 2010 Orcan Ogetbil - 2.1.0-0.1.20101015.svn1913 -- Update to svn1913. Fixes RHBZ#635315 -- Drop upstreamed patches - -* Thu Aug 26 2010 Dan Horák - 2.0.1-5.20100706.svn1864 -- no Firewire on s390(x) - -* Thu Jul 29 2010 Orcan Ogetbil - 2.0.1-4.20100706.svn1864 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild - -* Wed Jul 14 2010 Orcan Ogetbil - 2.0.1-3.20100706.svn1864 -- Remove ENABLE_ALL -- Improve the libffado-dont-use-bundled-libs.patch -- Drop BR: expat-devel libavc1394-devel -- Move configuration file to the library package -- Minor enhancement in the .desktop file -- Add links to upstream tickets for patches -- Add -ffast-math to the compiler flags -- Add patch to compile against libconfig-1.4.5 - -* Tue Jul 13 2010 Orcan Ogetbil - 2.0.1-2.20100706.svn1864 -- Add ENABLE_ALL flag to support more devices -- Don't bundle tests -- Include some preliminary documentation for the tools until the manpages arrive -- Patch out bundled libraries. Also fixes some rpmlints -- Improve the instructions how to create the tarball - -* Wed Jul 07 2010 Orcan Ogetbil - 2.0.1-1.20100706.svn1864 -- Update to trunk, post 2.0.1. - -* Sat Jun 05 2010 Orcan Ogetbil - 2.0.0-1.20100605.svn1845 -- Update to trunk, post 2.0.0. - -* Mon May 18 2009 Jarod Wilson - 2.0-0.4.rc2 -- Update to 2.0.0-rc2 - -* Thu Nov 06 2008 Jarod Wilson - 2.0-0.3.beta7 -- Update to beta7 -- Put arch-dependent helper/test binaries in libexecdir instead of datadir - -* Sun Aug 10 2008 Jarod Wilson - 2.0-0.2.beta6 -- Review clean-ups (#456353) - -* Tue Jul 22 2008 Jarod Wilson - 2.0-0.1.beta6 -- Initial Fedora build of libffado +%autochangelog From 310500349f9d5a7c9406d24665f7c14e28048d9b Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Mon, 6 Feb 2023 11:52:53 +0100 Subject: [PATCH 41/63] Version 2.4.7 Signed-off-by: Nils Philippsen --- .gitignore | 1 + ...-another-Python-3.10-int-float-crash.patch | 28 ------------------- libffado.spec | 5 +--- sources | 2 +- 4 files changed, 3 insertions(+), 33 deletions(-) delete mode 100644 0001-ffado-mixer-Fix-another-Python-3.10-int-float-crash.patch 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 From f6ae14f3e142715e167adff998a6cb1c87b5c133 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 16 Jun 2023 17:30:07 +0200 Subject: [PATCH 42/63] Rebuilt for Python 3.12 From e4549abebb61f44f1928d11b091737784634e77c Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 13 Jul 2023 16:12:23 +0900 Subject: [PATCH 43/63] Patch for python3.12 imp module removal --- libffado-2.4.7-python312-imp-removal.patch | 69 ++++++++++++++++++++++ libffado.spec | 9 ++- 2 files changed, 75 insertions(+), 3 deletions(-) create mode 100644 libffado-2.4.7-python312-imp-removal.patch diff --git a/libffado-2.4.7-python312-imp-removal.patch b/libffado-2.4.7-python312-imp-removal.patch new file mode 100644 index 0000000..3a5a4b9 --- /dev/null +++ b/libffado-2.4.7-python312-imp-removal.patch @@ -0,0 +1,69 @@ +--- libffado-2.4.7/admin/pyuic.py.orig 2023-07-13 15:54:22.683633139 +0900 ++++ libffado-2.4.7/admin/pyuic.py 2023-07-13 15:59:32.832327567 +0900 +@@ -21,7 +21,7 @@ + # along with this program. If not, see . + # + +-import imp ++import importlib.util + + def pyuic_action( target, source, env ): + env.Execute( "pyuic " + str( source[0] ) + " > " + str( target[0] ) ) +@@ -34,8 +34,9 @@ + context.Message( "Checking for pyuic (by checking for the python module pyqtconfig) " ) + ret = True + try: +- imp.find_module( "pyqtconfig" ) +- except ImportError: ++ spec = importlib.util.find_spec( "pyqtconfig" ) ++ module = importlib.util.module_from_spec(spec) ++ except AttributeError: + ret = False + context.Result( ret ) + return ret +--- libffado-2.4.7/admin/pyuic4.py.orig 2023-07-13 15:54:22.683633139 +0900 ++++ libffado-2.4.7/admin/pyuic4.py 2023-07-13 15:58:59.688360220 +0900 +@@ -21,7 +21,7 @@ + # along with this program. If not, see . + # + +-import imp ++import importlib.util + + def pyuic4_action( target, source, env ): + env.Execute( "pyuic4 " + str( source[0] ) + " > " + str( target[0] ) ) +@@ -34,8 +34,9 @@ + context.Message( "Checking for pyuic4 (by checking for the python module pyqtconfig) " ) + ret = True + try: +- imp.find_module( "pyqtconfig" ) +- except ImportError: ++ spec = importlib.util.find_spec( "pyqtconfig" ) ++ module = importlib.util.module_from_spec(spec) ++ except AttributeError: + ret = False + context.Result( ret ) + return ret +--- libffado-2.4.7/admin/pyuic5.py.orig 2023-07-13 15:54:22.683633139 +0900 ++++ libffado-2.4.7/admin/pyuic5.py 2023-07-13 15:59:27.754332570 +0900 +@@ -22,7 +22,7 @@ + # along with this program. If not, see . + # + +-import imp ++import importlib.util + + def pyuic5_action( target, source, env ): + env.Execute( "pyuic5 " + str( source[0] ) + " > " + str( target[0] ) ) +@@ -35,8 +35,9 @@ + context.Message( "Checking for pyuic5 (by checking for the python module pyqtconfig) " ) + ret = True + try: +- imp.find_module( "pyqtconfig" ) +- except ImportError: ++ spec = importlib.util.find_spec( "pyqtconfig" ) ++ module = importlib.util.module_from_spec(spec) ++ except AttributeError: + ret = False + context.Result( ret ) + return ret diff --git a/libffado.spec b/libffado.spec index 9887eab..f68ddc8 100644 --- a/libffado.spec +++ b/libffado.spec @@ -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 +# Patch for python3.12 imp module removal +Patch3: libffado-2.4.7-python312-imp-removal.patch BuildRequires: alsa-lib-devel BuildRequires: dbus-c++-devel @@ -75,11 +77,12 @@ Applications and utilities for use with libffado. %prep %autosetup -N -%patch0 -p1 -b .no-test-apps -%patch1 -p1 -b .icon-name +%patch -P0 -p1 -b .no-test-apps +%patch -P1 -p1 -b .icon-name %if %needs_scons_quirk -%patch2 -p1 -b .scons-quirk +%patch -P2 -p1 -b .scons-quirk %endif +%patch -P3 -p1 -b .py312 # Fix Python shebangs sed -i 's|/usr/bin/.*python$|/usr/bin/python3|' \ From 8ac0d478c1a07b662948cfb4fd797483c80279a7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 10:50:39 +0000 Subject: [PATCH 44/63] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From ca7b59712d430c3ef2d246c278229e91028fd752 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Fri, 29 Sep 2023 01:23:53 +0200 Subject: [PATCH 45/63] Cope with configparser changes in Python 3.12 Signed-off-by: Nils Philippsen --- libffado-2.4.7-configparser.patch | 25 +++++++++++++++++++++++++ libffado.spec | 3 +++ 2 files changed, 28 insertions(+) create mode 100644 libffado-2.4.7-configparser.patch diff --git a/libffado-2.4.7-configparser.patch b/libffado-2.4.7-configparser.patch new file mode 100644 index 0000000..eae6567 --- /dev/null +++ b/libffado-2.4.7-configparser.patch @@ -0,0 +1,25 @@ +diff -up libffado-2.4.7/support/mixer-qt4/ffado/registration.py.configparser libffado-2.4.7/support/mixer-qt4/ffado/registration.py +--- libffado-2.4.7/support/mixer-qt4/ffado/registration.py.configparser 2022-02-25 13:25:10.000000000 +0100 ++++ libffado-2.4.7/support/mixer-qt4/ffado/registration.py 2023-09-29 01:20:30.771066060 +0200 +@@ -27,9 +27,9 @@ import os + # Python3 renamed ConfigParser to configparser. Deal with this in a way + # which maintains compatibility with python2. + try: +- from configparser import SafeConfigParser +-except: +- from ConfigParser import SafeConfigParser ++ from configparser import ConfigParser ++except ImportError: ++ from ConfigParser import SafeConfigParser as ConfigParser + + # The urlopen()/urlencode() functions from urllib in python2 are in + # urllib.request and urllib.parse respectively under python2. +@@ -76,7 +76,7 @@ class ffado_registration: + + # parse the ini file + self.config_filename = os.path.expanduser(INI_FILE_PATH) +- self.parser = SafeConfigParser() ++ self.parser = ConfigParser() + self.parser.read(self.config_filename) + self.section_name = "%s:%X" % (self.ffado_version, self.guid) + self.email = "(optional)" diff --git a/libffado.spec b/libffado.spec index f68ddc8..cea52ab 100644 --- a/libffado.spec +++ b/libffado.spec @@ -20,6 +20,8 @@ Patch1: libffado-2.4.4-icon-name.patch Patch2: libffado-2.4.4-scons-quirk.patch # Patch for python3.12 imp module removal Patch3: libffado-2.4.7-python312-imp-removal.patch +# Patch for Python 3.12 configparser changes +Patch4: libffado-2.4.7-configparser.patch BuildRequires: alsa-lib-devel BuildRequires: dbus-c++-devel @@ -83,6 +85,7 @@ Applications and utilities for use with libffado. %patch -P2 -p1 -b .scons-quirk %endif %patch -P3 -p1 -b .py312 +%patch -P4 -p1 -b .configparser # Fix Python shebangs sed -i 's|/usr/bin/.*python$|/usr/bin/python3|' \ From 23aa915d40e5966cf979db4042806d52c9ff79e3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 04:04:20 +0000 Subject: [PATCH 46/63] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From ec9c5264224bdbc546412dddb57e607991a9a11e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 02:07:48 +0000 Subject: [PATCH 47/63] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From ecf0392148c13da95cee5059da91595189707f25 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Mon, 4 Mar 2024 14:36:21 +0100 Subject: [PATCH 48/63] Version 2.4.8 Signed-off-by: Nils Philippsen --- .gitignore | 1 + libffado-2.4.7-configparser.patch | 25 ----------------------- libffado.spec | 33 ++++++++++++++++++------------- sources | 2 +- 4 files changed, 21 insertions(+), 40 deletions(-) delete mode 100644 libffado-2.4.7-configparser.patch diff --git a/.gitignore b/.gitignore index 749eaf7..57a89ef 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ libffado-2.0.1-svn1864.tar.bz2 /libffado-2.4.5.tgz /libffado-2.4.6.tgz /libffado-2.4.7.tgz +/libffado-2.4.8.tgz diff --git a/libffado-2.4.7-configparser.patch b/libffado-2.4.7-configparser.patch deleted file mode 100644 index eae6567..0000000 --- a/libffado-2.4.7-configparser.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up libffado-2.4.7/support/mixer-qt4/ffado/registration.py.configparser libffado-2.4.7/support/mixer-qt4/ffado/registration.py ---- libffado-2.4.7/support/mixer-qt4/ffado/registration.py.configparser 2022-02-25 13:25:10.000000000 +0100 -+++ libffado-2.4.7/support/mixer-qt4/ffado/registration.py 2023-09-29 01:20:30.771066060 +0200 -@@ -27,9 +27,9 @@ import os - # Python3 renamed ConfigParser to configparser. Deal with this in a way - # which maintains compatibility with python2. - try: -- from configparser import SafeConfigParser --except: -- from ConfigParser import SafeConfigParser -+ from configparser import ConfigParser -+except ImportError: -+ from ConfigParser import SafeConfigParser as ConfigParser - - # The urlopen()/urlencode() functions from urllib in python2 are in - # urllib.request and urllib.parse respectively under python2. -@@ -76,7 +76,7 @@ class ffado_registration: - - # parse the ini file - self.config_filename = os.path.expanduser(INI_FILE_PATH) -- self.parser = SafeConfigParser() -+ self.parser = ConfigParser() - self.parser.read(self.config_filename) - self.section_name = "%s:%X" % (self.ffado_version, self.guid) - self.email = "(optional)" diff --git a/libffado.spec b/libffado.spec index cea52ab..21bd344 100644 --- a/libffado.spec +++ b/libffado.spec @@ -1,12 +1,18 @@ %if ! 0%{?rhel} || 0%{?rhel} > 8 -%global needs_scons_quirk 0 +%bcond scons_quirk 0 %else -%global needs_scons_quirk 1 +%bcond scons_quirk 1 +%endif + +%if %{without scons_quirk} +%global scons scons +%else +%global scons scons-3 %endif Summary: Free firewire audio driver library Name: libffado -Version: 2.4.7 +Version: 2.4.8 Release: %autorelease License: GPLv2 or GPLv3 URL: http://www.ffado.org/ @@ -18,10 +24,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 -# Patch for python3.12 imp module removal +# Patch for Python 3.12 imp module removal Patch3: libffado-2.4.7-python312-imp-removal.patch -# Patch for Python 3.12 configparser changes -Patch4: libffado-2.4.7-configparser.patch BuildRequires: alsa-lib-devel BuildRequires: dbus-c++-devel @@ -41,11 +45,13 @@ BuildRequires: libxml++-devel BuildRequires: pkgconfig BuildRequires: python3-qt5-devel BuildRequires: python3-devel -%if ! %needs_scons_quirk +%if %{without scons_quirk} BuildRequires: python3-scons >= 3.0.2 %else BuildRequires: python3-scons %endif +BuildRequires: python3dist(setuptools) +BuildRequires: rpm_macro(py3_shebang_fix) ExcludeArch: s390 s390x @@ -78,17 +84,16 @@ Applications and utilities for use with libffado. %prep -%autosetup -N +%autosetup -N -n %{name}-%{version}/libffado %patch -P0 -p1 -b .no-test-apps %patch -P1 -p1 -b .icon-name -%if %needs_scons_quirk +%if %{with scons_quirk} %patch -P2 -p1 -b .scons-quirk %endif -%patch -P3 -p1 -b .py312 -%patch -P4 -p1 -b .configparser +%patch -P3 -p1 -b .py312-imp-removal # Fix Python shebangs -sed -i 's|/usr/bin/.*python$|/usr/bin/python3|' \ +%py3_shebang_fix \ admin/*.py doc/SConscript tests/python/*.py tests/*.py \ support/mixer-qt4/ffado-mixer* support/mixer-qt4/SConscript \ support/tools/*.py support/tools/SConscript @@ -97,7 +102,7 @@ sed -i 's|/usr/bin/.*python$|/usr/bin/python3|' \ export CFLAGS="%{optflags} -ffast-math" export CXXFLAGS="%{optflags} -ffast-math --std=gnu++11" export LDFLAGS="%{build_ldflags}" -scons-3 %{?_smp_mflags} \ +%{scons} %{?_smp_mflags} \ DETECT_USERSPACE_ENV=False \ ENABLE_SETBUFFERSIZE_API_VER=True \ ENABLE_OPTIMIZATIONS=True \ @@ -116,7 +121,7 @@ scons-3 %{?_smp_mflags} \ export CFLAGS="%{optflags} -ffast-math" export CXXFLAGS="%{optflags} -ffast-math --std=gnu++11" export LDFLAGS="%{build_ldflags}" -scons-3 DESTDIR=%{buildroot} PREFIX=%{_prefix}\ +%{scons} DESTDIR=%{buildroot} PREFIX=%{_prefix}\ install # We need to install the xdg stuff manually diff --git a/sources b/sources index e748454..7df56da 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libffado-2.4.7.tgz) = 424a9ca7ded12e72d77a50d7ddf4e50dc0d55b80d725499df7609ce60d0eac8b24a41d9b8e4e74f78bdefe114b61bd5f1ec09a6d083f4a58475e66d61153f075 +SHA512 (libffado-2.4.8.tgz) = fbbcd30640c55315f2e65fc6c07afc71a77dd2c9d1b6127ee55cd17e76511ad5f0563135e52397dbf113fb0d5925021a38780f231409bdd920da52e6c1ce3acc From 72af73badd802a750fe021afe0c2def8d004941e Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 21:04:09 +0200 Subject: [PATCH 49/63] Rebuilt for Python 3.13 From 075ed30bf75d0774b7676656bed7657ba637a98d Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Mon, 10 Jun 2024 12:15:27 +0200 Subject: [PATCH 50/63] Own %{_libdir}/libffado (#2284000) [skip changelog] Signed-off-by: Nils Philippsen --- libffado.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libffado.spec b/libffado.spec index 21bd344..cdab40c 100644 --- a/libffado.spec +++ b/libffado.spec @@ -152,7 +152,7 @@ appstream-util validate-relax --nonet \ %dir %{_datadir}/libffado/ %{_datadir}/libffado/configuration %{_prefix}/lib/udev/rules.d/* -%{_libdir}/libffado/static_info.txt +%{_libdir}/libffado %files devel %doc doc/reference/html/ From a8e5c77510c1c50a6e688070b1bb749af5fcc7b4 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Mon, 10 Jun 2024 12:13:17 +0200 Subject: [PATCH 51/63] Update to fixed tarball See https://ffado.org/posts/ffado-2.4.8-tarball_fix/ [skip changelog] Signed-off-by: Nils Philippsen --- libffado.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libffado.spec b/libffado.spec index cdab40c..9a221b7 100644 --- a/libffado.spec +++ b/libffado.spec @@ -84,7 +84,7 @@ Applications and utilities for use with libffado. %prep -%autosetup -N -n %{name}-%{version}/libffado +%autosetup -N %patch -P0 -p1 -b .no-test-apps %patch -P1 -p1 -b .icon-name %if %{with scons_quirk} diff --git a/sources b/sources index 7df56da..e86f101 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libffado-2.4.8.tgz) = fbbcd30640c55315f2e65fc6c07afc71a77dd2c9d1b6127ee55cd17e76511ad5f0563135e52397dbf113fb0d5925021a38780f231409bdd920da52e6c1ce3acc +SHA512 (libffado-2.4.8.tgz) = e891391ace53aa871d07ce244d38c5a3f1e622b6d289bb5ad5ed80255355cad14bc5dd36b6b54e9f3b2bd090b339c8688313204dbb8b391840941da0ef2abb94 From 437df976739b48d5a15b2f3c67a3de8d0d6d7942 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 10 Jun 2024 23:17:01 +0200 Subject: [PATCH 52/63] Rebuilt for Python 3.13 From 2d34efb195a570a447f54b71f8773ad277ab6e0a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 13:50:51 +0000 Subject: [PATCH 53/63] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From b7cef06a67843558e93a728b4d6038c315e6c629 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 7 Aug 2024 09:42:24 +0200 Subject: [PATCH 54/63] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- libffado.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libffado.spec b/libffado.spec index 9a221b7..d961305 100644 --- a/libffado.spec +++ b/libffado.spec @@ -14,7 +14,8 @@ Summary: Free firewire audio driver library Name: libffado Version: 2.4.8 Release: %autorelease -License: GPLv2 or GPLv3 +# Automatically converted from old format: GPLv2 or GPLv3 - review is highly recommended. +License: GPL-2.0-only OR GPL-3.0-only URL: http://www.ffado.org/ Source0: http://www.ffado.org/files/%{name}-%{version}.tgz # The trunk is tarballed as follows: @@ -62,7 +63,8 @@ successor of the FreeBoB project. %package devel Summary: Free firewire audio driver library development headers -License: GPLv2 or GPLv3 +# Automatically converted from old format: GPLv2 or GPLv3 - review is highly recommended. +License: GPL-2.0-only OR GPL-3.0-only Requires: %{name}%{?_isa} = %{version}-%{release} %description devel @@ -73,7 +75,8 @@ Summary: Free firewire audio driver library applications and utilities # support/tools/* is GPLv3 # Some files in support/mixer-qt4/ffado are GPLv3+ # The rest is GPLv2 or GPLv3 -License: GPLv3 and GPLv3+ and (GPLv2 or GPLv3) +# Automatically converted from old format: GPLv3 and GPLv3+ and (GPLv2 or GPLv3) - review is highly recommended. +License: GPL-3.0-only AND GPL-3.0-or-later AND ( GPL-2.0-only OR GPL-3.0-only ) Requires: %{name}%{?_isa} = %{version}-%{release} Requires: dbus Requires: python3-dbus From 3a478acfa8dacb0f1b271792443a1d2ed92e86de Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Thu, 7 Nov 2024 22:43:26 +0100 Subject: [PATCH 55/63] Update to version 2.4.9 Signed-off-by: Nils Philippsen --- .gitignore | 1 + libffado-2.4.7-python312-imp-removal.patch | 69 ---------------------- libffado.spec | 4 +- sources | 2 +- 4 files changed, 3 insertions(+), 73 deletions(-) delete mode 100644 libffado-2.4.7-python312-imp-removal.patch diff --git a/.gitignore b/.gitignore index 57a89ef..ef73c7f 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ libffado-2.0.1-svn1864.tar.bz2 /libffado-2.4.6.tgz /libffado-2.4.7.tgz /libffado-2.4.8.tgz +/libffado-2.4.9.tgz diff --git a/libffado-2.4.7-python312-imp-removal.patch b/libffado-2.4.7-python312-imp-removal.patch deleted file mode 100644 index 3a5a4b9..0000000 --- a/libffado-2.4.7-python312-imp-removal.patch +++ /dev/null @@ -1,69 +0,0 @@ ---- libffado-2.4.7/admin/pyuic.py.orig 2023-07-13 15:54:22.683633139 +0900 -+++ libffado-2.4.7/admin/pyuic.py 2023-07-13 15:59:32.832327567 +0900 -@@ -21,7 +21,7 @@ - # along with this program. If not, see . - # - --import imp -+import importlib.util - - def pyuic_action( target, source, env ): - env.Execute( "pyuic " + str( source[0] ) + " > " + str( target[0] ) ) -@@ -34,8 +34,9 @@ - context.Message( "Checking for pyuic (by checking for the python module pyqtconfig) " ) - ret = True - try: -- imp.find_module( "pyqtconfig" ) -- except ImportError: -+ spec = importlib.util.find_spec( "pyqtconfig" ) -+ module = importlib.util.module_from_spec(spec) -+ except AttributeError: - ret = False - context.Result( ret ) - return ret ---- libffado-2.4.7/admin/pyuic4.py.orig 2023-07-13 15:54:22.683633139 +0900 -+++ libffado-2.4.7/admin/pyuic4.py 2023-07-13 15:58:59.688360220 +0900 -@@ -21,7 +21,7 @@ - # along with this program. If not, see . - # - --import imp -+import importlib.util - - def pyuic4_action( target, source, env ): - env.Execute( "pyuic4 " + str( source[0] ) + " > " + str( target[0] ) ) -@@ -34,8 +34,9 @@ - context.Message( "Checking for pyuic4 (by checking for the python module pyqtconfig) " ) - ret = True - try: -- imp.find_module( "pyqtconfig" ) -- except ImportError: -+ spec = importlib.util.find_spec( "pyqtconfig" ) -+ module = importlib.util.module_from_spec(spec) -+ except AttributeError: - ret = False - context.Result( ret ) - return ret ---- libffado-2.4.7/admin/pyuic5.py.orig 2023-07-13 15:54:22.683633139 +0900 -+++ libffado-2.4.7/admin/pyuic5.py 2023-07-13 15:59:27.754332570 +0900 -@@ -22,7 +22,7 @@ - # along with this program. If not, see . - # - --import imp -+import importlib.util - - def pyuic5_action( target, source, env ): - env.Execute( "pyuic5 " + str( source[0] ) + " > " + str( target[0] ) ) -@@ -35,8 +35,9 @@ - context.Message( "Checking for pyuic5 (by checking for the python module pyqtconfig) " ) - ret = True - try: -- imp.find_module( "pyqtconfig" ) -- except ImportError: -+ spec = importlib.util.find_spec( "pyqtconfig" ) -+ module = importlib.util.module_from_spec(spec) -+ except AttributeError: - ret = False - context.Result( ret ) - return ret diff --git a/libffado.spec b/libffado.spec index d961305..1087d10 100644 --- a/libffado.spec +++ b/libffado.spec @@ -12,7 +12,7 @@ Summary: Free firewire audio driver library Name: libffado -Version: 2.4.8 +Version: 2.4.9 Release: %autorelease # Automatically converted from old format: GPLv2 or GPLv3 - review is highly recommended. License: GPL-2.0-only OR GPL-3.0-only @@ -25,8 +25,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 -# Patch for Python 3.12 imp module removal -Patch3: libffado-2.4.7-python312-imp-removal.patch BuildRequires: alsa-lib-devel BuildRequires: dbus-c++-devel diff --git a/sources b/sources index e86f101..3364280 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libffado-2.4.8.tgz) = e891391ace53aa871d07ce244d38c5a3f1e622b6d289bb5ad5ed80255355cad14bc5dd36b6b54e9f3b2bd090b339c8688313204dbb8b391840941da0ef2abb94 +SHA512 (libffado-2.4.9.tgz) = 0a0c61cf9339ab542c85eaefbe017b7613f716ae0ed08d11a37782dd7ef5815b18256c5d1b9240f077c9f59bbf4b4878019cefbd6cab78140477bcad6a9d3e44 From c24716dc417ec04b352c675a552c9d520bff491b Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Thu, 7 Nov 2024 22:47:18 +0100 Subject: [PATCH 56/63] Accommodate changes in 2.4.9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Don’t attempt to apply removed patch - Don’t install XDG files manually [skip changelog] Signed-off-by: Nils Philippsen --- libffado.spec | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/libffado.spec b/libffado.spec index 1087d10..23bccc9 100644 --- a/libffado.spec +++ b/libffado.spec @@ -31,7 +31,6 @@ BuildRequires: dbus-c++-devel BuildRequires: dbus-devel BuildRequires: python3-dbus BuildRequires: python3-rpm-macros -BuildRequires: desktop-file-utils BuildRequires: doxygen BuildRequires: gcc-c++ BuildRequires: glibmm24-devel @@ -91,7 +90,6 @@ Applications and utilities for use with libffado. %if %{with scons_quirk} %patch -P2 -p1 -b .scons-quirk %endif -%patch -P3 -p1 -b .py312-imp-removal # Fix Python shebangs %py3_shebang_fix \ @@ -125,27 +123,11 @@ export LDFLAGS="%{build_ldflags}" %{scons} DESTDIR=%{buildroot} PREFIX=%{_prefix}\ install -# We need to install the xdg stuff manually -mkdir -p %{buildroot}%{_datadir}/applications -desktop-file-install --dir %{buildroot}%{_datadir}/applications \ - --add-category="Settings" \ - --set-icon=ffado \ - support/xdg/ffado.org-ffadomixer.desktop -mkdir -p %{buildroot}%{_datadir}/icons/hicolor/64x64/apps -ln -s ../../../../libffado/icons/hi64-apps-ffado.png \ - %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/ffado.png - # Install ffado-test RHBZ#805940 install -m 755 tests/ffado-test %{buildroot}%{_bindir} %ldconfig_scriptlets -%check -desktop-file-validate \ - %{buildroot}%{_datadir}/applications/ffado.org-ffadomixer.desktop -appstream-util validate-relax --nonet \ - %{buildroot}%{_datadir}/metainfo/ffado-mixer.appdata.xml - %files %license LICENSE.* %doc AUTHORS ChangeLog README @@ -167,9 +149,9 @@ appstream-util validate-relax --nonet \ %{_datadir}/libffado/*.xml %{_datadir}/libffado/icons/ %{_datadir}/dbus-1/services/org.ffado.Control.service -%{_datadir}/applications/ffado.org-ffadomixer.desktop -%{_datadir}/icons/hicolor/64x64/apps/ffado.png -%{_datadir}/metainfo/ffado-mixer.appdata.xml +%{_datadir}/applications/org.ffado.FfadoMixer.desktop +%{_datadir}/icons/hicolor/64x64/apps/hi64-apps-ffado.png +%{_datadir}/metainfo/org.ffado.FfadoMixer.metainfo.xml %{python3_sitelib}/ffado/ From 24eee8bfb7dc06b255605c07da8171e96a821342 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Fri, 8 Nov 2024 22:34:27 +0100 Subject: [PATCH 57/63] =?UTF-8?q?Don=E2=80=99t=20build=20with=20processor-?= =?UTF-8?q?specific=20optimizations?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nils Philippsen --- libffado.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libffado.spec b/libffado.spec index 23bccc9..9788072 100644 --- a/libffado.spec +++ b/libffado.spec @@ -104,7 +104,7 @@ export LDFLAGS="%{build_ldflags}" %{scons} %{?_smp_mflags} \ DETECT_USERSPACE_ENV=False \ ENABLE_SETBUFFERSIZE_API_VER=True \ - ENABLE_OPTIMIZATIONS=True \ + ENABLE_OPTIMIZATIONS=False \ CUSTOM_ENV=True \ BUILD_DOC=user \ PREFIX=%{_prefix} \ From b1f82a3ea67e37dcc378a5270990019196889f5b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 11:12:39 +0000 Subject: [PATCH 58/63] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 4a7176d9e7eeda9d6dfbf2d394e6b510b52285cb Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 15:50:52 +0200 Subject: [PATCH 59/63] Rebuilt for Python 3.14 From a2a04488934a5e8635d053518c370ac696755188 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 19:38:37 +0000 Subject: [PATCH 60/63] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From eb089fe7b1a1e67d0e6db89726a8a8f8affa37b7 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 12:55:46 +0200 Subject: [PATCH 61/63] Rebuilt for Python 3.14.0rc2 bytecode From 8d67b43f6076b4b8ad31b12b5048f3bedca7e736 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 12:26:22 +0200 Subject: [PATCH 62/63] Rebuilt for Python 3.14.0rc3 bytecode From 891493cc5efb780089131c9e8c55370619ba340d Mon Sep 17 00:00:00 2001 From: Tom spot Callaway Date: Wed, 17 Dec 2025 12:49:50 -0500 Subject: [PATCH 63/63] rebuild for new libconfig