lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

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.

+3 -36
+3 -7
pkgs/os-specific/linux/ffado/default.nix
··· 25 25 in 26 26 stdenv.mkDerivation rec { 27 27 name = "${prefix}ffado-${version}"; 28 - version = "2.3.0"; 28 + version = "2.4.0"; 29 29 30 30 src = fetchurl { 31 31 url = "http://www.ffado.org/files/libffado-${version}.tgz"; 32 - sha256 = "122z8gya60nyg47i738z2yr4qcjyk2xix4kwhf5ybkmp23kcgqqq"; 32 + sha256 = "14rprlcd0gpvg9kljh0zzjzd2rc9hbqqpjidshxxjvvfh4r00f4f"; 33 33 }; 34 34 35 35 nativeBuildInputs = [ scons pkgconfig which makeWrapper python ]; ··· 41 41 optXdg_utils libxmlxx glibmm 42 42 ]; 43 43 44 - patches = [ 45 - ./gcc6.patch 46 - ./glibc226.patch 47 - ]; 48 - 49 44 postPatch = '' 45 + sed '1iimport sys' -i SConstruct 50 46 # SConstruct checks cpuinfo and an objdump of /bin/mount to determine the appropriate arch 51 47 # Let's just skip this and tell it which to build 52 48 sed '/def is_userspace_32bit(cpuinfo):/a\
-19
pkgs/os-specific/linux/ffado/gcc6.patch
··· 1 - Author: Adrian Knoth <adi@drcomp.erfurt.thur.de> 2 - Forwarded: Yes 3 - Applied-Upstream: 2.3.1 4 - Last-Update: 2016-08-11 5 - Description: Fix FTBFS with gcc6 6 - 7 - Index: b/src/ffadotypes.h 8 - =================================================================== 9 - --- a/src/ffadotypes.h 10 - +++ b/src/ffadotypes.h 11 - @@ -51,6 +51,8 @@ struct ffado_handle { 12 - }; 13 - 14 - 15 - +#include <cmath> 16 - +#include <algorithm> 17 - #include <vector> 18 - #include <string> 19 -
-10
pkgs/os-specific/linux/ffado/glibc226.patch
··· 1 - --- libffado/src/libutil/PosixMessageQueue.cpp (revision 2705) 2 - +++ libffado/src/libutil/PosixMessageQueue.cpp (revision 2706) 3 - @@ -30,6 +30,7 @@ 4 - #include <errno.h> 5 - #include <string.h> 6 - #include <poll.h> 7 - +#include <signal.h> 8 - 9 - #define MQ_INVALID_ID ((mqd_t) -1) 10 - // one second