summaryrefslogtreecommitdiff
path: root/libraries
diff options
context:
space:
mode:
authorponce <matteo.bernardini@gmail.com>2011-06-02 22:15:56 +0200
committerRobby Workman <rworkman@slackbuilds.org>2012-08-21 08:55:34 -0500
commit6672028785495935b5380fc24d38c3fa09372087 (patch)
tree6af7ac52d2c7a8b8c28c2a38bdd276da631f65e5 /libraries
parent5ecb0025353cc37435c6b19d85ba8df4a3da58d2 (diff)
downloadslackbuilds-6672028785495935b5380fc24d38c3fa09372087.tar.gz
libraries/libunicap: Patch to build with kernel-headers > 2.6.37
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'libraries')
-rw-r--r--libraries/libunicap/README2
-rw-r--r--libraries/libunicap/disable-v4l.patch11
-rw-r--r--libraries/libunicap/libunicap.SlackBuild5
3 files changed, 18 insertions, 0 deletions
diff --git a/libraries/libunicap/README b/libraries/libunicap/README
index 792c9234af..f556b088a6 100644
--- a/libraries/libunicap/README
+++ b/libraries/libunicap/README
@@ -6,3 +6,5 @@ It offers a high level of hardware abstraction while maintaining maximum
performance. Zero copy capture of video buffers is possible for devices
supporting it allowing fast video capture with low CPU usage even on
low-speed architectures.
+
+ffmpeg is an optional dependency.
diff --git a/libraries/libunicap/disable-v4l.patch b/libraries/libunicap/disable-v4l.patch
new file mode 100644
index 0000000000..bb2ca28af8
--- /dev/null
+++ b/libraries/libunicap/disable-v4l.patch
@@ -0,0 +1,11 @@
+diff -Naur libunicap-0.9.12.orig/cpi/v4l2cpi/uvcvideo.h libunicap-0.9.12/cpi/v4l2cpi/uvcvideo.h
+--- libunicap-0.9.12.orig/cpi/v4l2cpi/uvcvideo.h 2010-01-17 08:49:29.000000000 +0100
++++ libunicap-0.9.12/cpi/v4l2cpi/uvcvideo.h 2011-06-02 07:41:09.642997395 +0200
+@@ -2,7 +2,6 @@
+ #define _USB_VIDEO_H_
+
+ #include <linux/kernel.h>
+-#include <linux/videodev.h>
+
+ #include "uvc_compat.h"
+
diff --git a/libraries/libunicap/libunicap.SlackBuild b/libraries/libunicap/libunicap.SlackBuild
index 791c4532e1..b865bf5eaa 100644
--- a/libraries/libunicap/libunicap.SlackBuild
+++ b/libraries/libunicap/libunicap.SlackBuild
@@ -52,6 +52,10 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# kernel in 13.37 doesn't have this header anymore
+# http://lists.fedoraproject.org/pipermail/devel/2011-February/148519.html
+patch -p1 < $CWD/disable-v4l.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -61,6 +65,7 @@ CXXFLAGS="$SLKCFLAGS" \
--localstatedir=/var \
--mandir=/usr/man \
--disable-static \
+ --disable-v4l \
--docdir=/usr/doc/$PRGNAM-$VERSION \
--build=$ARCH-slackware-linux