summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
author Matteo Bernardini <ponce@slackbuilds.org>2012-09-19 21:11:38 +0200
committer Robby Workman <rworkman@slackbuilds.org>2012-09-19 20:30:01 -0500
commitf9d1223deeeb4727a822322cb1f098617ec95dd9 (patch)
tree16043a2c6b01c3cf2265a659fe7c50aca7ca34a3 /system
parent48f77cf574211851df8e08676f7e1b3f915195c7 (diff)
downloadslackbuilds-f9d1223deeeb4727a822322cb1f098617ec95dd9.tar.gz
slackbuilds-f9d1223deeeb4727a822322cb1f098617ec95dd9.tar.xz
system/mjpg-streamer: Updated for subersion revision 163.
Switched to the new version supporting v4l2. Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'system')
-rw-r--r--system/mjpg-streamer/mjpg-streamer.SlackBuild11
-rw-r--r--system/mjpg-streamer/mjpg-streamer.info6
2 files changed, 10 insertions, 7 deletions
diff --git a/system/mjpg-streamer/mjpg-streamer.SlackBuild b/system/mjpg-streamer/mjpg-streamer.SlackBuild
index 7602d10675..d1ebe7e417 100644
--- a/system/mjpg-streamer/mjpg-streamer.SlackBuild
+++ b/system/mjpg-streamer/mjpg-streamer.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=mjpg-streamer
-VERSION=${VERSION:-svn20111016}
+VERSION=${VERSION:-r163}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -60,7 +60,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
cd $PRGNAM-$VERSION
chown -R root:root .
chmod -R u+w,go+r-w,a-s .
@@ -73,6 +73,9 @@ find . -name Makefile -exec \
CXXFLAGS = $SLKCFLAGS
}" '{}' \;
+# This header is OLD
+sed -i "s|linux/videodev|linux/videodev2|" uvc-streamer/*
+
# Manual installation section
cd uvc-streamer
make
@@ -81,11 +84,11 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/uvc-streamer
cp -a README CHANGELOG LICENSE \
$PKG/usr/doc/$PRGNAM-$VERSION/uvc-streamer
-cd ../mjpg-streamer
+cd ../mjpg-streamer-experimental
make
install -m 755 -D mjpg_streamer $PKG/usr/bin/mjpg_streamer
mkdir -p $PKG/usr/lib$LIBDIRSUFFIX
-install -m 644 *.so $PKG/usr/lib$LIBDIRSUFFIX/
+install -m 644 *.so $PKG/usr/lib$LIBDIRSUFFIX
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/mjpg-streamer
cp -a README CHANGELOG LICENSE TODO start.sh \
$PKG/usr/doc/$PRGNAM-$VERSION/mjpg-streamer
diff --git a/system/mjpg-streamer/mjpg-streamer.info b/system/mjpg-streamer/mjpg-streamer.info
index 42507b5841..e1eb558091 100644
--- a/system/mjpg-streamer/mjpg-streamer.info
+++ b/system/mjpg-streamer/mjpg-streamer.info
@@ -1,8 +1,8 @@
PRGNAM="mjpg-streamer"
-VERSION="svn20111016"
+VERSION="r163"
HOMEPAGE="https://sourceforge.net/projects/mjpg-streamer/"
-DOWNLOAD="http://source.dawoodfall.net/mjpg-streamer-svn20111016.tar.gz"
-MD5SUM="1e251c2b8a76fe524d5901054ea5529b"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/mjpg-streamer-r163.tar.xz"
+MD5SUM="bba8b2a5480d04bae0e8df158b8730fd"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""