[SCM] MLT multimedia framework packaging branch, master, updated. debian/0.7.4-2-1-g04c7c18

[Patrick Matthäi]

The following commit has been merged in the master branch:
commit 04c7c184ece8f672007e04f148f7df86fc4f16ae
Author: Patrick Matthäi <pmatthaei at debian.org>
Date:   Fri Aug 26 20:54:43 2011 +0200

    * Add patch from Stephane Fillod, to enable motionest on all architectures.
      Closes: #638622
---
 debian/changelog |    7 +++++++
 debian/rules     |    7 ++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 77a0a64..0acb865 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mlt (0.7.4-3) UNRELEASED; urgency=low
+
+  * Add patch from Stephane Fillod, to enable motionest on all architectures.
+    Closes: #638622
+
+ -- Patrick Matthäi <pmatthaei at debian.org>  Fri, 26 Aug 2011 20:53:29 +0200
+
 mlt (0.7.4-2) unstable; urgency=low
 
   * Add patch 01-kfbsd-ftbfs, to fix an FTBFS on GNU/kFreeBSD.
diff --git a/debian/rules b/debian/rules
index 4d7deda..d592bd3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,15 +2,16 @@
 
 export DEB_BUILD_HARDENING=1
 
-# Enable motion estimation, MMX and SSE on amd64 architecture
+# Enable MMX and SSE on amd64 architecture
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), "amd64"))
-	EXTRA_CONFIGURE_OPTS += --enable-motion_est --enable-mmx --enable-sse
+	EXTRA_CONFIGURE_OPTS += --enable-mmx --enable-sse
 else
-	EXTRA_CONFIGURE_OPTS += --disable-motion_est --disable-mmx --disable-sse --disable-sse2
+	EXTRA_CONFIGURE_OPTS += --disable-mmx --disable-sse --disable-sse2
 endif
 
 DEB_CONFIGURE_EXTRA_FLAGS := \
 	--enable-gpl \
+	--enable-motion_est \
 	$(EXTRA_CONFIGURE_OPTS) \
 	--avformat-shared=/usr \
 	--avformat-swscale \

-- 
MLT multimedia framework packaging