aboutsummaryrefslogtreecommitdiff
path: root/libraries
diff options
context:
space:
mode:
authorMatteo Bernardini <ponce@slackbuilds.org>2012-12-16 17:43:03 -0500
committerdsomero <xgizzmo@slackbuilds.org>2012-12-23 09:16:24 -0500
commit3164a5113772151c36dd30dd30a2bf7faef9685e (patch)
tree33e2a55c967ed42aaa2c52dff9b3dc1ba571c859 /libraries
parent81718fb167551e4103668a591a16b999fbeb1ad5 (diff)
libraries/libunicap: Updated for version 0.9.12.
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
Diffstat (limited to 'libraries')
-rw-r--r--libraries/libunicap/disable-v4l.patch11
-rw-r--r--libraries/libunicap/libunicap.SlackBuild17
2 files changed, 11 insertions, 17 deletions
diff --git a/libraries/libunicap/disable-v4l.patch b/libraries/libunicap/disable-v4l.patch
deleted file mode 100644
index bb2ca28af8c7a..0000000000000
--- a/libraries/libunicap/disable-v4l.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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 b067498b9ab93..61c3b213d3595 100644
--- a/libraries/libunicap/libunicap.SlackBuild
+++ b/libraries/libunicap/libunicap.SlackBuild
@@ -1,13 +1,13 @@
#!/bin/sh
-# Slackware build script for unicap
+# Slackware build script for libunicap
# Written by Matteo Bernardini <ponce@slackbuilds.org>
# based on slackbuilds.org default template
PRGNAM=libunicap
VERSION=${VERSION:-0.9.12}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -52,9 +52,9 @@ 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
+# This header has moved
+sed -i "s|linux\/videodev\.|libv4l1-videodev.|" \
+ cpi/v4l/v4l.c cpi/v4l2cpi/uvcvideo.h
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
@@ -65,13 +65,18 @@ CXXFLAGS="$SLKCFLAGS" \
--localstatedir=/var \
--mandir=/usr/man \
--disable-static \
- --disable-v4l \
--docdir=/usr/doc/$PRGNAM-$VERSION \
--build=$ARCH-slackware-linux
make
make install DESTDIR=$PKG
+# Move packaged rules to correct location.
+mkdir $PKG/lib
+mv $PKG/etc/udev $PKG/lib && rmdir $PKG/etc
+# Fix for the new udev syntax
+sed -i "s|SYSFS|ATTRS|g" $PKG/lib/udev/rules.d/50-euvccam.rules
+
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true