[media-video/webcamstudio-module] Use newer module based on v4l2loopback; drop old.

5 files changed, 193 insertions, 231 deletions

diff --git a/media-video/webcamstudio-module/ChangeLog b/media-video/webcamstudio-module/ChangeLog
index 3ea299b..3902794 100644
--- a/media-video/webcamstudio-module/ChangeLog
+++ b/media-video/webcamstudio-module/ChangeLog
@@ -1,7 +1,15 @@
 # ChangeLog for media-video/webcamstudio-module
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*webcamstudio-module-0.8.0 (09 Nov 2014)
+
+  09 Nov 2014; Dustin Polke <DuPol@gmx.de> -webcamstudio-module-0.6.3.ebuild,
+  +webcamstudio-module-0.8.0.ebuild,
+  -files/webcamstudio-module-0.6.3-webcamstudio.patch,
+  +files/webcamstudio-module-0.8.0-webcamstudio.patch:
+  Use newer kernel module based on v4l2loopback-0.8.0. Drop old.
+
 *webcamstudio-module-0.6.3 (01 Apr 2013)
 
   01 Apr 2013; Dustin Polke <DuPol@gmx.de> +webcamstudio-module-0.6.3.ebuild,
diff --git a/media-video/webcamstudio-module/Manifest b/media-video/webcamstudio-module/Manifest
index 0874458..ff60b8d 100644
--- a/media-video/webcamstudio-module/Manifest
+++ b/media-video/webcamstudio-module/Manifest
@@ -1,5 +1 @@
-AUX webcamstudio-module-0.6.3-webcamstudio.patch 8955 SHA256 ab4067f7ce8f4f8624bbbd0347bddbd8e95221e3c6c02baceaf3c7655690bfea SHA512 703e820a6c5e15b46f91f343f95a191b4ddd3019eb3e1c2c49aca5e9d15d33b467d70bda26e5c6301a28079336810d7f0e1271abc60323a14497a7baac28e5da WHIRLPOOL 9f065603e9afd134c2cb5ba4d34b58648bdb6d3724876628ef54114c7fd8cbcb1e26dc5610fa5cc79fc3f5d11e26e56fefedd5d09a971820059c0325fa86f8ba
-DIST webcamstudio-module-0.6.3.tar.gz 208243 SHA256 92e63637a4722bb75c666ffb295b53becb304ccf3818d995a93c9db44395ac43 SHA512 a633b49e7f16a167f36821e083155fe91c1924bbd1b9ded73e895d4ce43c2e175cbd4e0646129b73c27fede8a1ae4451c62e3b182b936c8d60b36b146a57487e WHIRLPOOL e70b0508e75f6367a799cc1d874e8864d4db8fa85666fc040977e60023632696860673d0d02c0fe7e211e1d05a8a9405915db6fa7015c380b0516e666a0212fc
-EBUILD webcamstudio-module-0.6.3.ebuild 1065 SHA256 b685f4622b0c402e07b5c7179ec877b86bef1524eab4361218342b555dc8c02e SHA512 3107d8196316585356c8baabc79caeca25a96327d2bdca01756cf4f543ff7fec92636525be3132c1e8aec703ea87d443c82f8512c2377fd54586cc350bd0432f WHIRLPOOL 5b19fcb74769280eb6d9943618944c464a19bf51074ba9d7c54a307c0aaaa9bb8b59c9eb1f47b561ebf11ca86fc34c75d01cb5628ea45d954bb65313bcc5957d
-MISC ChangeLog 974 SHA256 b933349b273bb699481654a6176fd588b718176872cb70bcd511af6bd93be9af SHA512 46674fdfe99e501a14058b410cf788320b8adeea5a201124b0a1e14099bff0c0da67d3cdefcd887285beefdeaff28cd68b898b85dd7feb99f646c34995215d79 WHIRLPOOL 620f0683ab20ab602a6a94bb284374f5b39aa15d8f55d2f110711fc111dbc3cd0698fa7cd999d87fda28c6a076bb9ef48785f5e4d94d74b026f4672b88d67d94
-MISC metadata.xml 202 SHA256 898b32b6414d22f4ea6738700b5787496b6e6ba12abe71cc823e8815e58a563f SHA512 6c849882d504372e8d4a9a958d03b1a93f5f886c8b45f3e2b7688c2fe1e8ec76f3d26a73cb4b8a57aa120ee2e5d3b0185a59d01bf16eed60f30bd2d4603f50ee WHIRLPOOL 2b59a7764d05e8fbe255cd1e290f2e46d96898f397c1c8832b4efa41141dff9be823cec86253fc0f16d8c710fd5f8b880cfbc71c27abaec4265dfc51d64a67fd
+DIST webcamstudio-module-0.8.0.tar.gz 209905 SHA256 e9db5af88175aac753648d3f2ddb359962feb7e17e7ef81deaa52f1f7d89f08d SHA512 79c63149bc851ee84ce2f656740e954c22a9590e930972a107c828e0cd031c521c2c461b567e43b5c24ff6774c1d2838656196344c37ec72689e26680cd4c743 WHIRLPOOL a540503de5618b17b98be4ae45828a924ab2b95f315609f0947d15a1225d1104fc39fd27b266e5f21a6ee3c290b11bacb20a3956246d888bf07a871b319f3588
diff --git a/media-video/webcamstudio-module/files/webcamstudio-module-0.6.3-webcamstudio.patch b/media-video/webcamstudio-module/files/webcamstudio-module-0.6.3-webcamstudio.patch
deleted file mode 100644
index df03c31..0000000
--- a/media-video/webcamstudio-module/files/webcamstudio-module-0.6.3-webcamstudio.patch
+++ /dev/null
@@ -1,223 +0,0 @@
---- v4l2loopback.c.orig	2013-04-01 21:38:26.998046315 +0200
-+++ v4l2loopback.c	2013-04-01 22:07:51.838982767 +0200
-@@ -38,11 +38,11 @@ void * v4l2l_vzalloc (	unsigned long siz
- #include <linux/sched.h>
- #include <linux/slab.h>
- 
--#define V4L2LOOPBACK_VERSION_CODE KERNEL_VERSION(0,6,3)
-+#define V4L2LOOPBACK_VERSION_CODE KERNEL_VERSION(1,0,3)
- 
- 
--MODULE_DESCRIPTION("V4L2 loopback video device");
--MODULE_AUTHOR("Vasily Levin, IOhannes m zmoelnig <zmoelnig@iem.at>, Stefan Diewald, Anton Novikov");
-+MODULE_DESCRIPTION("Webcamstudio video device");
-+MODULE_AUTHOR("Vasily Levin, IOhannes m zmoelnig <zmoelnig@iem.at>, Stefan Diewald, Anton Novikov, Modified by Dustin Polke <DuPol@gmx.de>");
- MODULE_LICENSE("GPL");
- 
- 
-@@ -52,7 +52,7 @@ MODULE_LICENSE("GPL");
- 
- #define dprintk(fmt, args...)                                           \
-   do { if (debug > 0) {                                                 \
--      printk(KERN_INFO "v4l2-loopback[" STRINGIFY2(__LINE__) "]: " fmt, ##args); \
-+      printk(KERN_INFO "webcamstudio[" STRINGIFY2(__LINE__) "]: " fmt, ##args); \
-     } } while(0)
- 
- #define MARK()                                                          \
-@@ -62,7 +62,7 @@ MODULE_LICENSE("GPL");
- 
- #define dprintkrw(fmt, args...)                                         \
-   do { if (debug > 2) {                                                 \
--      printk(KERN_INFO "v4l2-loopback[" STRINGIFY2(__LINE__)"]: " fmt, ##args); \
-+      printk(KERN_INFO "webcamstudio[" STRINGIFY2(__LINE__)"]: " fmt, ##args); \
-     } } while (0)
- 
- 
-@@ -261,20 +261,16 @@ static const struct v4l2l_format formats
-     .depth    = 16,
-     .flags    = 0,
-   },{
--#ifdef V4L2_PIX_FMT_YVYU
-     .name     = "4:2:2, packed YVYU",
-     .fourcc   = V4L2_PIX_FMT_YVYU,
-     .depth    = 16,
-     .flags=0,
-   },{
--#endif
--#ifdef V4L2_PIX_FMT_VYUY
-     .name     = "4:2:2, packed VYUY",
-     .fourcc   = V4L2_PIX_FMT_VYUY,
-     .depth    = 16,
-     .flags=0,
-   },{
--#endif
-     .name     = "4:2:2, packed YYUV",
-     .fourcc   = V4L2_PIX_FMT_YYUV,
-     .depth    = 16,
-@@ -512,7 +508,7 @@ v4l2loopback_cd2dev  (struct device*cd)
-   struct video_device *loopdev = to_video_device(cd);
-   priv_ptr ptr = (priv_ptr)video_get_drvdata(loopdev);
-   int nr = ptr->devicenr;
--  if(nr<0 || nr>=devices){printk(KERN_ERR "v4l2-loopback: illegal device %d\n",nr);return NULL;}
-+  if(nr<0 || nr>=devices){printk(KERN_ERR "webcamstudio: illegal device %d\n",nr);return NULL;}
-   return devs[nr];
- }
- 
-@@ -522,7 +518,7 @@ v4l2loopback_getdevice        (struct fi
-   struct video_device *loopdev = video_devdata(f);
-   priv_ptr ptr = (priv_ptr)video_get_drvdata(loopdev);
-   int nr = ptr->devicenr;
--  if(nr<0 || nr>=devices){printk(KERN_ERR "v4l2-loopback: illegal device %d\n",nr);return NULL;}
-+  if(nr<0 || nr>=devices){printk(KERN_ERR "webcamstudio: illegal device %d\n",nr);return NULL;}
-   return devs[nr];
- }
- 
-@@ -570,10 +566,10 @@ vidioc_querycap     (struct file *file,
-   struct v4l2_loopback_device *dev = v4l2loopback_getdevice(file);
-   int devnr = ((priv_ptr)video_get_drvdata(dev->vdev))->devicenr;
- 
--  strlcpy(cap->driver, "v4l2 loopback", sizeof(cap->driver));
--  strlcpy(cap->card, "Dummy video device", sizeof(cap->card));
--  snprintf(cap->card, sizeof(cap->card), "Dummy video device (0x%04X)",devnr);
--  snprintf(cap->bus_info, sizeof(cap->bus_info), "v4l2loopback:%d", devnr);
-+  strlcpy(cap->driver, "WebcamStudio", sizeof(cap->driver));
-+  strlcpy(cap->card, "WebcamStudio video device", sizeof(cap->card));
-+  snprintf(cap->card, sizeof(cap->card), "WebcamStudio video device (0x%04X)",devnr);
-+  snprintf(cap->bus_info, sizeof(cap->bus_info), "WebcamStudio:%d", devnr);
- 
-   cap->version = V4L2LOOPBACK_VERSION_CODE;
-   cap->capabilities =
-@@ -1233,7 +1229,7 @@ vidioc_enum_output  (struct file *file,
-   memset(outp, 0, sizeof(*outp));
- 
-   outp->index = index;
--  strlcpy(outp->name, "loopback in", sizeof(outp->name));
-+  strlcpy(outp->name, "webcamstudio in", sizeof(outp->name));
-   outp->type = V4L2_OUTPUT_TYPE_ANALOG;
-   outp->audioset = 0;
-   outp->modulator = 0;
-@@ -1302,7 +1298,7 @@ vidioc_enum_input   (struct file *file,
-   memset(inp, 0, sizeof(*inp));
- 
-   inp->index = index;
--  strlcpy(inp->name, "loopback", sizeof(inp->name));
-+  strlcpy(inp->name, "webcamstudio", sizeof(inp->name));
-   inp->type = V4L2_INPUT_TYPE_CAMERA;
-   inp->audioset = 0;
-   inp->tuner = 0;
-@@ -1914,7 +1910,7 @@ v4l2_loopback_read   (struct file *file,
-     count = dev->buffer_size;
-   if (copy_to_user((void *) buf, (void *) (dev->image +
-                                            dev->buffers[read_index].buffer.m.offset), count)) {
--    printk(KERN_ERR "v4l2-loopback: "
-+    printk(KERN_ERR "webcamstudio: "
-            "failed copy_from_user() in write buf\n");
-     return -EFAULT;
-   }
-@@ -1952,7 +1948,7 @@ v4l2_loopback_write  (struct file *file,
-   if (copy_from_user(
-                      (void *) (dev->image + b->m.offset),
-                      (void *) buf, count)) {
--    printk(KERN_ERR "v4l2-loopback: "
-+    printk(KERN_ERR "webcamstudio: "
-            "failed copy_from_user() in write buf, could not write %zu\n",
-            count);
-     return -EFAULT;
-@@ -2091,7 +2087,7 @@ init_vdev           (struct video_device
-                      int nr)
- {
-   MARK();
--  snprintf(vdev->name, sizeof(vdev->name), "Loopback video device %X", nr);
-+  snprintf(vdev->name, sizeof(vdev->name), "WebcamStudio device %X", nr);
-   vdev->tvnorms      = V4L2_STD_ALL;
-   vdev->current_norm = V4L2_STD_ALL;
-   vdev->vfl_type     = VFL_TYPE_GRABBER;
-@@ -2339,31 +2335,31 @@ init_module         (void)
- 
-   if (devices > MAX_DEVICES) {
-     devices = MAX_DEVICES;
--    printk(KERN_INFO "v4l2loopback: number of devices is limited to: %d\n", MAX_DEVICES);
-+    printk(KERN_INFO "webcamstudio: number of devices is limited to: %d\n", MAX_DEVICES);
-   }
- 
-   if (max_buffers > MAX_BUFFERS) {
-     max_buffers=MAX_BUFFERS;
--    printk(KERN_INFO "v4l2loopback: number of buffers is limited to: %d\n", MAX_BUFFERS);
-+    printk(KERN_INFO "webcamstudio: number of buffers is limited to: %d\n", MAX_BUFFERS);
-   }
- 
-   if (max_openers < 0) {
--    printk(KERN_INFO "v4l2loopback: allowing %d openers rather than %d\n", 2, max_openers);
-+    printk(KERN_INFO "webcamstudio: allowing %d openers rather than %d\n", 2, max_openers);
-     max_openers=2;
-   }
- 
-   if (max_width < 1) {
-     max_width = V4L2LOOPBACK_SIZE_MAX_WIDTH;
--    printk(KERN_INFO "v4l2loopback: using max_width %d\n", max_width);
-+    printk(KERN_INFO "webcamstudio: using max_width %d\n", max_width);
-   }
-   if (max_height < 1) {
-     max_height = V4L2LOOPBACK_SIZE_MAX_HEIGHT;
--    printk(KERN_INFO "v4l2loopback: using max_height %d\n", max_height);
-+    printk(KERN_INFO "webcamstudio: using max_height %d\n", max_height);
-   }
- 
-   /* kfree on module release */
-   for(i=0; i<devices; i++) {
--    dprintk("creating v4l2loopback-device #%d\n", i);
-+    dprintk("creating webcamstudio device #%d\n", i);
-     devs[i] = kzalloc(sizeof(*devs[i]), GFP_KERNEL);
-     if (devs[i] == NULL) {
-       free_devices();
-@@ -2377,7 +2373,7 @@ init_module         (void)
-     /* register the device -> it creates /dev/video* */
-     if (video_register_device(devs[i]->vdev, VFL_TYPE_GRABBER, video_nr[i]) < 0) {
-       video_device_release(devs[i]->vdev);
--      printk(KERN_ERR "v4l2loopback: failed video_register_device()\n");
-+      printk(KERN_ERR "webcamstudio: failed video_register_device()\n");
-       free_devices();
-       return -EFAULT;
-     }
-@@ -2387,7 +2383,7 @@ init_module         (void)
- 
-   dprintk("module installed\n");
- 
--  printk(KERN_INFO "v4l2loopback driver version %d.%d.%d loaded\n",
-+  printk(KERN_INFO "webcamstudio driver version %d.%d.%d loaded\n",
-          (V4L2LOOPBACK_VERSION_CODE >> 16) & 0xff,
-          (V4L2LOOPBACK_VERSION_CODE >>  8) & 0xff,
-          (V4L2LOOPBACK_VERSION_CODE      ) & 0xff);
---- Makefile.orig	2013-04-01 23:16:54.298307712 +0200
-+++ Makefile	2013-04-01 23:18:35.439043279 +0200
-@@ -1,7 +1,7 @@
- KERNEL_VERSION	:= `uname -r`
- KERNEL_DIR	:= /lib/modules/$(KERNEL_VERSION)/build
- PWD		:= $(shell pwd)
--obj-m		:= v4l2loopback.o
-+obj-m		:= webcamstudio.o
- 
- PREFIX = /usr/local
- BINDIR = $(PREFIX)/bin
-@@ -30,15 +30,15 @@ MODULE_OPTIONS = devices=2
- 
- .PHONY: all install clean distclean
- .PHONY: install-all install-utils install-man
--.PHONY: modprobe v4l2loopback
-+.PHONY: modprobe webcamstudio
- 
- # we don't control the .ko file dependencies, as it is done by kernel
--# makefiles. therefore v4l2loopback.ko is a phony target actually
--.PHONY: v4l2loopback.ko
-+# makefiles. therefore webcamstudio.ko is a phony target actually
-+.PHONY: webcamstudio.ko
- 
--all: v4l2loopback.ko
--v4l2loopback: v4l2loopback.ko
--v4l2loopback.ko:
-+all: webcamstudio.ko
-+webcamstudio: webcamstudio.ko
-+webcamstudio.ko:
- 	@echo "Building v4l2-loopback driver..."
- 	$(MAKE) -C $(KERNEL_DIR) M=$(PWD) modules
- install-all: install install-utils install-man
diff --git a/media-video/webcamstudio-module/files/webcamstudio-module-0.8.0-webcamstudio.patch b/media-video/webcamstudio-module/files/webcamstudio-module-0.8.0-webcamstudio.patch
new file mode 100644
index 0000000..0055062
--- /dev/null
+++ b/media-video/webcamstudio-module/files/webcamstudio-module-0.8.0-webcamstudio.patch
@@ -0,0 +1,181 @@
+--- Makefile.orig	2014-10-20 23:30:44.519948012 +0200
++++ Makefile	2014-10-20 23:33:09.112946387 +0200
+@@ -1,7 +1,7 @@
+ KERNELRELEASE	?= `uname -r`
+ KERNEL_DIR	?= /lib/modules/$(KERNELRELEASE)/build
+ PWD		:= $(shell pwd)
+-obj-m		:= v4l2loopback.o
++obj-m		:= webcamstudio.o
+ 
+ PREFIX ?= /usr/local
+ BINDIR  = $(PREFIX)/bin
+@@ -30,16 +30,16 @@ MODULE_OPTIONS = devices=2
+ 
+ .PHONY: all install clean distclean
+ .PHONY: install-all install-utils install-man
+-.PHONY: modprobe v4l2loopback
++.PHONY: modprobe webcamstudio
+ 
+ # we don't control the .ko file dependencies, as it is done by kernel
+-# makefiles. therefore v4l2loopback.ko is a phony target actually
+-.PHONY: v4l2loopback.ko
++# makefiles. therefore webcamstudio.ko is a phony target actually
++.PHONY: webcamstudio.ko
+ 
+-all: v4l2loopback.ko
+-v4l2loopback: v4l2loopback.ko
+-v4l2loopback.ko:
+-	@echo "Building v4l2-loopback driver..."
++all: webcamstudio.ko
++webcamstudio: webcamstudio.ko
++webcamstudio.ko:
++	@echo "Building webcamstudio driver..."
+ 	$(MAKE) -C $(KERNEL_DIR) M=$(PWD) modules
+ 
+ install-all: install install-utils install-man
+--- v4l2loopback.c.orig	2014-10-20 23:19:25.510955644 +0200
++++ v4l2loopback.c	2014-10-20 23:30:08.070948422 +0200
+@@ -55,11 +55,12 @@ void *v4l2l_vzalloc(unsigned long size)
+ #define V4L2LOOPBACK_VERSION_CODE KERNEL_VERSION(0, 8, 0)
+ 
+ 
+-MODULE_DESCRIPTION("V4L2 loopback video device");
++MODULE_DESCRIPTION("Webcamstudio video device");
+ MODULE_AUTHOR("Vasily Levin, " \
+               "IOhannes m zmoelnig <zmoelnig@iem.at>,"  \
+               "Stefan Diewald,"                         \
+-              "Anton Novikov"                           \
++              "Anton Novikov,"                          \
++	      "Modified by Dustin Polke <DuPol@gmx.de>"
+ 		);
+ MODULE_LICENSE("GPL");
+ 
+@@ -70,7 +71,7 @@ MODULE_LICENSE("GPL");
+ 
+ #define dprintk(fmt, args...)                                           \
+ 	do { if (debug > 0) {                                                 \
+-		printk(KERN_INFO "v4l2-loopback[" STRINGIFY2(__LINE__) "]: " fmt, ##args); \
++		printk(KERN_INFO "webcamstudio[" STRINGIFY2(__LINE__) "]: " fmt, ##args); \
+ 	} } while (0)
+ 
+ #define MARK()                                                          \
+@@ -80,7 +81,7 @@ MODULE_LICENSE("GPL");
+ 
+ #define dprintkrw(fmt, args...)                                         \
+ 	do { if (debug > 2) {                                                 \
+-		printk(KERN_INFO "v4l2-loopback[" STRINGIFY2(__LINE__)"]: " fmt, ##args); \
++		printk(KERN_INFO "webcamstudio[" STRINGIFY2(__LINE__)"]: " fmt, ##args); \
+ 	} } while (0)
+ 
+ 
+@@ -546,7 +547,7 @@ static struct v4l2_loopback_device *v4l2
+ 	int nr = ptr->devicenr;
+ 
+ 	if (nr < 0 || nr >= devices) {
+-		printk(KERN_ERR "v4l2-loopback: illegal device %d\n", nr);
++		printk(KERN_ERR "webcamstudio: illegal device %d\n", nr);
+ 		return NULL;
+ 	}
+ 	return devs[nr];
+@@ -560,7 +561,7 @@ static struct v4l2_loopback_device *v4l2
+ 	int nr = ptr->devicenr;
+ 
+ 	if (nr < 0 || nr >= devices) {
+-		printk(KERN_ERR "v4l2-loopback: illegal device %d\n", nr);
++		printk(KERN_ERR "webcamstudio: illegal device %d\n", nr);
+ 		return NULL;
+ 	}
+ 	return devs[nr];
+@@ -605,15 +606,15 @@ static int vidioc_querycap(struct file *
+ 	struct v4l2_loopback_device *dev = v4l2loopback_getdevice(file);
+ 	int devnr = ((struct v4l2loopback_private *)video_get_drvdata(dev->vdev))->devicenr;
+ 
+-	strlcpy(cap->driver, "v4l2 loopback", sizeof(cap->driver));
++	strlcpy(cap->driver, "Webcamstudio", sizeof(cap->driver));
+ 
+ 	if (card_label[devnr] != NULL) {
+ 		snprintf(cap->card, sizeof(cap->card), card_label[devnr]);
+ 	} else {
+-		snprintf(cap->card, sizeof(cap->card), "Dummy video device (0x%04X)", devnr);
++		snprintf(cap->card, sizeof(cap->card), "Webcamstudio video device (0x%04X)", devnr);
+ 	}
+ 
+-	snprintf(cap->bus_info, sizeof(cap->bus_info), "v4l2loopback:%d", devnr);
++	snprintf(cap->bus_info, sizeof(cap->bus_info), "webcamstudio:%d", devnr);
+ 
+ 	cap->version = V4L2LOOPBACK_VERSION_CODE;
+ 	cap->capabilities =
+@@ -1817,7 +1818,7 @@ static ssize_t v4l2_loopback_read(struct
+ 	if (copy_to_user((void *)buf, (void *)(dev->image +
+ 			dev->buffers[read_index].buffer.m.offset), count)) {
+ 		printk(KERN_ERR
+-			"v4l2-loopback: failed copy_from_user() in write buf\n");
++			"webcamstudio: failed copy_from_user() in write buf\n");
+ 		return -EFAULT;
+ 	}
+ 	dprintkrw("leave v4l2_loopback_read()\n");
+@@ -1853,7 +1854,7 @@ static ssize_t v4l2_loopback_write(struc
+ 
+ 	if (copy_from_user((void *)(dev->image + b->m.offset), (void *)buf, count)) {
+ 		printk(KERN_ERR
+-			"v4l2-loopback: failed copy_from_user() in write buf, could not write %zu\n",
++			"webcamstudio: failed copy_from_user() in write buf, could not write %zu\n",
+ 			count);
+ 		return -EFAULT;
+ 	}
+@@ -2257,31 +2258,31 @@ int __init init_module(void)
+ 
+ 	if (devices > MAX_DEVICES) {
+ 		devices = MAX_DEVICES;
+-		printk(KERN_INFO "v4l2loopback: number of devices is limited to: %d\n", MAX_DEVICES);
++		printk(KERN_INFO "webcamstudio: number of devices is limited to: %d\n", MAX_DEVICES);
+ 	}
+ 
+ 	if (max_buffers > MAX_BUFFERS) {
+ 		max_buffers = MAX_BUFFERS;
+-		printk(KERN_INFO "v4l2loopback: number of buffers is limited to: %d\n", MAX_BUFFERS);
++		printk(KERN_INFO "webcamstudio: number of buffers is limited to: %d\n", MAX_BUFFERS);
+ 	}
+ 
+ 	if (max_openers < 0) {
+-		printk(KERN_INFO "v4l2loopback: allowing %d openers rather than %d\n", 2, max_openers);
++		printk(KERN_INFO "webcamstudio: allowing %d openers rather than %d\n", 2, max_openers);
+ 		max_openers = 2;
+ 	}
+ 
+ 	if (max_width < 1) {
+ 		max_width = V4L2LOOPBACK_SIZE_MAX_WIDTH;
+-		printk(KERN_INFO "v4l2loopback: using max_width %d\n", max_width);
++		printk(KERN_INFO "webcamstudio: using max_width %d\n", max_width);
+ 	}
+ 	if (max_height < 1) {
+ 		max_height = V4L2LOOPBACK_SIZE_MAX_HEIGHT;
+-		printk(KERN_INFO "v4l2loopback: using max_height %d\n", max_height);
++		printk(KERN_INFO "webcamstudio: using max_height %d\n", max_height);
+ 	}
+ 
+ 	/* kfree on module release */
+ 	for (i = 0; i < devices; i++) {
+-		dprintk("creating v4l2loopback-device #%d\n", i);
++		dprintk("creating webcamstudio-device #%d\n", i);
+ 		devs[i] = kzalloc(sizeof(*devs[i]), GFP_KERNEL);
+ 		if (devs[i] == NULL) {
+ 			free_devices();
+@@ -2295,7 +2296,7 @@ int __init init_module(void)
+ 		/* register the device -> it creates /dev/video* */
+ 		if (video_register_device(devs[i]->vdev, VFL_TYPE_GRABBER, video_nr[i]) < 0) {
+ 			video_device_release(devs[i]->vdev);
+-			printk(KERN_ERR "v4l2loopback: failed video_register_device()\n");
++			printk(KERN_ERR "webcamstudio: failed video_register_device()\n");
+ 			free_devices();
+ 			return -EFAULT;
+ 		}
+@@ -2304,7 +2305,7 @@ int __init init_module(void)
+ 
+ 	dprintk("module installed\n");
+ 
+-	printk(KERN_INFO "v4l2loopback driver version %d.%d.%d loaded\n",
++	printk(KERN_INFO "webcamstudio driver version %d.%d.%d loaded\n",
+ 			(V4L2LOOPBACK_VERSION_CODE >> 16) & 0xff,
+ 			(V4L2LOOPBACK_VERSION_CODE >>  8) & 0xff,
+ 			(V4L2LOOPBACK_VERSION_CODE) & 0xff);
diff --git a/media-video/webcamstudio-module/webcamstudio-module-0.6.3.ebuild b/media-video/webcamstudio-module/webcamstudio-module-0.8.0.ebuild
index be93159..6c26573 100644
--- a/media-video/webcamstudio-module/webcamstudio-module-0.6.3.ebuild
+++ b/media-video/webcamstudio-module/webcamstudio-module-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -18,7 +18,7 @@ IUSE="modules"
 DEPEND=""
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}"/umlaeute-v4l2loopback-a3eaac9
+S="${WORKDIR}"/umlaeute-v4l2loopback-4da4bfa
 
 pkg_setup() {
 	linux-mod_pkg_setup