libffado: 2.3.0 -> 2.4.0 (maintenance)
http://ffado.org/?q=node/3379 This fixes build with gcc7. The removed patches are inside now.
This commit is contained in:
parent
9a2914a4f3
commit
088d7c9f3b
|
@ -25,11 +25,11 @@ let
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "${prefix}ffado-${version}";
|
name = "${prefix}ffado-${version}";
|
||||||
version = "2.3.0";
|
version = "2.4.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://www.ffado.org/files/libffado-${version}.tgz";
|
url = "http://www.ffado.org/files/libffado-${version}.tgz";
|
||||||
sha256 = "122z8gya60nyg47i738z2yr4qcjyk2xix4kwhf5ybkmp23kcgqqq";
|
sha256 = "14rprlcd0gpvg9kljh0zzjzd2rc9hbqqpjidshxxjvvfh4r00f4f";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ scons pkgconfig which makeWrapper python ];
|
nativeBuildInputs = [ scons pkgconfig which makeWrapper python ];
|
||||||
|
@ -41,12 +41,8 @@ stdenv.mkDerivation rec {
|
||||||
optXdg_utils libxmlxx glibmm
|
optXdg_utils libxmlxx glibmm
|
||||||
];
|
];
|
||||||
|
|
||||||
patches = [
|
|
||||||
./gcc6.patch
|
|
||||||
./glibc226.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
sed '1iimport sys' -i SConstruct
|
||||||
# SConstruct checks cpuinfo and an objdump of /bin/mount to determine the appropriate arch
|
# SConstruct checks cpuinfo and an objdump of /bin/mount to determine the appropriate arch
|
||||||
# Let's just skip this and tell it which to build
|
# Let's just skip this and tell it which to build
|
||||||
sed '/def is_userspace_32bit(cpuinfo):/a\
|
sed '/def is_userspace_32bit(cpuinfo):/a\
|
||||||
|
|
|
@ -1,19 +0,0 @@
|
||||||
Author: Adrian Knoth <adi@drcomp.erfurt.thur.de>
|
|
||||||
Forwarded: Yes
|
|
||||||
Applied-Upstream: 2.3.1
|
|
||||||
Last-Update: 2016-08-11
|
|
||||||
Description: Fix FTBFS with gcc6
|
|
||||||
|
|
||||||
Index: b/src/ffadotypes.h
|
|
||||||
===================================================================
|
|
||||||
--- a/src/ffadotypes.h
|
|
||||||
+++ b/src/ffadotypes.h
|
|
||||||
@@ -51,6 +51,8 @@ struct ffado_handle {
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
+#include <cmath>
|
|
||||||
+#include <algorithm>
|
|
||||||
#include <vector>
|
|
||||||
#include <string>
|
|
||||||
|
|
|
@ -1,10 +0,0 @@
|
||||||
--- libffado/src/libutil/PosixMessageQueue.cpp (revision 2705)
|
|
||||||
+++ libffado/src/libutil/PosixMessageQueue.cpp (revision 2706)
|
|
||||||
@@ -30,6 +30,7 @@
|
|
||||||
#include <errno.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <poll.h>
|
|
||||||
+#include <signal.h>
|
|
||||||
|
|
||||||
#define MQ_INVALID_ID ((mqd_t) -1)
|
|
||||||
// one second
|
|
Loading…
Reference in New Issue