multimedia/flowblade: Updated for version 24564a.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 38 insertions, 11 deletions

diff --git a/multimedia/flowblade/flowblade.SlackBuild b/multimedia/flowblade/flowblade.SlackBuild
index ed11fd5307..2929c54152 100644
--- a/multimedia/flowblade/flowblade.SlackBuild
+++ b/multimedia/flowblade/flowblade.SlackBuild
@@ -11,7 +11,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=flowblade
-VERSION=${VERSION:-1.16}
+VERSION=${VERSION:-24564a}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -50,7 +50,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-PYTHONDIR=$(python -c "import sys, os; print os.path.join('/usr/lib${LIBDIRSUFFIX}', 'python%s' % sys.version[:3], 'site-packages')")
+PYTHONDIR=$(python3 -c "import sys, os; print(os.path.join('/usr/lib${LIBDIRSUFFIX}', 'python%s' % sys.version[:3], 'site-packages'))")
 
 set -e
 
@@ -58,8 +58,12 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+mkdir $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz --strip-components=1 \
+    -C $PRGNAM-$VERSION
+mv $PRGNAM-$VERSION/README.md $PRGNAM-$VERSION/$PRGNAM-trunk
 cd $PRGNAM-$VERSION/$PRGNAM-trunk
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -67,10 +71,11 @@ 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 {} \;
 
-patch -p2 < $CWD/495a10c83b7d209bfdb1577efaf718e031ec6f25.patch
+# this has been submitted upstream but for now patch it here
+patch -p2 < $CWD/mlt7.patch
 
 # install
-python setup.py install --root=$PKG
+python3 setup.py install --root=$PKG
 
 # replace PY path in main script
 sed -i "s|/usr/share/pyshared|$PYTHONDIR|" $PKG/usr/bin/$PRGNAM
@@ -91,8 +96,9 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 # doc
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+echo `pwd`
 cp -a \
-    PKG-INFO README \
+   AUTHORS COPYING README.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/multimedia/flowblade/flowblade.info b/multimedia/flowblade/flowblade.info
index 4f18df68b9..7dffd05e9d 100644
--- a/multimedia/flowblade/flowblade.info
+++ b/multimedia/flowblade/flowblade.info
@@ -1,10 +1,10 @@
 PRGNAM="flowblade"
-VERSION="1.16"
+VERSION="24564a"
 HOMEPAGE="https://github.com/jliljebl/flowblade/"
-DOWNLOAD="https://github.com/jliljebl/flowblade/archive/v1.16/flowblade-1.16.tar.gz"
-MD5SUM="71490e33fd7c2d44e96de5b59b88121f"
+DOWNLOAD="https://github.com/jliljebl/flowblade/archive/24564a/flowblade-24564a.tar.gz"
+MD5SUM="ededb19439e16588f2490b2f77c66848"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="gnome-python ladspa_sdk numpy"
+REQUIRES="mlt-bindings"
 MAINTAINER="Klaatu"
 EMAIL="klaatu@member.fsf.org"
diff --git a/multimedia/flowblade/mlt7.patch b/multimedia/flowblade/mlt7.patch
new file mode 100644
index 0000000000..9f9a1e25b9
--- /dev/null
+++ b/multimedia/flowblade/mlt7.patch
@@ -0,0 +1,21 @@
+diff --git a/flowblade-trunk/flowblade b/flowblade-trunk/flowblade
+index 01f6d092..2cdfcedb 100755
+--- a/flowblade-trunk/flowblade
++++ b/flowblade-trunk/flowblade
+@@ -58,11 +58,11 @@ sys.path.insert(0, modules_path)
+ # Check that we have MLT, missing is fatal.
+ try:
+     import mlt
+-    try:
+-        mlt_version = mlt.LIBMLT_VERSION
+-        print ("MLT found, version:", mlt_version)
+-    except:
+-        print ("MLT found but version info not available. MLT probably too old to work reliably...")
++except:
++    import mlt7 as mlt
++
++try:
++    mlt_version = mlt.LIBMLT_VERSION
+ except Exception as err:
+     print ("MLT not found, exiting...")
+     print ("ERROR:", err)
diff --git a/multimedia/flowblade/slack-desc b/multimedia/flowblade/slack-desc
index 3dce6eeae7..990662a74c 100644
--- a/multimedia/flowblade/slack-desc
+++ b/multimedia/flowblade/slack-desc
@@ -14,6 +14,6 @@ flowblade: between two existing clips - when they are inserted on the timeline.
 flowblade: It is efficient, effective, and includes powerful tools to mix,
 flowblade: filter, and affect video and audio.
 flowblade:
-flowblade: https://code.google.com/p/flowblade/
+flowblade: https://github.com/jliljebl/flowblade
 flowblade:
 flowblade: