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