From f6ae14f3e142715e167adff998a6cb1c87b5c133 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 16 Jun 2023 17:30:07 +0200 Subject: [PATCH 01/22] 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 02/22] 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 03/22] 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 04/22] 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 05/22] 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 06/22] 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 07/22] 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 08/22] 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 09/22] 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 10/22] 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 11/22] 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 12/22] 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 13/22] 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 14/22] 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 15/22] 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 16/22] =?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 17/22] 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 18/22] 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 19/22] 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 20/22] 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 21/22] 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 22/22] rebuild for new libconfig