aboutsummaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/flowblade/README7
-rw-r--r--multimedia/flowblade/flowblade.SlackBuild7
-rw-r--r--multimedia/flowblade/flowblade.info6
-rw-r--r--multimedia/flowblade/gnomevfs.patch43
4 files changed, 57 insertions, 6 deletions
diff --git a/multimedia/flowblade/README b/multimedia/flowblade/README
index 1fe2269746227..6519ff3c5ea48 100644
--- a/multimedia/flowblade/README
+++ b/multimedia/flowblade/README
@@ -13,6 +13,9 @@ faster for creating programs with mostly straight cuts and audio
splits, but may be slower when programs contain complex composites
unless correct work flow is followed.
-It provides powerful tools to mix and filter video and audio.
-
Optional recommended dependencies are swh-plugins and calf.
+
+NOTE:
+This SlackBuild patches out a dependency on the gnomevfs Python
+module for mimetype detection: we use built-in Python tools instead.
+This patch has been submitted upstream and is under review for inclusion.
diff --git a/multimedia/flowblade/flowblade.SlackBuild b/multimedia/flowblade/flowblade.SlackBuild
index 8f54ae43a142f..4e64b3a67e468 100644
--- a/multimedia/flowblade/flowblade.SlackBuild
+++ b/multimedia/flowblade/flowblade.SlackBuild
@@ -9,7 +9,7 @@
# without any warranty.
PRGNAM=flowblade
-VERSION=${VERSION:-0.8.0}
+VERSION=${VERSION:-0.10.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -57,6 +57,11 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# patch out gnomevfs dependency
+# prefer urllib + mimetypes
+patch -p1 ./Flowblade/sequence.py < $CWD/gnomevfs.patch
+
+# install
python setup.py install --root=$PKG
# fix a path in the main script
diff --git a/multimedia/flowblade/flowblade.info b/multimedia/flowblade/flowblade.info
index 029a35cf2db3c..0a4efd3cbfef5 100644
--- a/multimedia/flowblade/flowblade.info
+++ b/multimedia/flowblade/flowblade.info
@@ -1,8 +1,8 @@
PRGNAM="flowblade"
-VERSION="0.8.0"
+VERSION="0.10.0"
HOMEPAGE="https://code.google.com/p/flowblade/"
-DOWNLOAD="https://flowblade.googlecode.com/files/flowblade-0.8.0.tar.gz"
-MD5SUM="77dc12495018305b30bb6d0dc675b910"
+DOWNLOAD="https://flowblade.googlecode.com/files/flowblade-0.10.0.tar.gz"
+MD5SUM="322b54beab8db142787a6d508528b1e7"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="cairomm ffmpeg frei0r gnome-python ladspa_sdk mlt"
diff --git a/multimedia/flowblade/gnomevfs.patch b/multimedia/flowblade/gnomevfs.patch
new file mode 100644
index 0000000000000..0dc747c4d8cf2
--- /dev/null
+++ b/multimedia/flowblade/gnomevfs.patch
@@ -0,0 +1,43 @@
+--- ./flowblade-0.10.0/Flowblade/sequence.py 2013-09-14 09:49:39.000000000 -0400
++++ sequence.py 2013-11-28 22:34:02.454226123 -0500
+@@ -24,7 +24,7 @@
+ """
+
+ import copy
+-import gnomevfs
++import urllib, mimetypes
+ import mlt
+ import time #added when testing
+ import types
+@@ -914,8 +914,13 @@
+ """
+ Returns media type of file.
+ """
++ # using urllib and mimetype for non gnome environments
+ try:
+- mime_type = gnomevfs.get_mime_type(file_path)
++ url = urllib.pathname2url(file_path)
++ mime_guess = mimetypes.guess_type(url)
++ mime_string = mime_guess[0]
++ mime_type = str.split(mime_string, "/")
++
+ except Exception, err:
+ if not os.path.exists(file_path):
+ # We're doing a heuristic here to identify image sequence file_paths.
+@@ -932,13 +937,13 @@
+ else:
+ return UNKNOWN
+
+- if mime_type.startswith("video"):
++ if mime_type[0] == "video":
+ return VIDEO
+
+- if mime_type.startswith("audio"):
++ if mime_type[0] == "audio":
+ return AUDIO
+
+- if mime_type.startswith("image"):
++ if mime_type[0] == "image":
+ return IMAGE
+
+ return UNKNOWN