diff --git a/libffado-2.0.1-gcc-4.7.patch b/libffado-2.0.1-gcc-4.7.patch deleted file mode 100644 index 968b579..0000000 --- a/libffado-2.0.1-gcc-4.7.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff -Naur libffado-2.0.1-old/src/bebob/bebob_dl_mgr.cpp libffado-2.0.1/src/bebob/bebob_dl_mgr.cpp ---- libffado-2.0.1-old/src/bebob/bebob_dl_mgr.cpp 2009-05-17 23:42:38.000000000 +1000 -+++ libffado-2.0.1/src/bebob/bebob_dl_mgr.cpp 2012-04-29 15:26:29.011454798 +1000 -@@ -35,6 +35,7 @@ - - #include - #include -+#include - - namespace BeBoB { - enum { -diff -Naur libffado-2.0.1-old/src/ffadodevice.cpp libffado-2.0.1/src/ffadodevice.cpp ---- libffado-2.0.1-old/src/ffadodevice.cpp 2008-11-23 21:25:32.000000000 +1000 -+++ libffado-2.0.1/src/ffadodevice.cpp 2012-04-29 15:26:54.883998052 +1000 -@@ -34,6 +34,7 @@ - - #include - #include -+#include - - #include - -diff -Naur libffado-2.0.1-old/src/fireworks/fireworks_device.cpp libffado-2.0.1/src/fireworks/fireworks_device.cpp ---- libffado-2.0.1-old/src/fireworks/fireworks_device.cpp 2009-11-23 00:40:08.000000000 +1000 -+++ libffado-2.0.1/src/fireworks/fireworks_device.cpp 2012-04-29 15:27:24.123105334 +1000 -@@ -44,6 +44,7 @@ - #define FIREWORKS_MIN_FIRMWARE_VERSION 0x04080000 - - #include -+#include - using namespace std; - - // FireWorks is the platform used and developed by ECHO AUDIO -diff -Naur libffado-2.0.1-old/src/libieee1394/IsoHandlerManager.cpp libffado-2.0.1/src/libieee1394/IsoHandlerManager.cpp ---- libffado-2.0.1-old/src/libieee1394/IsoHandlerManager.cpp 2010-04-18 05:15:54.000000000 +1000 -+++ libffado-2.0.1/src/libieee1394/IsoHandlerManager.cpp 2012-04-29 15:27:44.515816147 +1000 -@@ -34,6 +34,7 @@ - #include "libutil/Configuration.h" - - #include -+#include - #include - - IMPL_DEBUG_MODULE( IsoHandlerManager, IsoHandlerManager, DEBUG_LEVEL_NORMAL ); -diff -Naur libffado-2.0.1-old/support/dbus/test-dbus.cpp libffado-2.0.1/support/dbus/test-dbus.cpp ---- libffado-2.0.1-old/support/dbus/test-dbus.cpp 2008-04-27 03:30:41.000000000 +1000 -+++ libffado-2.0.1/support/dbus/test-dbus.cpp 2012-04-29 15:28:31.531047923 +1000 -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - #include - - #include "controlclient.h" ---- libffado-2.1.0.old/src/libutil/PosixSharedMemory.cpp 2008-05-15 00:38:31.000000000 -0400 -+++ libffado-2.1.0/src/libutil/PosixSharedMemory.cpp 2012-01-10 23:30:49.767652458 -0500 -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - #include - - namespace Util { diff --git a/libffado-libconfig145.patch b/libffado-libconfig145.patch deleted file mode 100644 index a05e300..0000000 --- a/libffado-libconfig145.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- libffado.old/src/libutil/Configuration.cpp 2010-06-19 14:31:27.000000000 -0400 -+++ libffado/src/libutil/Configuration.cpp 2010-07-14 01:37:57.000000000 -0400 -@@ -333,7 +333,8 @@ Configuration::getValueForDeviceSetting( - libconfig::Setting *s = getDeviceSetting( vendor_id, model_id ); - if(s) { - try { -- return s->lookupValue(setting, ref); -+ long long int refverylong = ref; -+ return s->lookupValue(setting, refverylong); - } catch (...) { - debugOutput(DEBUG_LEVEL_VERBOSE, "Setting %s not found\n", setting.c_str()); - return false; diff --git a/libffado-python26.patch b/libffado-python26.patch deleted file mode 100644 index 6f7c4e1..0000000 --- a/libffado-python26.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- SConstruct 2010-10-02 16:37:58.000000000 +0200 -+++ SConstruct-gil 2010-10-02 16:45:52.000000000 +0200 -@@ -129,7 +129,7 @@ - - def CheckForPyModule( context, module ): - context.Message( "Checking for the python module '" + module + "' " ) -- ret = context.TryAction( "python $SOURCE", "import %s" % module, ".py" ) -+ ret = context.TryAction( "python2.6 $SOURCE", "import %s" % module, ".py" ) - context.Result( ret[0] ) - return ret[0] - diff --git a/libffado.spec b/libffado.spec index 802c14b..92570f6 100644 --- a/libffado.spec +++ b/libffado.spec @@ -1,6 +1,6 @@ Name: libffado -Version: 2.4.7 -Release: 2mamba +Version: 2.4.8 +Release: 1mamba Summary: Free Firewire Audio Drivers Library Group: System/Libraries Vendor: openmamba @@ -9,9 +9,6 @@ Packager: Silvan Calarco URL: http://ffado.org/ Source0: http://www.ffado.org/files/libffado-%{version}.tgz Source1: README.ffado -Patch4: libffado-libconfig145.patch -Patch5: libffado-python26.patch -Patch6: libffado-2.0.1-gcc-4.7.patch License: GPL, LGPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -77,25 +74,16 @@ This package contains the ffado mixer GUI. %prep %setup -q -#%patch4 -p1 cp -a %{SOURCE1} . -#sed -i '1s|#!/usr/bin/python|#!%{__python}|' support/mixer-qt4/ffado-mixer.in -#sed -i '1s|#!/usr/bin/python|#!%{__python}|' support/mixer-qt4/ffado-mixer-profiler.in -#sed -i '1s|#!/usr/bin/python|#!%{__python}|' support/tools/ffado-diag.in -#sed -i '1s|#!/usr/bin/python|#!%{__python}|' support/tools/ffado-diag-static - -#for s in $(find . -name "*~"); do -# rm -rf $s -#done - # fix icon name, so it's coherent with XDG desktop file name -sed -e 's/hi64-apps-ffado/ffado-mixer/g' -i support/xdg/ffado.org-ffadomixer.desktop +sed -e 's/hi64-apps-ffado/ffado-mixer/g' -i libffado/support/xdg/ffado.org-ffadomixer.desktop # fix id, so it's coherent with XDG desktop file name -sed -e 's/ffado.org-ffadomixer.desktop/ffado-mixer.desktop/g' -i support/xdg/ffado-mixer.appdata.xml +sed -e 's/ffado.org-ffadomixer.desktop/ffado-mixer.desktop/g' -i libffado/support/xdg/ffado-mixer.appdata.xml %build +cd libffado export CFLAGS="%{optflags} -ffast-math" export CXXFLAGS="%{optflags} -ffast-math --std=gnu++11" @@ -116,7 +104,7 @@ scons %{?_smp_mflags} \ %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" - +cd libffado scons DESTDIR=%{buildroot} WILL_DEAL_WITH_XDG_MYSELF=True install mkdir -p %{buildroot}%{_datadir}/applications @@ -149,7 +137,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_libdir}/libffado.so.* %dir %{_datadir}/libffado %{_datadir}/libffado/configuration -%doc AUTHORS LICENSE.* +%doc libffado/AUTHORS libffado/LICENSE.* %files devel %defattr(-,root,root) @@ -158,7 +146,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_libdir}/libffado/static_info.txt %{_libdir}/libffado.so %{_libdir}/pkgconfig/libffado.pc -%doc ChangeLog README README.ffado +%doc libffado/ChangeLog libffado/README %files -n ffado %defattr(-,root,root) @@ -190,6 +178,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/64x64/apps/ffado-mixer.png %changelog +* Tue Jan 09 2024 Automatic Build System 2.4.8-1mamba +- automatic version update by autodist + * Mon Oct 16 2023 Silvan Calarco 2.4.7-2mamba - rebuilt with python3 == 3.11