v4l2loopback: update 0.8.0 -> 0.9.1

This commit is contained in:
Nathaniel Baxter 2015-07-25 11:58:54 +10:00
parent 161c0e7876
commit 6bff6eec67
2 changed files with 2 additions and 35 deletions

View File

@ -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 = [

View File

@ -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)