multimedia/openshot: Updated for version 2.1.0. New maintainer

Signed-off-by: Christoph Willing <chris.willing@iinet.net.au>

3 files changed, 26 insertions, 24 deletions

diff --git a/multimedia/openshot/README b/multimedia/openshot/README
index b6d19443cb..56c23f7172 100644
--- a/multimedia/openshot/README
+++ b/multimedia/openshot/README
@@ -2,6 +2,9 @@ OpenShot Video Editor is a free, open-source, non-linear video editor.
 It can create and edit videos and movies using many popular video,
 audio, and image formats.
 
-blender is an optional dependency (for animated titles): if you
-use it, remember to set the full path for the blender executable
-(/opt/blender/blender) in the preferences.
+Blender is an optional runtime dependency (for animated titles),
+as is inkscape. To use them, set the full paths for the blender and
+inkscape executables in the preferences menu.
+
+* Note that httplib2 (openshot REQUIRES httplib2) must have been built
+using the python3 option (by setting PYTHON3=yes in the build environment).
diff --git a/multimedia/openshot/openshot.SlackBuild b/multimedia/openshot/openshot.SlackBuild
index aeb8955005..ef0b200878 100644
--- a/multimedia/openshot/openshot.SlackBuild
+++ b/multimedia/openshot/openshot.SlackBuild
@@ -2,6 +2,8 @@
 
 # Copyright 2009, Jonathan Larsen (agentc0re), SLC, UT
 # Contact Info: agentc0re 'AT' learnix 'DOT' net
+#
+# Copyright 2016 Christoph Willing Brisbane, Australia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -38,15 +40,19 @@
 #
 # Oct 2nd, 2012
 #	Version upgrade to 1.4.3 - Matteo Bernardini <ponce@slackbuilds.org>
+#
+# Oct 22nd, 2016
+#	Version upgrade to 2.1.0 - Christoph Willing <chris.willing@linux.com>
 
 PRGNAM=openshot
-VERSION=1.4.3
+SRCNAM=openshot-qt
+VERSION=2.1.0
 BUILD=${BUILD:-1}
 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
@@ -57,8 +63,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"
@@ -77,9 +83,9 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 
 cd $TMP
-rm -rf $PRGNAM
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz  || exit 1
-cd $PRGNAM-$VERSION
+rm -rf $SRCNAM-$VERSION
+tar xf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -87,20 +93,13 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-python setup.py install --root=$PKG
+python3 setup.py install --root=$PKG
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-# mkdir -p $PKG/usr/man
-mv $PKG/usr/share/man $PKG/usr/
-rm -rf $PKG/usr/share/man
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cd $TMP/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING README \
     $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/multimedia/openshot/openshot.info b/multimedia/openshot/openshot.info
index e9a75664fc..ed985e46a7 100644
--- a/multimedia/openshot/openshot.info
+++ b/multimedia/openshot/openshot.info
@@ -1,10 +1,10 @@
 PRGNAM="openshot"
-VERSION="1.4.3"
+VERSION="2.1.0"
 HOMEPAGE="http://www.openshotvideo.com"
-DOWNLOAD="https://launchpad.net/openshot/1.4/1.4.3/+download/openshot-1.4.3.tar.gz"
-MD5SUM="5ec82a7e8b7700ee4a359458aedf19e9"
+DOWNLOAD="https://github.com/OpenShot/openshot-qt/archive/v2.1.0/openshot-qt-2.1.0.tar.gz"
+MD5SUM="51db3fb9a637b1ec2f5129b6777cc568"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="frei0r mlt pygoocanvas pyxdg"
-MAINTAINER="Matteo Bernardini"
-EMAIL="ponce@slackbuilds.org"
+REQUIRES="python3-PyQt5 python3-pyzmq libopenshot httplib2 jack-audio-connection-kit"
+MAINTAINER="Christoph Willing"
+EMAIL="chris.willing@linux.com"