Fix FTBFS on F27
Backported fixes from trunk for various compilation warnings MIPS support RHBZ#1366701
This commit is contained in:
parent
dc79b126b9
commit
cd705915ef
12
libffado-MIPS.patch
Normal file
12
libffado-MIPS.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff -rupN libffado-2.3.0.org/SConstruct libffado-2.3.0/SConstruct
|
||||
--- libffado-2.3.0.org/SConstruct 2016-08-08 06:31:03.000000000 -0400
|
||||
+++ libffado-2.3.0/SConstruct 2017-08-10 21:56:15.358412952 -0400
|
||||
@@ -558,7 +558,7 @@ def cpuinfo_kv():
|
||||
for line in f:
|
||||
line = line.strip()
|
||||
if line:
|
||||
- k,v = line.split(':')
|
||||
+ k,v = line.split(':', 1)
|
||||
yield (k.strip(), v.strip())
|
||||
f.close()
|
||||
|
2208
libffado-diff-trunk-from-r2650-to-r2651.diff
Normal file
2208
libffado-diff-trunk-from-r2650-to-r2651.diff
Normal file
File diff suppressed because it is too large
Load Diff
1137
libffado-diff-trunk-from-r2690-to-r2691.diff
Normal file
1137
libffado-diff-trunk-from-r2690-to-r2691.diff
Normal file
File diff suppressed because it is too large
Load Diff
10
libffado-diff-trunk-from-r2705-to-r2706.diff
Normal file
10
libffado-diff-trunk-from-r2705-to-r2706.diff
Normal file
@ -0,0 +1,10 @@
|
||||
Index: trunk/libffado/src/libutil/PosixMessageQueue.cpp
|
||||
===================================================================
|
||||
--- trunk/libffado/src/libutil/PosixMessageQueue.cpp (revision 2171)
|
||||
+++ trunk/libffado/src/libutil/PosixMessageQueue.cpp (revision 2706)
|
||||
@@ -31,4 +31,5 @@
|
||||
#include <string.h>
|
||||
#include <poll.h>
|
||||
+#include <signal.h>
|
||||
|
||||
#define MQ_INVALID_ID ((mqd_t) -1)
|
11
libffado-diff-trunk-from-r2706-to-r2707.diff
Normal file
11
libffado-diff-trunk-from-r2706-to-r2707.diff
Normal file
@ -0,0 +1,11 @@
|
||||
Index: trunk/libffado/src/bebob/bebob_dl_mgr.cpp
|
||||
===================================================================
|
||||
--- trunk/libffado/src/bebob/bebob_dl_mgr.cpp (revision 2691)
|
||||
+++ trunk/libffado/src/bebob/bebob_dl_mgr.cpp (revision 2707)
|
||||
@@ -33,4 +33,6 @@
|
||||
|
||||
#include "libutil/ByteSwap.h"
|
||||
+
|
||||
+#include "ffadodevice.h"
|
||||
|
||||
#include <cstdio>
|
@ -1,7 +1,7 @@
|
||||
Summary: Free firewire audio driver library
|
||||
Name: libffado
|
||||
Version: 2.3.0
|
||||
Release: 5%{?dist}
|
||||
Release: 6%{?dist}
|
||||
# src/libutil/float_cast.h is LGPLv2+.
|
||||
# The rest is (GPLv2 or GPLv3)
|
||||
License: LGPLv2+ and (GPLv2 or GPLv3)
|
||||
@ -15,9 +15,23 @@ Source9: libffado-snapshot.sh
|
||||
# We want the documentation for the library API only, not for the entire source:
|
||||
# http://subversion.ffado.org/ticket/293
|
||||
Patch0: libffado-api-doc-only.patch
|
||||
Patch2: libffado-gcc6.patch
|
||||
Patch1: libffado-gcc6.patch
|
||||
# http://subversion.ffado.org/changeset/2673
|
||||
Patch3: libffado-derefptr.patch
|
||||
Patch2: libffado-derefptr.patch
|
||||
# Various backports from the trunk to fix compilation warnings/errors
|
||||
# C++11 missing space between literal and string macro
|
||||
# http://subversion.ffado.org/changeset/2651
|
||||
Patch3: libffado-diff-trunk-from-r2650-to-r2651.diff
|
||||
# std::auto_ptr deprecated
|
||||
# http://subversion.ffado.org/changeset/2691
|
||||
# http://subversion.ffado.org/changeset/2707
|
||||
Patch4: libffado-diff-trunk-from-r2690-to-r2691.diff
|
||||
Patch5: libffado-diff-trunk-from-r2706-to-r2707.diff
|
||||
# SIGEV_THREAD not declared
|
||||
# http://subversion.ffado.org/changeset/2706
|
||||
Patch6: libffado-diff-trunk-from-r2705-to-r2706.diff
|
||||
# MIPS support. RHBZ#1366701
|
||||
Patch7: libffado-MIPS.patch
|
||||
|
||||
BuildRequires: alsa-lib-devel
|
||||
BuildRequires: dbus-c++-devel
|
||||
@ -72,8 +86,13 @@ Applications and utilities for use with libffado.
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1 -b .api.doc.only
|
||||
%patch2 -p1 -b .gcc6
|
||||
%patch3 -p1 -b .derefptr
|
||||
%patch1 -p1 -b .gcc6
|
||||
%patch2 -p1 -b .derefptr
|
||||
%patch3 -p2 -b .string
|
||||
%patch4 -p2 -b .auto_ptr
|
||||
%patch5 -p2 -b .auto_ptr2
|
||||
%patch6 -p2 -b .signal_h
|
||||
%patch7 -p1 -b .MIPS
|
||||
|
||||
# We don't want to install all tests
|
||||
sed -i '/Install/d' tests/{,*/}SConscript
|
||||
@ -144,6 +163,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Aug 10 2017 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 2.3.0-6
|
||||
- Fix FTBFS on F27
|
||||
- Backported fixes from trunk for various compilation warnings
|
||||
- MIPS support RHBZ#1366701
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.0-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user