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

Wed Feb 4 12:07:47 UTC 2009

Author: fabo
Date: 2009-02-04 12:07:46 +0000 (Wed, 04 Feb 2009)
New Revision: 13743

Modified:
   krap/mlt/trunk/debian/changelog
   krap/mlt/trunk/debian/patches/02_update_have_mmx.diff
   krap/mlt/trunk/debian/patches/03_update_prefix_data.diff
   krap/mlt/trunk/debian/patches/04_update_install_target.diff
   krap/mlt/trunk/debian/patches/05_update_docs.diff
   krap/mlt/trunk/debian/patches/06_disable_example.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
Log:
Update mlt to 0.3.6 and upload to experimental.


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

--- krap/mlt/trunk/debian/changelog	2009-02-04 09:10:27 UTC (rev 13742)
+++ krap/mlt/trunk/debian/changelog	2009-02-04 12:07:46 UTC (rev 13743)
@@ -1,18 +1,17 @@
-mlt (0.3.4-1) UNRELEASED; urgency=low
+mlt (0.3.6-1) experimental; urgency=low
 
-  UNRELEASED - targeted to experimental
   [ Fathi Boudra ]
   * 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.
+      We need version >= 0.svn20081115 from Debian experimental.
   * Update debian/rules:
     - Enable motion estimation, MMX and SSE on amd64 architecture.
 
   [ Patrick Matthäi ]
-  * Recommend from libmlt1 on libmlt-data, because some apps also need
+  * Recommend from libmlt1 on libmlt-data, because some applications also need
     the mlt profiles.
   * Fix copyright-with-old-dh-make-debian-copyright.
     Thanks lintian.
@@ -21,7 +20,7 @@
   * Remove not needed .dirs files.
   * Remove some useless newlines at EOF.
 
- -- Fathi Boudra <fabo at debian.org>  Wed, 31 Dec 2008 17:13:39 +0100
+ -- Fathi Boudra <fabo at debian.org>  Wed, 04 Feb 2009 12:07:14 +0100
 
 mlt (0.3.2-2) unstable; urgency=low
 

Modified: krap/mlt/trunk/debian/patches/02_update_have_mmx.diff
===================================================================
--- krap/mlt/trunk/debian/patches/02_update_have_mmx.diff	2009-02-04 09:10:27 UTC (rev 13742)
+++ krap/mlt/trunk/debian/patches/02_update_have_mmx.diff	2009-02-04 12:07:46 UTC (rev 13743)
@@ -51,7 +51,7 @@
  	
 --- a/src/modules/gtk2/pixops.c
 +++ b/src/modules/gtk2/pixops.c
-@@ -63,7 +63,7 @@
+@@ -63,7 +63,7 @@ typedef void ( *PixopsPixelFunc ) ( guch
  /* mmx function declarations */
  #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 );
@@ -60,7 +60,7 @@
  #endif
  
  static inline int
-@@ -719,7 +719,7 @@
+@@ -719,7 +719,7 @@ yuv422_scale ( guchar *dest_buf,
  	PixopsLineFunc line_func;
  
  #if defined(USE_MMX) && !defined(ARCH_X86_64)

Modified: krap/mlt/trunk/debian/patches/03_update_prefix_data.diff
===================================================================
--- krap/mlt/trunk/debian/patches/03_update_prefix_data.diff	2009-02-04 09:10:27 UTC (rev 13742)
+++ krap/mlt/trunk/debian/patches/03_update_prefix_data.diff	2009-02-04 12:07:46 UTC (rev 13743)
@@ -1,11 +1,11 @@
 --- a/src/framework/mlt_factory.c
 +++ b/src/framework/mlt_factory.c
-@@ -26,7 +26,7 @@
- #include <string.h>
- 
+@@ -30,7 +30,7 @@
+ /** the default subdirectory of the libdir for holding modules (plugins) */
  #define PREFIX_LIB LIBDIR "/mlt"
+ /** the default subdirectory of the install prefix for holding module (plugin) data */
 -#define PREFIX_DATA PREFIX "/share/mlt"
 +#define PREFIX_DATA PREFIX "/lib/mlt"
  
- /** Singleton repositories
- */
+ 
+ /** holds the full path to the modules directory - initialized and retained for the entire session */

Modified: krap/mlt/trunk/debian/patches/04_update_install_target.diff
===================================================================
--- krap/mlt/trunk/debian/patches/04_update_install_target.diff	2009-02-04 09:10:27 UTC (rev 13742)
+++ krap/mlt/trunk/debian/patches/04_update_install_target.diff	2009-02-04 12:07:46 UTC (rev 13743)
@@ -1,6 +1,6 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -52,7 +52,7 @@
+@@ -52,7 +52,7 @@ uninstall:
  		$(MAKE) DESTDIR=$(DESTDIR) -C $$subdir $@ || exit 1; \
  	done
  	rm -rf "$(DESTDIR)$(prefix)/include/mlt"
@@ -11,7 +11,7 @@
  	[ -d "mlt-$(version)" ] && rm -rf "mlt-$(version)" || echo
 --- a/src/modules/westley/Makefile
 +++ b/src/modules/westley/Makefile
-@@ -30,7 +30,7 @@
+@@ -30,7 +30,7 @@ clean:	
  
  install: all
  	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
@@ -22,7 +22,7 @@
  include .depend
 --- a/src/modules/fezzik/Makefile
 +++ b/src/modules/fezzik/Makefile
-@@ -28,8 +28,8 @@
+@@ -28,8 +28,8 @@ clean:	
  
  install: all
  	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
@@ -35,7 +35,7 @@
  include .depend
 --- a/src/modules/avformat/Makefile
 +++ b/src/modules/avformat/Makefile
-@@ -69,13 +69,13 @@
+@@ -69,13 +69,13 @@ clean:	
  
  install: all
  	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
@@ -54,7 +54,7 @@
  include .depend
 --- a/src/modules/core/Makefile
 +++ b/src/modules/core/Makefile
-@@ -55,7 +55,7 @@
+@@ -55,7 +55,7 @@ clean:	
  
  install: all
  	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
@@ -65,7 +65,7 @@
  include .depend
 --- a/src/modules/feeds/Makefile
 +++ b/src/modules/feeds/Makefile
-@@ -9,7 +9,7 @@
+@@ -9,7 +9,7 @@ distclean:
  clean:
  
  install:	all
@@ -79,7 +79,7 @@
 +	install -m 644 NTSC/*.* $(DESTDIR)$(libdir)/mlt/feeds/NTSC
 --- a/src/framework/Makefile
 +++ b/src/framework/Makefile
-@@ -90,15 +90,15 @@
+@@ -92,15 +92,15 @@ install:
  	ln -sf $(TARGET) $(DESTDIR)$(libdir)/$(NAME)
  	install -d "$(DESTDIR)$(prefix)/include/mlt/framework"
  	install -m 644 $(INCS) "$(DESTDIR)$(prefix)/include/mlt/framework"

Modified: krap/mlt/trunk/debian/patches/05_update_docs.diff
===================================================================
--- krap/mlt/trunk/debian/patches/05_update_docs.diff	2009-02-04 09:10:27 UTC (rev 13742)
+++ krap/mlt/trunk/debian/patches/05_update_docs.diff	2009-02-04 12:07:46 UTC (rev 13743)
@@ -1,6 +1,6 @@
 --- a/docs/install.txt
 +++ b/docs/install.txt
-@@ -154,7 +154,7 @@
+@@ -154,7 +154,7 @@ Installation
  
  	The modules produce a shared object per module and update text files
  	containing a list of modules provided by this build. These are installed 
@@ -9,7 +9,7 @@
  	install additional support files. 
  	
  	To allow the development of external components, mlt-config and scripts 
-@@ -164,7 +164,7 @@
+@@ -164,7 +164,7 @@ Installation
  	module is loaded unless explicitly requested via server configuration
  	or usage.
  
@@ -20,7 +20,7 @@
  
 --- a/docs/westley.txt
 +++ b/docs/westley.txt
-@@ -15,7 +15,7 @@
+@@ -15,7 +15,7 @@ Preamble:
  
  	If you just want to go straight to the DTD, then see 
  	mlt/src/modules/westley/westley.dtd, which gets installed at 

Modified: krap/mlt/trunk/debian/patches/06_disable_example.diff
===================================================================
--- krap/mlt/trunk/debian/patches/06_disable_example.diff	2009-02-04 09:10:27 UTC (rev 13742)
+++ krap/mlt/trunk/debian/patches/06_disable_example.diff	2009-02-04 12:07:46 UTC (rev 13743)
@@ -1,6 +1,6 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -2,8 +2,6 @@
+@@ -2,8 +2,6 @@ SUBDIRS = src/framework \
  		  src/inigo \
  		  src/valerie \
  		  src/miracle \

Modified: krap/mlt/trunk/debian/patches/07_custom_ldflags.diff
===================================================================
--- krap/mlt/trunk/debian/patches/07_custom_ldflags.diff	2009-02-04 09:10:27 UTC (rev 13742)
+++ krap/mlt/trunk/debian/patches/07_custom_ldflags.diff	2009-02-04 12:07:46 UTC (rev 13743)
@@ -1,6 +1,6 @@
 --- a/configure
 +++ b/configure
-@@ -76,6 +76,7 @@
+@@ -76,6 +76,7 @@ build_config()
  		[ "$(uname -m)" = "x86_64" ] && echo "ARCH_X86_64=1" && echo "CFLAGS+=-DARCH_X86_64"
  		echo "OPTIMISATIONS+=-ffast-math"
  		echo "CFLAGS+=-pthread"

Modified: krap/mlt/trunk/debian/patches/08_add_missing_ldlags.diff
===================================================================
--- krap/mlt/trunk/debian/patches/08_add_missing_ldlags.diff	2009-02-04 09:10:27 UTC (rev 13742)
+++ krap/mlt/trunk/debian/patches/08_add_missing_ldlags.diff	2009-02-04 12:07:46 UTC (rev 13743)
@@ -1,6 +1,6 @@
 --- a/src/miracle/Makefile
 +++ b/src/miracle/Makefile
-@@ -32,7 +32,7 @@
+@@ -32,7 +32,7 @@ OBJS = $(APP_OBJS) $(LIB_OBJS)
  
  CFLAGS += -I.. $(RDYNAMIC)
  
@@ -11,7 +11,7 @@
  
 --- a/src/modules/normalize/Makefile
 +++ b/src/modules/normalize/Makefile
-@@ -7,7 +7,7 @@
+@@ -7,7 +7,7 @@ OBJS = factory.o \
  
  CFLAGS += -I../..
  
@@ -22,7 +22,7 @@
  
 --- a/src/modules/plus/Makefile
 +++ b/src/modules/plus/Makefile
-@@ -11,7 +11,7 @@
+@@ -11,7 +11,7 @@ OBJS = factory.o \
  
  CFLAGS += -I../..
  
@@ -33,7 +33,7 @@
  
 --- a/src/modules/sdl/Makefile
 +++ b/src/modules/sdl/Makefile
-@@ -20,7 +20,7 @@
+@@ -20,7 +20,7 @@ CFLAGS +=-I../.. `sdl-config --cflags`
  
  LDFLAGS +=`sdl-config --libs`
  
@@ -44,7 +44,7 @@
  OBJS += producer_sdl_image.o
 --- a/src/modules/effectv/Makefile
 +++ b/src/modules/effectv/Makefile
-@@ -9,7 +9,7 @@
+@@ -9,7 +9,7 @@ OBJS = factory.o \
  
  CFLAGS += -I../..
  
@@ -55,7 +55,7 @@
  
 --- a/src/modules/dv/Makefile
 +++ b/src/modules/dv/Makefile
-@@ -10,7 +10,7 @@
+@@ -10,7 +10,7 @@ CFLAGS += `pkg-config --cflags libdv` -I
  
  LDFLAGS += `pkg-config --libs libdv`
  
@@ -66,7 +66,7 @@
  
 --- a/src/modules/avformat/Makefile
 +++ b/src/modules/avformat/Makefile
-@@ -29,7 +29,7 @@
+@@ -29,7 +29,7 @@ CFLAGS+=-I../..
  
  LDFLAGS+=-L../../framework
  
@@ -77,7 +77,7 @@
  	CFLAGS+=-DSWSCALE
 --- a/src/modules/jackrack/Makefile
 +++ b/src/modules/jackrack/Makefile
-@@ -21,7 +21,7 @@
+@@ -21,7 +21,7 @@ LDFLAGS += `pkg-config --libs jack`
  LDFLAGS += `xml2-config --libs`
  LDFLAGS += `pkg-config glib-2.0 --libs`
  
@@ -88,7 +88,7 @@
  
 --- a/src/modules/core/Makefile
 +++ b/src/modules/core/Makefile
-@@ -32,7 +32,7 @@
+@@ -32,7 +32,7 @@ ASM_OBJS = 
  
  CFLAGS += -I../..
  
@@ -99,7 +99,7 @@
  
 --- a/src/modules/motion_est/Makefile
 +++ b/src/modules/motion_est/Makefile
-@@ -12,7 +12,7 @@
+@@ -12,7 +12,7 @@ OBJS = factory.o \
  
  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	2009-02-04 09:10:27 UTC (rev 13742)
+++ krap/mlt/trunk/debian/patches/09_add_gcc4.3_support.diff	2009-02-04 12:07:46 UTC (rev 13743)
@@ -24,7 +24,7 @@
  
 --- a/src/modules/kino/filehandler.cc
 +++ b/src/modules/kino/filehandler.cc
-@@ -23,7 +23,7 @@
+@@ -23,7 +23,7 @@ extern "C" {
  #include <framework/mlt_frame.h>
  }
  
@@ -35,7 +35,7 @@
  #include <iomanip>
 --- a/configure
 +++ b/configure
-@@ -76,7 +76,7 @@
+@@ -76,7 +76,7 @@ build_config()
  		[ "$(uname -m)" = "x86_64" ] && echo "ARCH_X86_64=1" && echo "CFLAGS+=-DARCH_X86_64"
  		echo "OPTIMISATIONS+=-ffast-math"
  		echo "CFLAGS+=-pthread"

Modified: krap/mlt/trunk/debian/patches/10_fix_xine_module_cflags.diff
===================================================================
--- krap/mlt/trunk/debian/patches/10_fix_xine_module_cflags.diff	2009-02-04 09:10:27 UTC (rev 13742)
+++ krap/mlt/trunk/debian/patches/10_fix_xine_module_cflags.diff	2009-02-04 12:07:46 UTC (rev 13743)
@@ -1,6 +1,6 @@
 --- a/src/modules/xine/Makefile
 +++ b/src/modules/xine/Makefile
-@@ -10,7 +10,7 @@
+@@ -10,7 +10,7 @@ ifdef MMX_FLAGS
  OBJS += cpu_accel.o
  endif
  


