[SCM] MLT multimedia framework packaging branch, master, updated. debian/0.8.0-2-2-g6208d01

[Patrick Matthäi]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/krap/mlt.git;a=commitdiff;h=8b4628b

The following commit has been merged in the master branch:
commit 8b4628bba032a68d6d2b47a6061a06a83115122a
Author: Patrick Matthäi <me at srv1.linux-dev.org>
Date:   Sat Jul 28 13:44:17 2012 +0200

    * Disable compression from the luma module on mips. The convert process never
      finishes.
---
 debian/changelog |    7 +++++++
 debian/rules     |    7 ++++++-
 2 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0cd32f6..a71cf59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mlt (0.8.0-3) UNRELEASED; urgency=low
+
+  * Disable compression from the luma module on mips. The convert process never
+    finishes.
+
+ -- Patrick Matthäi <pmatthaei at debian.org>  Sat, 28 Jul 2012 13:36:27 +0200
+
 mlt (0.8.0-2) unstable; urgency=low
 
   * Add patch 01-changed-preset-path, which corrects the path to the changed
diff --git a/debian/rules b/debian/rules
index 0e7d5c9..e324c8b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,11 @@ else
 	EXTRA_CONFIGURE_OPTS += --disable-mmx --disable-sse --disable-sse2
 endif
 
+# Do not enable luma compress on mips. The convert process never finishes
+ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), "mips"))
+	LUMA_CONFIGURE_OPTS += --luma-compress
+endif
+
 DEB_CONFIGURE_EXTRA_FLAGS := \
 	--enable-gpl \
 	--enable-gpl3 \
@@ -16,7 +21,7 @@ DEB_CONFIGURE_EXTRA_FLAGS := \
 	$(EXTRA_CONFIGURE_OPTS) \
 	--avformat-shared=/usr \
 	--avformat-swscale \
-	--luma-compress \
+	$(LUMA_CONFIGURE_OPTS) \
 	--swig-languages=python \
 	--qimage-libdir=/usr/lib \
 	--disable-rtaudio \

-- 
MLT multimedia framework packaging