From 47669adf2a8b8f42245ef0629c515178f2700783 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Thu, 10 Apr 2025 19:06:55 +0800 Subject: [PATCH] split out ffado for loosen dependencies --- libffado-2.4.4-icon-name.patch | 12 ++++++ libffado.spec | 73 +++++++++++++++++++--------------- 2 files changed, 52 insertions(+), 33 deletions(-) create mode 100644 libffado-2.4.4-icon-name.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.spec b/libffado.spec index f9e974d..6d19d5c 100644 --- a/libffado.spec +++ b/libffado.spec @@ -5,21 +5,19 @@ export LDFLAGS="%{build_ldflags}" Name: libffado Version: 2.4.9 -Release: 3 +Release: 4 Summary: Free firewire audio driver library -License: LGPLv2+ and GPLv2 and GPLv3 and GPLv3+ -URL: http://www.ffado.org/ -Source0: http://www.ffado.org/files/%{name}-%{version}.tgz +License: GPL-2.0-only OR GPL-3.0-only +URL: https://www.ffado.org/ +Source0: https://www.ffado.org/files/%{name}-%{version}.tgz Source1: libffado-snapshot.sh +Patch1: libffado-2.4.4-icon-name.patch + BuildRequires: alsa-lib-devel dbus-c++-devel dbus-devel python3-dbus desktop-file-utils doxygen gcc-c++ glibmm24-devel BuildRequires: graphviz libappstream-glib libconfig-devel libiec61883-devel libraw1394-devel libxml++-devel pkgconfig BuildRequires: python3-qt5-devel python3-devel python3-enum34 python3-scons subversion -Requires: udev dbus python3-dbus python3-qt5 - -Provides: ffado = %{version}-%{release} -Obsoletes: ffado < %{version}-%{release} %description The FFADO project aims to provide a universal open source solution for Linux-based FireWire-based audio device support. @@ -27,17 +25,28 @@ It is the successor to the FreeBoB project. %package devel Summary: Free firewire audio driver library development headers -License: GPLv2 and GPLv3 Requires: %{name} = %{version}-%{release} %description devel The libffado-devel package conatins development files to build applications for libffado. -%package help -Summary: Help documents for libffado +%package -n ffado +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 +# 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 +Requires: python3-qt5 +Conflicts: libffado%{?_isa} < 2.4.9-4 + +%description -n ffado +Applications and utilities for use with libffado. -%description help -The libffado-help package conatins manual pages for libffado. +%package_help %prep %autosetup -p1 @@ -52,7 +61,6 @@ sed -i '/Install/d' tests/{,*/}SConscript # https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5400bbb794231bb0b77f070229af2f3d95632323 sed -i -e 's/^CacheDir/#CacheDir/' SConstruct %endif -sed -i 's|hi64-apps-ffado.png|ffado.png|' support/mixer-qt4/ffado/ffadowindow.py 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 @@ -69,35 +77,21 @@ scons DESTDIR=%{buildroot} install install -d %{buildroot}%{_datadir}/applications desktop-file-install --dir %{buildroot}%{_datadir}/applications --add-category="Settings" --set-icon=ffado support/xdg/org.ffado.FfadoMixer.desktop -install -d %{buildroot}%{_datadir}/icons/hicolor/64x64/apps -ln -s ../../../../libffado/icons/hi64-apps-ffado.png %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/ffado.png install -m 755 tests/ffado-test %{buildroot}%{_bindir} -%post -/sbin/ldconfig - -%postun -/sbin/ldconfig - %check desktop-file-validate %{buildroot}%{_datadir}/applications/org.ffado.FfadoMixer.desktop appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.ffado.FfadoMixer.metainfo.xml %files -%doc LICENSE.* -%dir %{_datadir}/libffado/ -%{_bindir}/* +%license LICENSE.* +%doc AUTHORS ChangeLog README %{_libdir}/libffado.so.* -%{_libdir}/libffado/static_info.txt -%{_datadir}/libffado/* +%dir %{_datadir}/libffado/ +%{_datadir}/libffado/configuration %{_prefix}/lib/udev/rules.d/* -%{_datadir}/dbus-1/services/org.ffado.Control.service -%{_datadir}/applications/org.ffado.FfadoMixer.desktop -%{_datadir}/icons/hicolor/64x64/apps/ffado.png -%{_datadir}/icons/hicolor/64x64/apps/hi64-apps-ffado.png -%{_datadir}/metainfo/org.ffado.FfadoMixer.metainfo.xml -%{python3_sitelib}/ffado/ +%{_libdir}/libffado %files devel %doc doc/reference/html/ @@ -105,11 +99,24 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.ffad %{_libdir}/pkgconfig/libffado.pc %{_libdir}/libffado.so +%files -n ffado +%{_bindir}/* +%{_datadir}/libffado/*.xml +%{_datadir}/libffado/icons/ +%{_datadir}/dbus-1/services/org.ffado.Control.service +%{_datadir}/applications/org.ffado.FfadoMixer.desktop +%{_datadir}/icons/hicolor/64x64/apps/*.png +%{_datadir}/metainfo/org.ffado.FfadoMixer.metainfo.xml +%{python3_sitelib}/ffado/ + %files help %doc AUTHORS ChangeLog README %{_mandir}/man1/ffado-*.1* %changelog +* Thu Apr 10 2025 Funda Wang - 2.4.9-4 +- split out ffado for loosen dependencies + * Thu Mar 06 2025 mahailiang - 2.4.9-3 - update config.guess and config.sub for sw_64 -- Gitee