From 088d7c9f3ba50da9949ac6e8961e83e0e9226e29 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sun, 18 Feb 2018 13:35:50 +0100
Subject: 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.
---
 pkgs/os-specific/linux/ffado/default.nix    | 10 +++-------
 pkgs/os-specific/linux/ffado/gcc6.patch     | 19 -------------------
 pkgs/os-specific/linux/ffado/glibc226.patch | 10 ----------
 3 files changed, 3 insertions(+), 36 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/ffado/gcc6.patch
 delete mode 100644 pkgs/os-specific/linux/ffado/glibc226.patch

diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix
index aa273ec613e..4e2d2b38841 100644
--- a/pkgs/os-specific/linux/ffado/default.nix
+++ b/pkgs/os-specific/linux/ffado/default.nix
@@ -25,11 +25,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "${prefix}ffado-${version}";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchurl {
     url = "http://www.ffado.org/files/libffado-${version}.tgz";
-    sha256 = "122z8gya60nyg47i738z2yr4qcjyk2xix4kwhf5ybkmp23kcgqqq";
+    sha256 = "14rprlcd0gpvg9kljh0zzjzd2rc9hbqqpjidshxxjvvfh4r00f4f";
   };
 
   nativeBuildInputs = [ scons pkgconfig which makeWrapper python ];
@@ -41,12 +41,8 @@ stdenv.mkDerivation rec {
     optXdg_utils libxmlxx glibmm
   ];
 
-  patches = [
-    ./gcc6.patch
-    ./glibc226.patch
-  ];
-
   postPatch = ''
+    sed '1iimport sys' -i SConstruct
     # 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
     sed '/def is_userspace_32bit(cpuinfo):/a\
diff --git a/pkgs/os-specific/linux/ffado/gcc6.patch b/pkgs/os-specific/linux/ffado/gcc6.patch
deleted file mode 100644
index f9cad9c88ab..00000000000
--- a/pkgs/os-specific/linux/ffado/gcc6.patch
+++ /dev/null
@@ -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>
- 
diff --git a/pkgs/os-specific/linux/ffado/glibc226.patch b/pkgs/os-specific/linux/ffado/glibc226.patch
deleted file mode 100644
index e147ee9aa76..00000000000
--- a/pkgs/os-specific/linux/ffado/glibc226.patch
+++ /dev/null
@@ -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
-- 
cgit 1.4.1