summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDustin Polke <DuPol@gmx.de>2013-03-27 23:28:34 +0100
committerDustin Polke <DuPol@gmx.de>2013-03-27 23:28:34 +0100
commit8c73db54c71ff229d7aad2d3ad36dae2cc30acf3 (patch)
tree800e6019318dcd893d11fee15bada6c9374b6aee /media-video
parent[net-fs/autofs] Update upstream patchset. (diff)
downloadDuPol-8c73db54c71ff229d7aad2d3ad36dae2cc30acf3.tar.gz
DuPol-8c73db54c71ff229d7aad2d3ad36dae2cc30acf3.tar.bz2
DuPol-8c73db54c71ff229d7aad2d3ad36dae2cc30acf3.zip
[media-video/webcamstudio-module] Add patch for kernels >3.6.
Diffstat (limited to 'media-video')
-rw-r--r--media-video/webcamstudio-module/ChangeLog7
-rw-r--r--media-video/webcamstudio-module/Manifest9
-rw-r--r--media-video/webcamstudio-module/files/webcamstudio-module-0.57_beta4-v4l2_buffer.patch12
-rw-r--r--media-video/webcamstudio-module/webcamstudio-module-0.57_beta4.ebuild3
4 files changed, 25 insertions, 6 deletions
diff --git a/media-video/webcamstudio-module/ChangeLog b/media-video/webcamstudio-module/ChangeLog
index 1776a1f..64b5ce8 100644
--- a/media-video/webcamstudio-module/ChangeLog
+++ b/media-video/webcamstudio-module/ChangeLog
@@ -1,7 +1,12 @@
# ChangeLog for media-video/webcamstudio-module
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 27 Mar 2013; Dustin Polke <DuPol@gmx.de>
+ webcamstudio-module-0.57_beta4.ebuild,
+ +files/webcamstudio-module-0.57_beta4-v4l2_buffer.patch:
+ Add patch for kernels >3.6.
+
09 Feb 2012; Dustin Polke <DuPol@gmx.de>
webcamstudio-module-0.57_beta4.ebuild:
Make use of unpacker eclass; make library symlinks relative.
diff --git a/media-video/webcamstudio-module/Manifest b/media-video/webcamstudio-module/Manifest
index 51050ab..9087ae7 100644
--- a/media-video/webcamstudio-module/Manifest
+++ b/media-video/webcamstudio-module/Manifest
@@ -1,4 +1,5 @@
-DIST webcamstudio_0.57beta4_all.deb 15264140 RMD160 1b54dacf70a7ff56424f64d1dd4b2a0aaffd30d4 SHA1 afe07482b938449ef94321689abc4ffc5cec04a2 SHA256 4b9399269e73402a166762f995d1bd5e3247c6fe8b72ee2bbcbebd9dd3366efd
-EBUILD webcamstudio-module-0.57_beta4.ebuild 1716 RMD160 db108e93a3fdfde69bf62d03d91859df51a0d1e9 SHA1 965789b473b59c884a4534caa504676ee8b34305 SHA256 441e57b0e8859a0ae375392b7915125c797bd8582a8c8cc873e5a25782e28de3
-MISC ChangeLog 468 RMD160 fe95e68409ee5eb7ca95ac1271d5d0df6898fb5d SHA1 6d784259b6bf2f79dbbcddbdf14a9d7597da20f6 SHA256 30f3566ae5043cd18c3ed0ca1461df3aa63f3db3aff0131926a8aa1fea234a69
-MISC metadata.xml 202 RMD160 f5c140462716f7b267daa9352b2f1908fbbe3e00 SHA1 df31e266563fa79bf52a780e1fbbe922614c7e3c SHA256 898b32b6414d22f4ea6738700b5787496b6e6ba12abe71cc823e8815e58a563f
+AUX webcamstudio-module-0.57_beta4-v4l2_buffer.patch 586 SHA256 1d2a88a86ca4f95c19724b281946a7d8208c2ea9a8b0ede93e9ee2a582b4cb05 SHA512 4892cdcadbb27188dabf647afb4a2ba08e72526fc6c64ba3e6b32675aeab2b703f72a5fbd1467830d51d5aa2d85a2685869c4e30000f61e1c204574c17944657 WHIRLPOOL c7c8d79e5581fd8bc020c1851e7d32013645fa9f35b9725b7730a8e98beb4473d53774a079684ab8d38835a6712532be5e17bde6e76a6aca65665a881837861d
+DIST webcamstudio_0.57beta4_all.deb 15264140 SHA256 4b9399269e73402a166762f995d1bd5e3247c6fe8b72ee2bbcbebd9dd3366efd SHA512 1bca5a093c6e7e0dcace96c7696a4fa1596f0f72334e091401cfd5280c6c220ab7c1e60b3d4cbe461bcc7610b68f6a1c5589425ad5615bd6a9f9130ace09ec06 WHIRLPOOL ff3491c4642ea2127392190c93161627c1e55b66796ba41359915d898bbcf6c702800d951404408ec0bd6af4c47e882d4134c76d3f3d90bc129b308ee31bb88b
+EBUILD webcamstudio-module-0.57_beta4.ebuild 1762 SHA256 a294746f37d310b5946cfddd9f163f5822a63ac2754f708c1c568f639e658b82 SHA512 ed0b6ce6bdd1668f946018f38393dfaeaa92a975ae66b2442659f7cbb7b89df085e249a6880fd3fd0442a110eb6e0b3dc2f42cd6b70263f948bc3581149f9763 WHIRLPOOL afd33552ec40505171a0ea1608944d9de2e67330b26215dd9811dbd8bce555e39c65e657f32792e03d4f57d71b9284250428585023aa177243d88d0049bf32ab
+MISC ChangeLog 642 SHA256 3a71a5c62a3c48cecb2e5a97b0838aaa2543a869f8c8e8f4b3d7207339d61c15 SHA512 93760cc63c09a844725f4fd4741d6d2800e6b6cc9c9563c1240833beb4244c57c10c8e565e74c79958ac78bc2ef64a499e90e50908d80fb4eec01a9a6b55ad12 WHIRLPOOL 0ad899344c1040d1b924b68e40033a617ae1bd1f5b8e799d97344c20481955533589d003c3d03538f4ae9d7e78e355f03dc61c67d7da2db911bbdebbe9ff551b
+MISC metadata.xml 202 SHA256 898b32b6414d22f4ea6738700b5787496b6e6ba12abe71cc823e8815e58a563f SHA512 6c849882d504372e8d4a9a958d03b1a93f5f886c8b45f3e2b7688c2fe1e8ec76f3d26a73cb4b8a57aa120ee2e5d3b0185a59d01bf16eed60f30bd2d4603f50ee WHIRLPOOL 2b59a7764d05e8fbe255cd1e290f2e46d96898f397c1c8832b4efa41141dff9be823cec86253fc0f16d8c710fd5f8b880cfbc71c27abaec4265dfc51d64a67fd
diff --git a/media-video/webcamstudio-module/files/webcamstudio-module-0.57_beta4-v4l2_buffer.patch b/media-video/webcamstudio-module/files/webcamstudio-module-0.57_beta4-v4l2_buffer.patch
new file mode 100644
index 0000000..f90c8a4
--- /dev/null
+++ b/media-video/webcamstudio-module/files/webcamstudio-module-0.57_beta4-v4l2_buffer.patch
@@ -0,0 +1,12 @@
+--- usr/share/webcamstudio/webcamstudio-src/webcamstudio.c.orig 2013-03-27 23:14:50.507509483 +0100
++++ usr/share/webcamstudio/webcamstudio-src/webcamstudio.c 2013-03-27 23:16:14.127464090 +0100
+@@ -1435,7 +1435,9 @@ init_buffers (struct webcamstudio
+ b->length = buffer_size;
+ b->field = V4L2_FIELD_NONE;
+ b->flags = 0;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 1)
+ b->input = 0;
++#endif
+ b->m.offset = i * buffer_size;
+ b->memory = V4L2_MEMORY_MMAP;
+ b->sequence = 0;
diff --git a/media-video/webcamstudio-module/webcamstudio-module-0.57_beta4.ebuild b/media-video/webcamstudio-module/webcamstudio-module-0.57_beta4.ebuild
index 0b8f2f3..4da0280 100644
--- a/media-video/webcamstudio-module/webcamstudio-module-0.57_beta4.ebuild
+++ b/media-video/webcamstudio-module/webcamstudio-module-0.57_beta4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -31,6 +31,7 @@ pkg_setup() {
src_prepare() {
if use modules; then
+ epatch "${FILESDIR}/${P}-v4l2_buffer.patch"
sed -e "s:\$(KERNEL_DIR):${KV_DIR}:" \
-i Makefile || die
set_arch_to_kernel