diff options
| author | Nathaniel Baxter <nathaniel.baxter@gmail.com> | 2015-07-25 11:58:54 +1000 |
|---|---|---|
| committer | Nathaniel Baxter <nathaniel.baxter@gmail.com> | 2015-07-25 11:59:09 +1000 |
| commit | 6bff6eec672c36357fe5bff528dcf934a24518e0 (patch) | |
| tree | c9ad213bd1535e9b059b8060ebc5d4da55ea4fe7 /pkgs/os-specific/linux/v4l2loopback | |
| parent | 161c0e7876aea932b5344a578b65e412490c3822 (diff) | |
| download | nixlib-6bff6eec672c36357fe5bff528dcf934a24518e0.tar nixlib-6bff6eec672c36357fe5bff528dcf934a24518e0.tar.gz nixlib-6bff6eec672c36357fe5bff528dcf934a24518e0.tar.bz2 nixlib-6bff6eec672c36357fe5bff528dcf934a24518e0.tar.lz nixlib-6bff6eec672c36357fe5bff528dcf934a24518e0.tar.xz nixlib-6bff6eec672c36357fe5bff528dcf934a24518e0.tar.zst nixlib-6bff6eec672c36357fe5bff528dcf934a24518e0.zip | |
v4l2loopback: update 0.8.0 -> 0.9.1
Diffstat (limited to 'pkgs/os-specific/linux/v4l2loopback')
| -rw-r--r-- | pkgs/os-specific/linux/v4l2loopback/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/v4l2loopback/kernel-3.18-fix.patch | 31 |
2 files changed, 2 insertions, 35 deletions
diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix index 127341412abe..13617360d2d4 100644 --- a/pkgs/os-specific/linux/v4l2loopback/default.nix +++ b/pkgs/os-specific/linux/v4l2loopback/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "v4l2loopback-${version}-${kernel.version}"; - version = "0.8.0"; + version = "0.9.1"; src = fetchurl { url = "https://github.com/umlaeute/v4l2loopback/archive/v${version}.tar.gz"; - sha256 = "1rhsgc4prrj8s6njixic7fs5m3gs94v9hhf3am6lnfh5yv6yab9h"; + sha256 = "1crkhxlnskqrfj3f7jmiiyi5m75zmj7n0s26xz07wcwdzdf2p568"; }; preBuild = '' @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { export PATH=${kmod}/sbin:$PATH ''; - patches = [ ./kernel-3.18-fix.patch ]; - buildInputs = [ kmod ]; makeFlags = [ diff --git a/pkgs/os-specific/linux/v4l2loopback/kernel-3.18-fix.patch b/pkgs/os-specific/linux/v4l2loopback/kernel-3.18-fix.patch deleted file mode 100644 index 9f6dc57f322a..000000000000 --- a/pkgs/os-specific/linux/v4l2loopback/kernel-3.18-fix.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 21195cd6d1ff767a271359dfa7d201078f766611 Mon Sep 17 00:00:00 2001 -From: tatokis <tasos@tasossah.com> -Date: Mon, 24 Nov 2014 16:28:33 +0200 -Subject: [PATCH] Updated v4l2loopback.c to compile on >= 3.18 kernel - ---- - v4l2loopback.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/v4l2loopback.c b/v4l2loopback.c -index bb228bb..67f6ed4 100644 ---- a/v4l2loopback.c -+++ b/v4l2loopback.c -@@ -498,10 +498,15 @@ static ssize_t attr_store_maxopeners(struct device *cd, - { - struct v4l2_loopback_device *dev = NULL; - unsigned long curr = 0; -- -+ -+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0) -+ if (kstrtoul(buf, 0, &curr)) -+ return -EINVAL; -+ #else - if (strict_strtoul(buf, 0, &curr)) - return -EINVAL; -- -+ #endif -+ - dev = v4l2loopback_cd2dev(cd); - - if (dev->max_openers == curr) |