rev 13090 - in krap/mlt/trunk/debian: . patches

Wed Dec 31 19:33:41 UTC 2008

Author: fabo
Date: 2008-12-31 19:33:36 +0000 (Wed, 31 Dec 2008)
New Revision: 13090

Removed:
   krap/mlt/trunk/debian/patches/11_add_sox_14.2.0_support.diff
Modified:
   krap/mlt/trunk/debian/changelog
   krap/mlt/trunk/debian/control
   krap/mlt/trunk/debian/patches/02_update_have_mmx.diff
   krap/mlt/trunk/debian/patches/04_update_install_target.diff
   krap/mlt/trunk/debian/patches/07_custom_ldflags.diff
   krap/mlt/trunk/debian/patches/08_add_missing_ldlags.diff
   krap/mlt/trunk/debian/patches/09_add_gcc4.3_support.diff
   krap/mlt/trunk/debian/patches/10_fix_xine_module_cflags.diff
   krap/mlt/trunk/debian/patches/series
   krap/mlt/trunk/debian/rules
Log:
  * New upstream release.
  * Refresh patches.
  * Remove 11_add_sox_14.2.0_support.diff patch. Merged upstream.
  * Update debian/control:
    - Add version dependency to ffmpeg.
      We need version 0.svn20081115 from Debian experimental.
  * Update debian/rules:
    - Enable motion estimation, MMX and SSE on amd64 architecture.


Modified: krap/mlt/trunk/debian/changelog
===================================================================

--- krap/mlt/trunk/debian/changelog	2008-12-31 19:30:28 UTC (rev 13089)
+++ krap/mlt/trunk/debian/changelog	2008-12-31 19:33:36 UTC (rev 13090)
@@ -1,3 +1,18 @@
+mlt (0.3.4-1) UNRELEASED; urgency=low
+
+  UNRELEASED - targeted to experimental
+
+  * New upstream release.
+  * Refresh patches.
+  * Remove 11_add_sox_14.2.0_support.diff patch. Merged upstream.
+  * Update debian/control:
+    - Add version dependency to ffmpeg.
+      We need version 0.svn20081115 from Debian experimental.
+  * Update debian/rules:
+    - Enable motion estimation, MMX and SSE on amd64 architecture.
+
+ -- Fathi Boudra <fabo at debian.org>  Wed, 31 Dec 2008 17:13:39 +0100
+
 mlt (0.3.2-2) unstable; urgency=low
 
   * Add Patrick Matthäi as co-maintainer.

Modified: krap/mlt/trunk/debian/control
===================================================================
--- krap/mlt/trunk/debian/control	2008-12-31 19:30:28 UTC (rev 13089)
+++ krap/mlt/trunk/debian/control	2008-12-31 19:33:36 UTC (rev 13090)
@@ -2,7 +2,7 @@
 Priority: optional
 Maintainer: Fathi Boudra <fabo at debian.org>
 Uploaders: Patrick Matthäi <patrick.matthaei at web.de>
-Build-Depends: cdbs, debhelper (>= 6), quilt, ffmpeg, imagemagick,
+Build-Depends: cdbs, debhelper (>= 6), quilt, ffmpeg (>= 0.svn20081115), imagemagick,
  kdelibs5-dev, ladspa-sdk, libavdevice-dev, libavformat-dev, libdv4-dev,
  libgtk2.0-dev, libjack-dev, libquicktime-dev, libsamplerate-dev,
  libsdl1.2-dev, libsox-dev (>= 14.1.0), libswscale-dev, libvorbis-dev,

Modified: krap/mlt/trunk/debian/patches/02_update_have_mmx.diff
===================================================================
--- krap/mlt/trunk/debian/patches/02_update_have_mmx.diff	2008-12-31 19:30:28 UTC (rev 13089)
+++ krap/mlt/trunk/debian/patches/02_update_have_mmx.diff	2008-12-31 19:33:36 UTC (rev 13090)
@@ -53,7 +53,7 @@
 +++ b/src/modules/gtk2/pixops.c
 @@ -63,7 +63,7 @@
  /* mmx function declarations */
- #ifdef USE_MMX
+ #if defined(USE_MMX) && !defined(ARCH_X86_64)
  guchar *pixops_scale_line_22_yuv_mmx ( guint32 weights[ 16 ][ 8 ], guchar *p, guchar *q1, guchar *q2, int x_step, guchar *p_stop, int x_init, int destx );
 -int pixops_have_mmx ( void );
 +int _pixops_have_mmx ( void );
@@ -63,7 +63,7 @@
 @@ -719,7 +719,7 @@
  	PixopsLineFunc line_func;
  
- #ifdef USE_MMX
+ #if defined(USE_MMX) && !defined(ARCH_X86_64)
 -	gboolean found_mmx = pixops_have_mmx();
 +	gboolean found_mmx = _pixops_have_mmx();
  #endif

Modified: krap/mlt/trunk/debian/patches/04_update_install_target.diff
===================================================================
--- krap/mlt/trunk/debian/patches/04_update_install_target.diff	2008-12-31 19:30:28 UTC (rev 13089)
+++ krap/mlt/trunk/debian/patches/04_update_install_target.diff	2008-12-31 19:33:36 UTC (rev 13090)
@@ -35,7 +35,7 @@
  include .depend
 --- a/src/modules/avformat/Makefile
 +++ b/src/modules/avformat/Makefile
-@@ -57,12 +57,12 @@
+@@ -69,13 +69,13 @@
  
  install: all
  	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
@@ -45,15 +45,16 @@
 +	install -m 644 producer_avformat.yml "$(DESTDIR)$(libdir)/mlt/avformat"
  
  uninstall:
- 	rm "$(DESTDIR)$(libdir)/mlt/libmltavformat$(LIBSUF)"
--	rm -rf "$(DESTDIR)$(prefix)/share/mlt/avformat" 
-+	rm -rf "$(DESTDIR)$(libdir)/mlt/avformat" 
+ 	rm "$(DESTDIR)$(libdir)/mlt/libmltavformat$(LIBSUF)" 2> /dev/null || true
+ 	rm "$(DESTDIR)$(libdir)/mlt/libmltffmpeg$(LIBSUF)" 2> /dev/null || true
+-	rm -rf "$(DESTDIR)$(prefix)/share/mlt/avformat"
++	rm -rf "$(DESTDIR)$(libdir)/mlt/avformat"
  
  ifneq ($(wildcard .depend),)
  include .depend
 --- a/src/modules/core/Makefile
 +++ b/src/modules/core/Makefile
-@@ -54,7 +54,7 @@
+@@ -55,7 +55,7 @@
  
  install: all
  	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"

Modified: krap/mlt/trunk/debian/patches/07_custom_ldflags.diff
===================================================================
--- krap/mlt/trunk/debian/patches/07_custom_ldflags.diff	2008-12-31 19:30:28 UTC (rev 13089)
+++ krap/mlt/trunk/debian/patches/07_custom_ldflags.diff	2008-12-31 19:33:36 UTC (rev 13090)
@@ -1,7 +1,7 @@
 --- a/configure
 +++ b/configure
-@@ -70,6 +70,7 @@
- 		Linux)
+@@ -76,6 +76,7 @@
+ 		[ "$(uname -m)" = "x86_64" ] && echo "ARCH_X86_64=1" && echo "CFLAGS+=-DARCH_X86_64"
  		echo "OPTIMISATIONS+=-ffast-math"
  		echo "CFLAGS+=-pthread"
 +		echo "LDFLAGS+= -Wl,--no-undefined -Wl,--as-needed"

Modified: krap/mlt/trunk/debian/patches/08_add_missing_ldlags.diff
===================================================================
--- krap/mlt/trunk/debian/patches/08_add_missing_ldlags.diff	2008-12-31 19:30:28 UTC (rev 13089)
+++ krap/mlt/trunk/debian/patches/08_add_missing_ldlags.diff	2008-12-31 19:33:36 UTC (rev 13090)
@@ -66,7 +66,7 @@
  
 --- a/src/modules/avformat/Makefile
 +++ b/src/modules/avformat/Makefile
-@@ -17,7 +17,7 @@
+@@ -29,7 +29,7 @@
  
  LDFLAGS+=-L../../framework
  
@@ -88,7 +88,7 @@
  
 --- a/src/modules/core/Makefile
 +++ b/src/modules/core/Makefile
-@@ -31,7 +31,7 @@
+@@ -32,7 +32,7 @@
  
  CFLAGS += -I../..
  

Modified: krap/mlt/trunk/debian/patches/09_add_gcc4.3_support.diff
===================================================================
--- krap/mlt/trunk/debian/patches/09_add_gcc4.3_support.diff	2008-12-31 19:30:28 UTC (rev 13089)
+++ krap/mlt/trunk/debian/patches/09_add_gcc4.3_support.diff	2008-12-31 19:33:36 UTC (rev 13090)
@@ -35,8 +35,8 @@
  #include <iomanip>
 --- a/configure
 +++ b/configure
-@@ -70,7 +70,7 @@
- 		Linux)
+@@ -76,7 +76,7 @@
+ 		[ "$(uname -m)" = "x86_64" ] && echo "ARCH_X86_64=1" && echo "CFLAGS+=-DARCH_X86_64"
  		echo "OPTIMISATIONS+=-ffast-math"
  		echo "CFLAGS+=-pthread"
 -		echo "LDFLAGS+= -Wl,--no-undefined -Wl,--as-needed"

Modified: krap/mlt/trunk/debian/patches/10_fix_xine_module_cflags.diff
===================================================================
--- krap/mlt/trunk/debian/patches/10_fix_xine_module_cflags.diff	2008-12-31 19:30:28 UTC (rev 13089)
+++ krap/mlt/trunk/debian/patches/10_fix_xine_module_cflags.diff	2008-12-31 19:33:36 UTC (rev 13090)
@@ -1,8 +1,8 @@
 --- a/src/modules/xine/Makefile
 +++ b/src/modules/xine/Makefile
-@@ -7,7 +7,7 @@
- 	   cpu_accel.o \
- 	   filter_deinterlace.o
+@@ -10,7 +10,7 @@
+ OBJS += cpu_accel.o
+ endif
  
 -CFLAGS += -I../../ -DARCH_X86
 +CFLAGS += -I../../

Deleted: krap/mlt/trunk/debian/patches/11_add_sox_14.2.0_support.diff

Modified: krap/mlt/trunk/debian/patches/series
===================================================================
--- krap/mlt/trunk/debian/patches/series	2008-12-31 19:30:28 UTC (rev 13089)
+++ krap/mlt/trunk/debian/patches/series	2008-12-31 19:33:36 UTC (rev 13090)
@@ -7,4 +7,3 @@
 08_add_missing_ldlags.diff
 09_add_gcc4.3_support.diff
 10_fix_xine_module_cflags.diff
-11_add_sox_14.2.0_support.diff

Modified: krap/mlt/trunk/debian/rules
===================================================================
--- krap/mlt/trunk/debian/rules	2008-12-31 19:30:28 UTC (rev 13089)
+++ krap/mlt/trunk/debian/rules	2008-12-31 19:33:36 UTC (rev 13090)
@@ -5,25 +5,16 @@
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-# Enable motion estimation on amd64, ia64, i386 and powerpc architectures
-#ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), "amd64 ia64 i386 powerpc"))
-#	EXTRA_CONFIGURE_OPTS += --enable-motion_est
-#else
-#	EXTRA_CONFIGURE_OPTS += --disable-motion_est
-#endif
+# Enable motion estimation, 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
+else
+	EXTRA_CONFIGURE_OPTS += --disable-motion_est --disable-mmx --disable-sse
+endif
 
-# Enable MMX on amd64 and ia64 architectures
-#ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), "amd64 ia64"))
-#	EXTRA_CONFIGURE_OPTS += --enable-mmx
-#else
-#	EXTRA_CONFIGURE_OPTS += --disable-mmx
-#endif
-
 DEB_CONFIGURE_EXTRA_FLAGS := \
 	--enable-gpl \
 	$(EXTRA_CONFIGURE_OPTS) \
-	--disable-motion_est \
-	--disable-mmx \
 	--avformat-shared=/usr \
 	--avformat-swscale \
 	--luma-compress \


