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