diff options
| -rw-r--r-- | media-video/webcamstudio-module/ChangeLog | 8 | ||||
| -rw-r--r-- | media-video/webcamstudio-module/Manifest | 2 | ||||
| -rw-r--r-- | media-video/webcamstudio-module/files/webcamstudio-module-0.9.1-webcamstudio.patch (renamed from media-video/webcamstudio-module/files/webcamstudio-module-0.8.0-webcamstudio.patch) | 107 | ||||
| -rw-r--r-- | media-video/webcamstudio-module/metadata.xml | 7 | ||||
| -rw-r--r-- | media-video/webcamstudio-module/webcamstudio-module-0.9.1.ebuild (renamed from media-video/webcamstudio-module/webcamstudio-module-0.8.0.ebuild) | 4 |
5 files changed, 94 insertions, 34 deletions
diff --git a/media-video/webcamstudio-module/ChangeLog b/media-video/webcamstudio-module/ChangeLog index 3902794..243d7e2 100644 --- a/media-video/webcamstudio-module/ChangeLog +++ b/media-video/webcamstudio-module/ChangeLog @@ -1,7 +1,13 @@ # ChangeLog for media-video/webcamstudio-module -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 31 Jan 2017; Dustin Polke <DuPol@gmx.de> -webcamstudio-module-0.8.0.ebuild, + +webcamstudio-module-0.9.1.ebuild, + -files/webcamstudio-module-0.8.0-webcamstudio.patch, + +files/webcamstudio-module-0.9.1-webcamstudio.patch, metadata.xml: + Use newer kernel module based on v4l2loopback-0.9.1. Drop old. + *webcamstudio-module-0.8.0 (09 Nov 2014) 09 Nov 2014; 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 ff60b8d..56eb653 100644 --- a/media-video/webcamstudio-module/Manifest +++ b/media-video/webcamstudio-module/Manifest @@ -1 +1 @@ -DIST webcamstudio-module-0.8.0.tar.gz 209905 SHA256 e9db5af88175aac753648d3f2ddb359962feb7e17e7ef81deaa52f1f7d89f08d SHA512 79c63149bc851ee84ce2f656740e954c22a9590e930972a107c828e0cd031c521c2c461b567e43b5c24ff6774c1d2838656196344c37ec72689e26680cd4c743 WHIRLPOOL a540503de5618b17b98be4ae45828a924ab2b95f315609f0947d15a1225d1104fc39fd27b266e5f21a6ee3c290b11bacb20a3956246d888bf07a871b319f3588 +DIST webcamstudio-module-0.9.1.tar.gz 46160 SHA256 896d7fb951a10513cc5e41e7f8e832e0a9bea3c5b92728f98efda968358ade69 SHA512 5f15aaaf7d9e844d0cb2549cf453408068c1431afb9ce93cbbd0130882ab0ef2bf4e635b0cde7f1a1a0b47aac6142b82e4fbdfa2fc11780e2ae7adad9457c775 WHIRLPOOL de037ee3ee80a949031ec810799b8cfd46206b43e351d219a22baa5d50a33513d7321bed3d27b75ce7879be35f4cf3a52824665e95c55927f1de77f38377cef8 diff --git a/media-video/webcamstudio-module/files/webcamstudio-module-0.8.0-webcamstudio.patch b/media-video/webcamstudio-module/files/webcamstudio-module-0.9.1-webcamstudio.patch index 0055062..cdb3b40 100644 --- a/media-video/webcamstudio-module/files/webcamstudio-module-0.8.0-webcamstudio.patch +++ b/media-video/webcamstudio-module/files/webcamstudio-module-0.9.1-webcamstudio.patch @@ -1,5 +1,5 @@ ---- Makefile.orig 2014-10-20 23:30:44.519948012 +0200 -+++ Makefile 2014-10-20 23:33:09.112946387 +0200 +--- Makefile.orig ++++ Makefile @@ -1,7 +1,7 @@ KERNELRELEASE ?= `uname -r` KERNEL_DIR ?= /lib/modules/$(KERNELRELEASE)/build @@ -33,24 +33,59 @@ $(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) - +@@ -47,11 +47,11 @@ install: + $(MAKE) -C $(KERNEL_DIR) M=$(PWD) modules_install + depmod -a $(KERNELRELEASE) + +-install-utils: utils/v4l2loopback-ctl ++install-utils: utils/webcamstudio-ctl + $(INSTALL_DIR) "$(DESTDIR)$(BINDIR)" + $(INSTALL_PROGRAM) $< "$(DESTDIR)$(BINDIR)" + +-install-man: man/v4l2loopback-ctl.1 ++install-man: man/webcamstudio-ctl.1 + $(INSTALL_DIR) "$(DESTDIR)$(MAN1DIR)" + $(INSTALL_DATA) $< "$(DESTDIR)$(MAN1DIR)" + +@@ -61,13 +61,13 @@ clean: + $(MAKE) -C $(KERNEL_DIR) M=$(PWD) clean + + distclean: clean +- rm -f man/v4l2loopback-ctl.1 ++ rm -f man/webcamstudio-ctl.1 + +-modprobe: v4l2loopback.ko +- chmod a+r v4l2loopback.ko ++modprobe: webcamstudio.ko ++ chmod a+r webcamstudio.ko + sudo modprobe videodev +- -sudo rmmod v4l2loopback +- sudo insmod ./v4l2loopback.ko $(MODULE_OPTIONS) ++ -sudo rmmod webcamstudio ++ sudo insmod ./webcamstudio.ko $(MODULE_OPTIONS) + +-man/v4l2loopback-ctl.1: utils/v4l2loopback-ctl +- help2man -N --name "control v4l2 loopback devices" $^ > $@ ++man/webcamstudio-ctl.1: utils/webcamstudio-ctl ++ help2man -N --name "control webcamstudio loopback devices" $^ > $@ +--- v4l2loopback.c.orig ++++ v4l2loopback.c +@@ -38,12 +38,13 @@ + + #define V4L2LOOPBACK_VERSION_CODE KERNEL_VERSION(0, 9, 1) -MODULE_DESCRIPTION("V4L2 loopback video device"); -+MODULE_DESCRIPTION("Webcamstudio video device"); ++MODULE_DESCRIPTION("Webcamstudio loopback 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>" + "Anton Novikov" \ + "et al." \ ++ "Modified by Dustin Polke <DuPol@gmx.de>" \ ); MODULE_LICENSE("GPL"); -@@ -70,7 +71,7 @@ MODULE_LICENSE("GPL"); +@@ -55,7 +56,7 @@ MODULE_LICENSE("GPL"); #define dprintk(fmt, args...) \ do { if (debug > 0) { \ @@ -59,7 +94,7 @@ } } while (0) #define MARK() \ -@@ -80,7 +81,7 @@ MODULE_LICENSE("GPL"); +@@ -65,7 +66,7 @@ MODULE_LICENSE("GPL"); #define dprintkrw(fmt, args...) \ do { if (debug > 2) { \ @@ -67,8 +102,8 @@ + printk(KERN_INFO "webcamstudio[" STRINGIFY2(__LINE__)"]: " fmt, ##args); \ } } while (0) - -@@ -546,7 +547,7 @@ static struct v4l2_loopback_device *v4l2 + /* +@@ -575,7 +576,7 @@ static struct v4l2_loopback_device *v4l2 int nr = ptr->devicenr; if (nr < 0 || nr >= devices) { @@ -77,7 +112,7 @@ return NULL; } return devs[nr]; -@@ -560,7 +561,7 @@ static struct v4l2_loopback_device *v4l2 +@@ -589,7 +590,7 @@ static struct v4l2_loopback_device *v4l2 int nr = ptr->devicenr; if (nr < 0 || nr >= devices) { @@ -86,12 +121,12 @@ return NULL; } return devs[nr]; -@@ -605,15 +606,15 @@ static int vidioc_querycap(struct file * +@@ -634,15 +635,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)); ++ strlcpy(cap->driver, "webcamstudio", sizeof(cap->driver)); if (card_label[devnr] != NULL) { snprintf(cap->card, sizeof(cap->card), card_label[devnr]); @@ -100,12 +135,12 @@ + 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); +- snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:v4l2loopback-%03d", devnr); ++ snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:webcamstudio-%03d", devnr); - cap->version = V4L2LOOPBACK_VERSION_CODE; - cap->capabilities = -@@ -1817,7 +1818,7 @@ static ssize_t v4l2_loopback_read(struct + #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 1, 0) + /* since 3.1.0, the v4l2-core system is supposed to set the version */ +@@ -1876,7 +1877,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 @@ -114,7 +149,7 @@ return -EFAULT; } dprintkrw("leave v4l2_loopback_read()\n"); -@@ -1853,7 +1854,7 @@ static ssize_t v4l2_loopback_write(struc +@@ -1912,7 +1913,7 @@ static ssize_t v4l2_loopback_write(struc if (copy_from_user((void *)(dev->image + b->m.offset), (void *)buf, count)) { printk(KERN_ERR @@ -123,7 +158,25 @@ count); return -EFAULT; } -@@ -2257,31 +2258,31 @@ int __init init_module(void) +@@ -2045,7 +2046,7 @@ static int allocate_timeout_image(struct + static void init_vdev(struct video_device *vdev, int nr) + { + MARK(); +- snprintf(vdev->name, sizeof(vdev->name), "Loopback video device %X", nr); ++ snprintf(vdev->name, sizeof(vdev->name), "Webcamstudio video device %X", nr); + + #ifdef V4L2LOOPBACK_WITH_STD + vdev->tvnorms = V4L2_STD_ALL; +@@ -2132,7 +2133,7 @@ static int v4l2_loopback_init(struct v4l + int ret; + struct v4l2_ctrl_handler *hdl = &dev->ctrl_handler; + snprintf(dev->v4l2_dev.name, sizeof(dev->v4l2_dev.name), +- "v4l2loopback-%03d", nr); ++ "webcamstudio-%03d", nr); + ret = v4l2_device_register(NULL, &dev->v4l2_dev); + if (ret) + return ret; +@@ -2343,31 +2344,31 @@ int __init init_module(void) if (devices > MAX_DEVICES) { devices = MAX_DEVICES; @@ -161,7 +214,7 @@ devs[i] = kzalloc(sizeof(*devs[i]), GFP_KERNEL); if (devs[i] == NULL) { free_devices(); -@@ -2295,7 +2296,7 @@ int __init init_module(void) +@@ -2381,7 +2382,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); @@ -170,7 +223,7 @@ free_devices(); return -EFAULT; } -@@ -2304,7 +2305,7 @@ int __init init_module(void) +@@ -2390,7 +2391,7 @@ int __init init_module(void) dprintk("module installed\n"); diff --git a/media-video/webcamstudio-module/metadata.xml b/media-video/webcamstudio-module/metadata.xml index cc86df3..b17ae66 100644 --- a/media-video/webcamstudio-module/metadata.xml +++ b/media-video/webcamstudio-module/metadata.xml @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer> - <email>DuPol@gmx.de</email> - </maintainer> +<maintainer type="person"> + <email>DuPol@gmx.de</email> + <name>Dustin Polke</name> +</maintainer> </pkgmetadata> diff --git a/media-video/webcamstudio-module/webcamstudio-module-0.8.0.ebuild b/media-video/webcamstudio-module/webcamstudio-module-0.9.1.ebuild index 6c26573..a968c4b 100644 --- a/media-video/webcamstudio-module/webcamstudio-module-0.8.0.ebuild +++ b/media-video/webcamstudio-module/webcamstudio-module-0.9.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 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-4da4bfa +S="${WORKDIR}"/umlaeute-v4l2loopback-dd9ea64 pkg_setup() { linux-mod_pkg_setup |