mwprocapture: 1.2.0.3269 -> 1.2.0.3589

remove linux 4.11 patch as it was included upstream, include
a new patch needed for linux 4.13

3 files changed, 15 insertions, 33 deletions

diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/pkgs/os-specific/linux/mwprocapture/default.nix
index bed40fd02e4d..544132cb284c 100644
--- a/pkgs/os-specific/linux/mwprocapture/default.nix
+++ b/pkgs/os-specific/linux/mwprocapture/default.nix
@@ -16,14 +16,14 @@ let
 in
 stdenv.mkDerivation rec {
   name = "mwprocapture-1.2.${version}-${kernel.version}";
-  version = "3269";
+  version = "3589";
 
   src = fetchurl {
     url = "http://www.magewell.com/files/ProCaptureForLinux_${version}.tar.gz";
-    sha256 = "0i1y50mf559flhxgaxy2gdpa7dvpp12ix9xfzgxa61rc135x0im4";
+    sha256 = "1arwnwrq52rs8g9zfxw8saip40vc3201sf7qnbqd2p23h8vzwb8i";
   };
 
-  patches = [ ./linux_4_11_include_fix.patch ];
+  patches = [ ./linux_4_13_fix.patch ];
 
   preConfigure =
   ''
diff --git a/pkgs/os-specific/linux/mwprocapture/linux_4_11_include_fix.patch b/pkgs/os-specific/linux/mwprocapture/linux_4_11_include_fix.patch
deleted file mode 100644
index 726efd9f537c..000000000000
--- a/pkgs/os-specific/linux/mwprocapture/linux_4_11_include_fix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Naur ProCaptureForLinux_3269/src/sources/avstream/capture.c ProCaptureForLinux_3269_new/src/sources/avstream/capture.c
---- ProCaptureForLinux_3269/src/sources/avstream/capture.c	2016-12-12 17:17:18.000000000 -0800
-+++ ProCaptureForLinux_3269_new/src/sources/avstream/capture.c	2017-05-02 23:58:28.270827491 -0700
-@@ -154,7 +154,9 @@
-     if (IS_ERR_OR_NULL(fp))
-         return IS_ERR(fp) ? PTR_ERR(fp) : -1;
-
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)
-+    ret = vfs_getattr(&fp->f_path, &stat, STATX_BASIC_STATS, AT_STATX_SYNC_AS_STAT);
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)
-     ret = vfs_getattr(&fp->f_path, &stat);
- #else
-     ret = vfs_getattr(fp->f_path.mnt, fp->f_path.dentry, &stat);
-diff -Naur ProCaptureForLinux_3269/src/sources/ospi/ospi-linux.c ProCaptureForLinux_3269_new/src/sources/ospi/ospi-linux.c
---- ProCaptureForLinux_3269/src/sources/ospi/ospi-linux.c	2016-12-12 17:17:18.000000000 -0800
-+++ ProCaptureForLinux_3269_new/src/sources/ospi/ospi-linux.c	2017-05-02 23:51:02.197633628 -0700
-@@ -21,6 +21,12 @@
- #include <linux/freezer.h>
- #include <linux/pci.h>
-
-+// some functions were moved from linux/sched.h out to their own headers in 4.11.x
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)
-+#include <linux/sched/signal.h>
-+#include <linux/sched/debug.h>
-+#endif
-+
- unsigned int debug_level = 0;
-
- struct kmem_cache *g_spin_cache = NULL;
diff --git a/pkgs/os-specific/linux/mwprocapture/linux_4_13_fix.patch b/pkgs/os-specific/linux/mwprocapture/linux_4_13_fix.patch
new file mode 100644
index 000000000000..925af61b49a0
--- /dev/null
+++ b/pkgs/os-specific/linux/mwprocapture/linux_4_13_fix.patch
@@ -0,0 +1,12 @@
+diff -Naur ProCaptureForLinux_3589/src/sources/ospi/ospi-linux.h ProCaptureForLinux_3589_new/src/sources/ospi/ospi-linux.h
+--- ProCaptureForLinux_3589/src/sources/ospi/ospi-linux.h	2017-08-17 02:46:07.000000000 -0700
++++ ProCaptureForLinux_3589_new/src/sources/ospi/ospi-linux.h	2017-09-03 18:13:31.843510536 -0700
+@@ -172,7 +172,7 @@
+ #else
+     struct completion       done;
+ #endif
+-    wait_queue_t            waitq; // for multi wait
++    wait_queue_entry_t      waitq; // for multi wait
+ };
+ typedef struct _os_event_t *os_event_t;
+