multimedia/ucview: Switch to i586, tweak download.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

3 files changed, 20 insertions, 24 deletions

diff --git a/multimedia/ucview/slack-desc b/multimedia/ucview/slack-desc
index 4098ced3c9..b35073aa7a 100644
--- a/multimedia/ucview/slack-desc
+++ b/multimedia/ucview/slack-desc
@@ -8,12 +8,12 @@
       |-----handy-ruler------------------------------------------------------|
 ucview: ucview (video capture and display program)
 ucview:
-ucview: Unicap provides a uniform interface to video capture devices. It
-ucview: allows applications to use any supported video capture device via a
-ucview: single API. UCView is a video capture and display program based on
-ucview: the Unicap video imaging library.
+ucview: UCView is a video capture and display program based on the Unicap
+ucview: imaging library. It allows high performance live video display, by
+ucview: using XVideo hardware acceleration where possible. It supports a broad
+ucview: range of video capture devices via the Unicap library. It allows audio
+ucview: and video recording and encoding, by using the free Ogg Vorbis and
+ucview: Theora high performance codecs. It can also be extended via plugins.
 ucview:
 ucview: Homepage: https://github.com/unicap
 ucview:
-ucview:
-ucview:
diff --git a/multimedia/ucview/ucview.SlackBuild b/multimedia/ucview/ucview.SlackBuild
index 4813135b7e..7321cd23df 100644
--- a/multimedia/ucview/ucview.SlackBuild
+++ b/multimedia/ucview/ucview.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for ucview
 
-# Copyright 2015 Philip Lacroix <slackph at posteo dot de>
+# Copyright 2015-2017 Philip Lacroix <slackph at posteo dot de>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,13 +24,15 @@
 
 PRGNAM=ucview
 VERSION=${VERSION:-20150221}
-SRCVERSION=${SRCVERSION:-29bd93aeef0573c58c9aee665dc43fdfd1f77a1f}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
+# Source ID (GitHub).
+SRCVER=${SRCVER:-29bd93aeef0573c58c9aee665dc43fdfd1f77a1f}
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -41,8 +43,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"
@@ -60,17 +62,10 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$SRCVERSION
-
-# The upstream tarball will be named differently, depending on
-# the file being downloaded manually (web browser) or with wget.
-if [ -e $CWD/$SRCVERSION.tar.gz ]; then
-  tar xvzf $CWD/$SRCVERSION.tar.gz
-else
-  tar xvzf $CWD/$PRGNAM-$SRCVERSION.tar.gz
-fi
+rm -rf $PRGNAM-$SRCVER
+tar xvzf $CWD/$PRGNAM-$SRCVER.tar.gz
 
-cd $PRGNAM-$SRCVERSION/trunk/$PRGNAM
+cd $PRGNAM-$SRCVER/trunk/$PRGNAM
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -78,6 +73,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Prepare for configuration and building.
 mkdir m4
 autoreconf --force --install
 intltoolize --force
@@ -101,7 +97,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" \
 PRGMAN=$PKG/usr/man/man1
 PRGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
 
-# Compress man page and install documentation.
+# Compress man page, install documentation.
 gzip -9 $PRGMAN/$PRGNAM.1
 mkdir -p $PRGDOC
 cp -a ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL README $PRGDOC/
diff --git a/multimedia/ucview/ucview.info b/multimedia/ucview/ucview.info
index 72db971022..097f68a245 100644
--- a/multimedia/ucview/ucview.info
+++ b/multimedia/ucview/ucview.info
@@ -1,7 +1,7 @@
 PRGNAM="ucview"
 VERSION="20150221"
 HOMEPAGE="https://github.com/unicap"
-DOWNLOAD="https://github.com/unicap/ucview/archive/29bd93aeef0573c58c9aee665dc43fdfd1f77a1f.tar.gz"
+DOWNLOAD="https://github.com/unicap/ucview/archive/29bd93aeef0573c58c9aee665dc43fdfd1f77a1f/ucview-29bd93aeef0573c58c9aee665dc43fdfd1f77a1f.tar.gz"
 MD5SUM="fa690066c543ba9beb8c294466eed4b4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""