Compare commits
No commits in common. "0511a1f63969899c289bbade96297bfe0f2f28eb" and "691262355f5b8958eff4390ed94af0475f6e697f" have entirely different histories.
0511a1f639
...
691262355f
@ -1,27 +0,0 @@
|
|||||||
From 63dec85b326c8b0adde5b811e668117f236fc14c Mon Sep 17 00:00:00 2001
|
|
||||||
From: maminjie <maminjie1@huawei.com>
|
|
||||||
Date: Mon, 26 Oct 2020 09:11:24 +0800
|
|
||||||
Subject: [PATCH] fix TypeError: must be str or None, not bytes
|
|
||||||
|
|
||||||
---
|
|
||||||
SConstruct | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/SConstruct b/SConstruct
|
|
||||||
index 1468913..9b811cc 100644
|
|
||||||
--- a/SConstruct
|
|
||||||
+++ b/SConstruct
|
|
||||||
@@ -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
|
|
||||||
--
|
|
||||||
2.23.0
|
|
||||||
|
|
||||||
@ -1,41 +0,0 @@
|
|||||||
From a94776b22f0a50116c8c017a08e2a6e9646fd4f5 Mon Sep 17 00:00:00 2001
|
|
||||||
From: maminjie <maminjie1@huawei.com>
|
|
||||||
Date: Tue, 13 Oct 2020 20:15:41 +0800
|
|
||||||
Subject: [PATCH] fix the AttributeError: module 'posixpath' has no attribute
|
|
||||||
'walk'
|
|
||||||
|
|
||||||
---
|
|
||||||
support/mixer-qt4/SConscript | 16 ++++++----------
|
|
||||||
1 file changed, 6 insertions(+), 10 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/support/mixer-qt4/SConscript b/support/mixer-qt4/SConscript
|
|
||||||
index 1d57984..eebb8ca 100644
|
|
||||||
--- a/support/mixer-qt4/SConscript
|
|
||||||
+++ b/support/mixer-qt4/SConscript
|
|
||||||
@@ -28,17 +28,13 @@ Import( 'env' )
|
|
||||||
|
|
||||||
if env['BUILD_MIXER'] == 'true':
|
|
||||||
e = env.Clone()
|
|
||||||
-
|
|
||||||
- def findfiles( arg, dirname, names ):
|
|
||||||
- for name in names:
|
|
||||||
- if name.startswith("."):
|
|
||||||
- names.remove(name)
|
|
||||||
- for name in names:
|
|
||||||
- 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 )
|
|
||||||
+ for root, dirs, files in os.walk( "ffado" ):
|
|
||||||
+ for name in files:
|
|
||||||
+ if name.endswith( '.pyc' ) or '.in' in name or name.startswith("."):
|
|
||||||
+ continue
|
|
||||||
+ pythonfiles.append( os.path.join( root, name ) )
|
|
||||||
|
|
||||||
e.ScanReplace( "ffado/config.py.in" )
|
|
||||||
e.Depends( "ffado/config.py", "#/SConstruct" )
|
|
||||||
--
|
|
||||||
2.23.0
|
|
||||||
|
|
||||||
@ -1,6 +0,0 @@
|
|||||||
<constraints>
|
|
||||||
<linux><version>
|
|
||||||
<min>4.0</min>
|
|
||||||
</version></linux>
|
|
||||||
</constraints>
|
|
||||||
|
|
||||||
@ -5,23 +5,17 @@ export LDFLAGS="%{build_ldflags}"
|
|||||||
|
|
||||||
Name: libffado
|
Name: libffado
|
||||||
Version: 2.4.1
|
Version: 2.4.1
|
||||||
Release: 9
|
Release: 5
|
||||||
Summary: Free firewire audio driver library
|
Summary: Free firewire audio driver library
|
||||||
License: LGPLv2+ and GPLv2 and GPLv3 and GPLv3+
|
License: LGPLv2+ and GPLv2 and GPLv3 and GPLv3+
|
||||||
URL: http://www.ffado.org/
|
URL: http://www.ffado.org/
|
||||||
Source0: http://www.ffado.org/files/%{name}-%{version}.tgz
|
Source0: http://www.ffado.org/files/%{name}-%{version}.tgz
|
||||||
Source1: libffado-snapshot.sh
|
Source1: libffado-snapshot.sh
|
||||||
|
|
||||||
Patch0: 0001-fix-the-AttributeError-module-posixpath-has-no-attribute-walk.patch
|
BuildRequires: alsa-lib-devel dbus-c++-devel dbus-devel python2-dbus desktop-file-utils doxygen gcc-c++ glibmm24-devel
|
||||||
Patch1: 0001-fix-TypeError-must-be-str-or-None-not-bytes.patch
|
|
||||||
#update config.guess
|
|
||||||
#from:git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
|
|
||||||
Patch2: update_config_guess.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: graphviz libappstream-glib libconfig-devel libiec61883-devel libraw1394-devel libxml++-devel pkgconfig
|
||||||
BuildRequires: python3-qt5-devel python3-devel python3-enum34 python3-scons subversion
|
BuildRequires: python2-PyQt5-devel python2-devel python2-enum34 python2-scons subversion
|
||||||
Requires: udev dbus python3-dbus python3-qt5
|
Requires: udev dbus python2-dbus python2-qt5
|
||||||
|
|
||||||
Provides: ffado = %{version}-%{release}
|
Provides: ffado = %{version}-%{release}
|
||||||
Obsoletes: ffado < %{version}-%{release}
|
Obsoletes: ffado < %{version}-%{release}
|
||||||
@ -46,31 +40,22 @@ The libffado-help package conatins manual pages for libffado.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1
|
%autosetup -p1
|
||||||
%ifarch loongarch64 sw_64
|
|
||||||
%_update_config_guess
|
|
||||||
%_update_config_sub
|
|
||||||
%endif
|
|
||||||
|
|
||||||
sed -i '/Install/d' tests/{,*/}SConscript
|
sed -i '/Install/d' tests/{,*/}SConscript
|
||||||
%ifarch riscv64
|
|
||||||
# Bugs #658052
|
|
||||||
# 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|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 \
|
sed -i 's|/usr/bin/.*python$|/usr/bin/python2|' admin/*.py doc/SConscript tests/python/*.py tests/*.py \
|
||||||
support/mixer-qt4/ffado-mixer* support/mixer-qt4/SConscript support/tools/*.py support/tools/SConscript
|
support/mixer-qt4/ffado-mixer* support/mixer-qt4/SConscript support/tools/*.py support/tools/SConscript
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%{_export_PLAGS}
|
%{_export_PLAGS}
|
||||||
scons-3 %{?_smp_mflags} \
|
scons %{?_smp_mflags} \
|
||||||
ENABLE_SETBUFFERSIZE_API_VER=True ENABLE_OPTIMIZATIONS=True CUSTOM_ENV=True BUILD_DOC=user \
|
ENABLE_SETBUFFERSIZE_API_VER=True ENABLE_OPTIMIZATIONS=True CUSTOM_ENV=True BUILD_DOC=user \
|
||||||
PREFIX=%{_prefix} LIBDIR=%{_libdir} MANDIR=%{_mandir} UDEVDIR=%{_prefix}/lib/udev/rules.d/ \
|
PREFIX=%{_prefix} LIBDIR=%{_libdir} MANDIR=%{_mandir} UDEVDIR=%{_prefix}/lib/udev/rules.d/ \
|
||||||
PYPKGDIR=%{python3_sitelib}/ffado/ PYTHON_INTERPRETER=/usr/bin/python3 BUILD_TESTS=1
|
PYPKGDIR=%{python_sitelib}/ffado/ PYTHON_INTERPRETER=/usr/bin/python2 BUILD_TESTS=1
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%{_export_PLAGS}
|
%{_export_PLAGS}
|
||||||
scons-3 DESTDIR=%{buildroot} install
|
scons DESTDIR=%{buildroot} install
|
||||||
|
|
||||||
install -d %{buildroot}%{_datadir}/applications
|
install -d %{buildroot}%{_datadir}/applications
|
||||||
desktop-file-install --dir %{buildroot}%{_datadir}/applications --add-category="Settings" --set-icon=ffado support/xdg/ffado.org-ffadomixer.desktop
|
desktop-file-install --dir %{buildroot}%{_datadir}/applications --add-category="Settings" --set-icon=ffado support/xdg/ffado.org-ffadomixer.desktop
|
||||||
@ -101,7 +86,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/ffado-mi
|
|||||||
%{_datadir}/applications/ffado.org-ffadomixer.desktop
|
%{_datadir}/applications/ffado.org-ffadomixer.desktop
|
||||||
%{_datadir}/icons/hicolor/64x64/apps/ffado.png
|
%{_datadir}/icons/hicolor/64x64/apps/ffado.png
|
||||||
%{_datadir}/metainfo/ffado-mixer.appdata.xml
|
%{_datadir}/metainfo/ffado-mixer.appdata.xml
|
||||||
%{python3_sitelib}/ffado/
|
%{python_sitelib}/ffado/
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%doc doc/reference/html/
|
%doc doc/reference/html/
|
||||||
@ -114,17 +99,5 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/ffado-mi
|
|||||||
%{_mandir}/man1/ffado-*.1*
|
%{_mandir}/man1/ffado-*.1*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Fri Feb 28 2025 mahailiang <mahailiang@uniontech.com> - 2.4.1-9
|
|
||||||
- update config.guess and config.sub for sw_64
|
|
||||||
|
|
||||||
* Thu Mar 16 2023 Wenlong Zhang<zhangwenlong@loongson.cn> - 2.4.1-8
|
|
||||||
- update config.guess and config.sub for loongarch64
|
|
||||||
|
|
||||||
* Fri Jan 07 2022 lvxiaoqian <xiaoqian@nj.iscas.ac.cn> - 2.4.1-7
|
|
||||||
- update for riscv
|
|
||||||
|
|
||||||
* Tue Oct 13 2020 maminjie <maminjie1@huawei.com> - 2.4.1-6
|
|
||||||
- Rebuilt for python3
|
|
||||||
|
|
||||||
* Tue Dec 03 2019 liujing<liujing144@huawei.com> - 2.4.1-5
|
* Tue Dec 03 2019 liujing<liujing144@huawei.com> - 2.4.1-5
|
||||||
- Package init
|
- Package init
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user