aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Woodfall <dave@dawoodfall.net>2018-03-27 12:51:22 +0000
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2018-03-31 07:41:32 +0700
commitbbc3eec20f5c155477f01e46a4dc1234800b68e0 (patch)
tree38e3f88db022ebb77430a8ee75666389a035c00d
parentd0bc32aeccceb787293bbccfea43460dd1bf38a8 (diff)
system/mjpg-streamer: Updated homepage + switch to i586.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
-rw-r--r--system/mjpg-streamer/README6
-rw-r--r--system/mjpg-streamer/mjpg-streamer.SlackBuild9
-rw-r--r--system/mjpg-streamer/mjpg-streamer.info2
-rw-r--r--system/mjpg-streamer/slack-desc2
4 files changed, 10 insertions, 9 deletions
diff --git a/system/mjpg-streamer/README b/system/mjpg-streamer/README
index ff64743fac6c..5438596857e3 100644
--- a/system/mjpg-streamer/README
+++ b/system/mjpg-streamer/README
@@ -2,10 +2,10 @@ MJPG-streamer is a very lightweight and resource friendly video
streamer. It also comes with uvc_stream, which is a very basic
streamer, and uvc_viewer, a simple gtk viewing application.
-MJPG-streamer takes JPGs from Linux-UVC compatible webcams,
+MJPG-streamer takes JPGs from Linux-UVC compatible webcams,
filesystem or other input plugins and streams them as M-JPEG via HTTP
-to webbrowsers, VLC and other software. It is the successor of
-uvc-streamer, a Linux-UVC streaming application with Pan/Tilt
+to webbrowsers, VLC and other software. It is the successor of
+uvc-streamer, a Linux-UVC streaming application with Pan/Tilt
Homepage: https://sourceforge.net/projects/mjpg-streamer/
diff --git a/system/mjpg-streamer/mjpg-streamer.SlackBuild b/system/mjpg-streamer/mjpg-streamer.SlackBuild
index 1c6ca7265c1f..16bb61b465e8 100644
--- a/system/mjpg-streamer/mjpg-streamer.SlackBuild
+++ b/system/mjpg-streamer/mjpg-streamer.SlackBuild
@@ -24,12 +24,12 @@
PRGNAM=mjpg-streamer
VERSION=${VERSION:-r163}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -84,6 +84,7 @@ sed -i "s|linux/videodev|linux/videodev2|" uvc-streamer/*
cd uvc-streamer
make
install -m 755 -D uvc_stream $PKG/usr/bin/uvc_stream
+
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/uvc-streamer
cp -a README CHANGELOG LICENSE \
$PKG/usr/doc/$PRGNAM-$VERSION/uvc-streamer
diff --git a/system/mjpg-streamer/mjpg-streamer.info b/system/mjpg-streamer/mjpg-streamer.info
index e1eb558091bd..8ea6352799cf 100644
--- a/system/mjpg-streamer/mjpg-streamer.info
+++ b/system/mjpg-streamer/mjpg-streamer.info
@@ -1,6 +1,6 @@
PRGNAM="mjpg-streamer"
VERSION="r163"
-HOMEPAGE="https://sourceforge.net/projects/mjpg-streamer/"
+HOMEPAGE="https://github.com/jacksonliam/mjpg-streamer"
DOWNLOAD="http://ponce.cc/slackware/sources/repo/mjpg-streamer-r163.tar.xz"
MD5SUM="bba8b2a5480d04bae0e8df158b8730fd"
DOWNLOAD_x86_64=""
diff --git a/system/mjpg-streamer/slack-desc b/system/mjpg-streamer/slack-desc
index 5d7a1a89a231..f8854ebff0c0 100644
--- a/system/mjpg-streamer/slack-desc
+++ b/system/mjpg-streamer/slack-desc
@@ -13,7 +13,7 @@ mjpg-streamer: filesystem or other input plugins and streams them as M-JPEG via
mjpg-streamer: to webbrowsers, VLC and other software. It is the successor of
mjpg-streamer: uvc-streamer, a Linux-UVC streaming application with Pan/Tilt
mjpg-streamer:
-mjpg-streamer: Homepage: https://sourceforge.net/projects/mjpg-streamer/
+mjpg-streamer: Homepage: https://github.com/jacksonliam/mjpg-streamer
mjpg-streamer:
mjpg-streamer:
mjpg-streamer: