rev 13744 - in krap/mlt/tags: . 0.3.6-1 0.3.6-1/debian 0.3.6-1/debian/patches

Fathi Boudra fabo at alioth.debian.org
Wed Feb 4 12:08:41 UTC 2009


Author: fabo
Date: 2009-02-04 12:08:41 +0000 (Wed, 04 Feb 2009)
New Revision: 13744

Added:
   krap/mlt/tags/0.3.6-1/
   krap/mlt/tags/0.3.6-1/debian/changelog
   krap/mlt/tags/0.3.6-1/debian/patches/02_update_have_mmx.diff
   krap/mlt/tags/0.3.6-1/debian/patches/03_update_prefix_data.diff
   krap/mlt/tags/0.3.6-1/debian/patches/04_update_install_target.diff
   krap/mlt/tags/0.3.6-1/debian/patches/05_update_docs.diff
   krap/mlt/tags/0.3.6-1/debian/patches/06_disable_example.diff
   krap/mlt/tags/0.3.6-1/debian/patches/07_custom_ldflags.diff
   krap/mlt/tags/0.3.6-1/debian/patches/08_add_missing_ldlags.diff
   krap/mlt/tags/0.3.6-1/debian/patches/09_add_gcc4.3_support.diff
   krap/mlt/tags/0.3.6-1/debian/patches/10_fix_xine_module_cflags.diff
Removed:
   krap/mlt/tags/0.3.6-1/debian/changelog
   krap/mlt/tags/0.3.6-1/debian/patches/02_update_have_mmx.diff
   krap/mlt/tags/0.3.6-1/debian/patches/03_update_prefix_data.diff
   krap/mlt/tags/0.3.6-1/debian/patches/04_update_install_target.diff
   krap/mlt/tags/0.3.6-1/debian/patches/05_update_docs.diff
   krap/mlt/tags/0.3.6-1/debian/patches/06_disable_example.diff
   krap/mlt/tags/0.3.6-1/debian/patches/07_custom_ldflags.diff
   krap/mlt/tags/0.3.6-1/debian/patches/08_add_missing_ldlags.diff
   krap/mlt/tags/0.3.6-1/debian/patches/09_add_gcc4.3_support.diff
   krap/mlt/tags/0.3.6-1/debian/patches/10_fix_xine_module_cflags.diff
Log:
Tagging mlt 0.3.6-1

Copied: krap/mlt/tags/0.3.6-1 (from rev 13741, krap/mlt/trunk)


Property changes on: krap/mlt/tags/0.3.6-1
___________________________________________________________________
Name: svn:mergeinfo
   + 

Deleted: krap/mlt/tags/0.3.6-1/debian/changelog

Copied: krap/mlt/tags/0.3.6-1/debian/changelog (from rev 13743, krap/mlt/trunk/debian/changelog)
===================================================================
--- krap/mlt/tags/0.3.6-1/debian/changelog	                        (rev 0)
+++ krap/mlt/tags/0.3.6-1/debian/changelog	2009-02-04 12:08:41 UTC (rev 13744)
@@ -0,0 +1,77 @@
+mlt (0.3.6-1) experimental; urgency=low
+
+  [ 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.
+  * Update debian/rules:
+    - Enable motion estimation, MMX and SSE on amd64 architecture.
+
+  [ Patrick Matthäi ]
+  * Recommend from libmlt1 on libmlt-data, because some applications also need
+    the mlt profiles.
+  * Fix copyright-with-old-dh-make-debian-copyright.
+    Thanks lintian.
+  * Add debian/watch file.
+  * Install the mlt-config.1 manpage about a .manpage file instead of cdbs.
+  * Remove not needed .dirs files.
+  * Remove some useless newlines at EOF.
+
+ -- Fathi Boudra <fabo at debian.org>  Wed, 04 Feb 2009 12:07:14 +0100
+
+mlt (0.3.2-2) unstable; urgency=low
+
+  * Add Patrick Matthäi as co-maintainer.
+  * Add Sox 14.2.0 support. (Closes: #507610, #509340)
+  * Update debian/rules: disable motion estimation module. (Closes: #506844)
+  * Fix lintian warning: debhelper-but-no-misc-depends.
+
+ -- Fathi Boudra <fabo at debian.org>  Mon, 29 Dec 2008 17:07:28 +0100
+
+mlt (0.3.2-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #471079, #482254, #499329)
+  * Remove 01_add_sox_14_support patch. Merged upstream.
+  * Add 10_fix_xine_module_cflags patch to fix xine module CFLAGS.
+  * Refresh patches:
+    - 03_update_prefix_data
+    - 04_update_install_target
+    - 07_custom_ldflags
+    - 08_add_missing_ldlags
+    - 09_add_gcc4.3_support
+  * Update debian/control:
+    - Build-depends on kdelibs5-dev instead of kdelibs4-dev.
+    - Build-depends on libavdevice-dev.
+    - Bump libmlt soname. libmlt1 conflicts/replaces libmlt0.2.
+  * Update debian/copyright: Add oldfilm and frei0r modules.
+  * Update installed files.
+  * Update debian/rules:
+    - Remove motion estimation option from EXTRA_CONFIGURE_OPTS.
+    - Add --qimage-libdir configure option to detect Qt 4.
+
+ -- Fathi Boudra <fabo at debian.org>  Fri, 14 Nov 2008 11:03:40 +0100
+
+mlt (0.2.4-3) unstable; urgency=low
+
+  * Update gcc-4.3 support patch. Link math library against libmltsox.
+    (Closes: #475191)
+
+ -- Fathi Boudra <fabo at debian.org>  Thu, 10 Apr 2008 11:37:46 +0200
+
+mlt (0.2.4-2) unstable; urgency=low
+
+  * Add versioned build dependency on libsox-dev >= 14.0.1-2. Previous
+    libsox-dev package doesn't contains libsfx.a and libsfx.so symlink.
+    (Closes: #469900)
+
+ -- Fathi Boudra <fabo at debian.org>  Sun, 09 Mar 2008 12:14:23 +0100
+
+mlt (0.2.4-1) unstable; urgency=low
+
+  * Initial release. (Closes: #463796)
+
+ -- Fathi Boudra <fabo at debian.org>  Sat, 26 Jan 2008 19:31:08 +0100
+

Deleted: krap/mlt/tags/0.3.6-1/debian/patches/02_update_have_mmx.diff

Copied: krap/mlt/tags/0.3.6-1/debian/patches/02_update_have_mmx.diff (from rev 13743, krap/mlt/trunk/debian/patches/02_update_have_mmx.diff)
===================================================================
--- krap/mlt/tags/0.3.6-1/debian/patches/02_update_have_mmx.diff	                        (rev 0)
+++ krap/mlt/tags/0.3.6-1/debian/patches/02_update_have_mmx.diff	2009-02-04 12:08:41 UTC (rev 13744)
@@ -0,0 +1,71 @@
+--- a/src/modules/gtk2/have_mmx.S
++++ b/src/modules/gtk2/have_mmx.S
+@@ -1,19 +1,42 @@
++/*
++ * Copyright (C) 2000 Red Hat, Inc
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the
++ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++ * Boston, MA 02111-1307, USA.
++ */
+ 	.file	"have_mmx.S"
+ 	.version	"01.01"
+ gcc2_compiled.:
+ .text
+ 	.align 16
+ 
+-#if !defined(__MINGW32__) && !defined(__CYGWIN__)	
++#if !defined(__MINGW32__) && !defined(__CYGWIN__) && !defined(__INTERIX)
+ 
+-.globl pixops_have_mmx
+-	.type	 pixops_have_mmx, at function
+-pixops_have_mmx:
++/* Magic indicating no need for an executable stack */
++#if !defined __powerpc64__ && !defined __ia64__
++.section .note.GNU-stack;  .previous
++#endif
++	
++.globl _pixops_have_mmx
++	.type	 _pixops_have_mmx, at function
++_pixops_have_mmx:
+ 
+ #else
+ 
+-.globl _pixops_have_mmx
+-_pixops_have_mmx:
++.globl __pixops_have_mmx
++__pixops_have_mmx:
+ 
+ #endif
+ 	
+--- a/src/modules/gtk2/pixops.c
++++ b/src/modules/gtk2/pixops.c
+@@ -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 );
+-int pixops_have_mmx ( void );
++int _pixops_have_mmx ( void );
+ #endif
+ 
+ static inline int
+@@ -719,7 +719,7 @@ yuv422_scale ( guchar *dest_buf,
+ 	PixopsLineFunc line_func;
+ 
+ #if defined(USE_MMX) && !defined(ARCH_X86_64)
+-	gboolean found_mmx = pixops_have_mmx();
++	gboolean found_mmx = _pixops_have_mmx();
+ #endif
+ 
+ 	//g_return_if_fail ( !( dest_channels == 3 && dest_has_alpha ) );

Deleted: krap/mlt/tags/0.3.6-1/debian/patches/03_update_prefix_data.diff

Copied: krap/mlt/tags/0.3.6-1/debian/patches/03_update_prefix_data.diff (from rev 13743, krap/mlt/trunk/debian/patches/03_update_prefix_data.diff)
===================================================================
--- krap/mlt/tags/0.3.6-1/debian/patches/03_update_prefix_data.diff	                        (rev 0)
+++ krap/mlt/tags/0.3.6-1/debian/patches/03_update_prefix_data.diff	2009-02-04 12:08:41 UTC (rev 13744)
@@ -0,0 +1,11 @@
+--- a/src/framework/mlt_factory.c
++++ b/src/framework/mlt_factory.c
+@@ -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"
+ 
+ 
+ /** holds the full path to the modules directory - initialized and retained for the entire session */

Deleted: krap/mlt/tags/0.3.6-1/debian/patches/04_update_install_target.diff

Copied: krap/mlt/tags/0.3.6-1/debian/patches/04_update_install_target.diff (from rev 13743, krap/mlt/trunk/debian/patches/04_update_install_target.diff)
===================================================================
--- krap/mlt/tags/0.3.6-1/debian/patches/04_update_install_target.diff	                        (rev 0)
+++ krap/mlt/tags/0.3.6-1/debian/patches/04_update_install_target.diff	2009-02-04 12:08:41 UTC (rev 13744)
@@ -0,0 +1,100 @@
+--- a/Makefile
++++ b/Makefile
+@@ -52,7 +52,7 @@ uninstall:
+ 		$(MAKE) DESTDIR=$(DESTDIR) -C $$subdir $@ || exit 1; \
+ 	done
+ 	rm -rf "$(DESTDIR)$(prefix)/include/mlt"
+-	rm -rf "$(DESTDIR)$(prefix)/share/mlt"
++	rm -rf "$(DESTDIR)$(prefix)/lib/mlt"
+ 
+ dist:
+ 	[ -d "mlt-$(version)" ] && rm -rf "mlt-$(version)" || echo
+--- a/src/modules/westley/Makefile
++++ b/src/modules/westley/Makefile
+@@ -30,7 +30,7 @@ clean:	
+ 
+ install: all
+ 	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
+-	install -m 644 westley.dtd "$(DESTDIR)$(prefix)/share/mlt"
++	install -m 644 westley.dtd "$(DESTDIR)$(libdir)/mlt"
+ 
+ ifneq ($(wildcard .depend),)
+ include .depend
+--- a/src/modules/fezzik/Makefile
++++ b/src/modules/fezzik/Makefile
+@@ -28,8 +28,8 @@ clean:	
+ 
+ install: all
+ 	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
+-	install -m 644 ../fezzik.dict "$(DESTDIR)$(prefix)/share/mlt"
+-	install -m 644 ../fezzik.ini "$(DESTDIR)$(prefix)/share/mlt"
++	install -m 644 ../fezzik.dict "$(DESTDIR)$(libdir)/mlt"
++	install -m 644 ../fezzik.ini "$(DESTDIR)$(libdir)/mlt"
+ 
+ ifneq ($(wildcard .depend),)
+ include .depend
+--- a/src/modules/avformat/Makefile
++++ b/src/modules/avformat/Makefile
+@@ -69,13 +69,13 @@ clean:	
+ 
+ install: all
+ 	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
+-	install -d "$(DESTDIR)$(prefix)/share/mlt/avformat"
+-	install -m 644 producer_avformat.yml "$(DESTDIR)$(prefix)/share/mlt/avformat"
++	install -d "$(DESTDIR)$(libdir)/mlt/avformat"
++	install -m 644 producer_avformat.yml "$(DESTDIR)$(libdir)/mlt/avformat"
+ 
+ uninstall:
+ 	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
+@@ -55,7 +55,7 @@ clean:	
+ 
+ install: all
+ 	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
+-	install -m 644 ../data_fx.properties "$(DESTDIR)$(prefix)/share/mlt"
++	install -m 644 ../data_fx.properties "$(DESTDIR)$(libdir)/mlt"
+ 
+ ifneq ($(wildcard .depend),)
+ include .depend
+--- a/src/modules/feeds/Makefile
++++ b/src/modules/feeds/Makefile
+@@ -9,7 +9,7 @@ distclean:
+ clean:
+ 
+ install:	all
+-	install -d $(DESTDIR)$(prefix)/share/mlt/feeds/PAL
+-	install -d $(DESTDIR)$(prefix)/share/mlt/feeds/NTSC
+-	install -m 644 PAL/*.* $(DESTDIR)$(prefix)/share/mlt/feeds/PAL
+-	install -m 644 NTSC/*.* $(DESTDIR)$(prefix)/share/mlt/feeds/NTSC
++	install -d $(DESTDIR)$(libdir)/mlt/feeds/PAL
++	install -d $(DESTDIR)$(libdir)/mlt/feeds/NTSC
++	install -m 644 PAL/*.* $(DESTDIR)$(libdir)/mlt/feeds/PAL
++	install -m 644 NTSC/*.* $(DESTDIR)$(libdir)/mlt/feeds/NTSC
+--- a/src/framework/Makefile
++++ b/src/framework/Makefile
+@@ -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"
+-	install -d "$(DESTDIR)$(prefix)/share/mlt"
+-	install -m 644 metaschema.yaml "$(DESTDIR)$(prefix)/share/mlt/"
++	install -d "$(DESTDIR)$(libdir)/mlt"
++	install -m 644 metaschema.yaml "$(DESTDIR)$(libdir)/mlt/"
+ 
+ uninstall:
+ 	rm -f "$(DESTDIR)$(libdir)/$(TARGET)"
+ 	rm -f "$(DESTDIR)$(libdir)/$(SONAME)"
+ 	rm -f "$(DESTDIR)$(libdir)/$(NAME)"
+ 	rm -rf "$(DESTDIR)$(prefix)/include/mlt/framework"
+-	rm "$(DESTDIR)$(prefix)/share/mlt/metaschema.yaml"
++	rm "$(DESTDIR)$(libdir)/mlt/metaschema.yaml"
+ 
+ ifneq ($(wildcard .depend),)
+ include .depend

Deleted: krap/mlt/tags/0.3.6-1/debian/patches/05_update_docs.diff

Copied: krap/mlt/tags/0.3.6-1/debian/patches/05_update_docs.diff (from rev 13743, krap/mlt/trunk/debian/patches/05_update_docs.diff)
===================================================================
--- krap/mlt/tags/0.3.6-1/debian/patches/05_update_docs.diff	                        (rev 0)
+++ krap/mlt/tags/0.3.6-1/debian/patches/05_update_docs.diff	2009-02-04 12:08:41 UTC (rev 13744)
@@ -0,0 +1,31 @@
+--- a/docs/install.txt
++++ b/docs/install.txt
+@@ -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 
+-	in $prefix/share/mlt/modules. It is at the discretion of the module to 
++	in $prefix/lib/mlt. It is at the discretion of the module to 
+ 	install additional support files. 
+ 	
+ 	To allow the development of external components, mlt-config and scripts 
+@@ -164,7 +164,7 @@ Installation
+ 	module is loaded unless explicitly requested via server configuration
+ 	or usage.
+ 
+-	External modules are also placed in this $prefix/share/mlt/modules, and the
++	External modules are also placed in this $prefix/lib/mlt, and the
+ 	installation of those must modify the text file accordingly before they
+ 	will be considered at runtime.
+ 
+--- a/docs/westley.txt
++++ b/docs/westley.txt
+@@ -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 
+-	$(prefix)/share/mlt/modules/westley.dtd. Currently, the westley parser is
++	$(prefix)/lib/mlt/westley.dtd. Currently, the westley parser is
+ 	non-validating.
+ 
+ 

Deleted: krap/mlt/tags/0.3.6-1/debian/patches/06_disable_example.diff

Copied: krap/mlt/tags/0.3.6-1/debian/patches/06_disable_example.diff (from rev 13743, krap/mlt/trunk/debian/patches/06_disable_example.diff)
===================================================================
--- krap/mlt/tags/0.3.6-1/debian/patches/06_disable_example.diff	                        (rev 0)
+++ krap/mlt/tags/0.3.6-1/debian/patches/06_disable_example.diff	2009-02-04 12:08:41 UTC (rev 13744)
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -2,8 +2,6 @@ SUBDIRS = src/framework \
+ 		  src/inigo \
+ 		  src/valerie \
+ 		  src/miracle \
+-		  src/humperdink \
+-		  src/albino \
+ 		  src/modules \
+ 		  profiles
+ 

Deleted: krap/mlt/tags/0.3.6-1/debian/patches/07_custom_ldflags.diff

Copied: krap/mlt/tags/0.3.6-1/debian/patches/07_custom_ldflags.diff (from rev 13743, krap/mlt/trunk/debian/patches/07_custom_ldflags.diff)
===================================================================
--- krap/mlt/tags/0.3.6-1/debian/patches/07_custom_ldflags.diff	                        (rev 0)
+++ krap/mlt/tags/0.3.6-1/debian/patches/07_custom_ldflags.diff	2009-02-04 12:08:41 UTC (rev 13744)
@@ -0,0 +1,10 @@
+--- a/configure
++++ b/configure
+@@ -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"
++		echo "LDFLAGS+= -Wl,--no-undefined -Wl,--as-needed"
+ 		echo "SHFLAGS=-shared"
+ 		echo "LIBDL=-ldl"
+ 		echo "RDYNAMIC=-rdynamic"

Deleted: krap/mlt/tags/0.3.6-1/debian/patches/08_add_missing_ldlags.diff

Copied: krap/mlt/tags/0.3.6-1/debian/patches/08_add_missing_ldlags.diff (from rev 13743, krap/mlt/trunk/debian/patches/08_add_missing_ldlags.diff)
===================================================================
--- krap/mlt/tags/0.3.6-1/debian/patches/08_add_missing_ldlags.diff	                        (rev 0)
+++ krap/mlt/tags/0.3.6-1/debian/patches/08_add_missing_ldlags.diff	2009-02-04 12:08:41 UTC (rev 13744)
@@ -0,0 +1,110 @@
+--- a/src/miracle/Makefile
++++ b/src/miracle/Makefile
+@@ -32,7 +32,7 @@ OBJS = $(APP_OBJS) $(LIB_OBJS)
+ 
+ CFLAGS += -I.. $(RDYNAMIC)
+ 
+-LDFLAGS += -L../valerie -lvalerie -L../framework -lmlt 
++LDFLAGS += -L../valerie -lvalerie -L../framework -lmlt -lpthread
+ 
+ SRCS := $(OBJS:.o=.c)
+ 
+--- a/src/modules/normalize/Makefile
++++ b/src/modules/normalize/Makefile
+@@ -7,7 +7,7 @@ OBJS = factory.o \
+ 
+ CFLAGS += -I../..
+ 
+-LDFLAGS+=-L../../framework -lmlt
++LDFLAGS+=-L../../framework -lmlt -lm
+ 
+ SRCS := $(OBJS:.o=.c)
+ 
+--- a/src/modules/plus/Makefile
++++ b/src/modules/plus/Makefile
+@@ -11,7 +11,7 @@ OBJS = factory.o \
+ 
+ CFLAGS += -I../..
+ 
+-LDFLAGS+=-L../../framework -lmlt
++LDFLAGS+=-L../../framework -lmlt -lm
+ 
+ SRCS := $(OBJS:.o=.c)
+ 
+--- a/src/modules/sdl/Makefile
++++ b/src/modules/sdl/Makefile
+@@ -20,7 +20,7 @@ CFLAGS +=-I../.. `sdl-config --cflags`
+ 
+ LDFLAGS +=`sdl-config --libs`
+ 
+-LDFLAGS +=-L../../framework -lmlt
++LDFLAGS +=-L../../framework -lmlt -lpthread
+ 
+ ifeq ($(WITH_SDL_IMAGE),1)
+ OBJS += producer_sdl_image.o
+--- a/src/modules/effectv/Makefile
++++ b/src/modules/effectv/Makefile
+@@ -9,7 +9,7 @@ OBJS = factory.o \
+ 
+ CFLAGS += -I../..
+ 
+-LDFLAGS+=-L../../framework -lmlt
++LDFLAGS+=-L../../framework -lmlt -lm
+ 
+ SRCS := $(OBJS:.o=.c)
+ 
+--- a/src/modules/dv/Makefile
++++ b/src/modules/dv/Makefile
+@@ -10,7 +10,7 @@ CFLAGS += `pkg-config --cflags libdv` -I
+ 
+ LDFLAGS += `pkg-config --libs libdv`
+ 
+-LDFLAGS+=-L../../framework -lmlt
++LDFLAGS+=-L../../framework -lmlt -lpthread
+ 
+ SRCS := $(OBJS:.o=.c)
+ 
+--- a/src/modules/avformat/Makefile
++++ b/src/modules/avformat/Makefile
+@@ -29,7 +29,7 @@ CFLAGS+=-I../..
+ 
+ LDFLAGS+=-L../../framework
+ 
+-LDFLAGS+=-lavformat$(AVFORMAT_SUFFIX) -lavcodec$(AVFORMAT_SUFFIX) -lavutil$(AVFORMAT_SUFFIX) -lavdevice$(AVFORMAT_SUFFIX) $(EXTRA_LIBS) -lmlt
++LDFLAGS+=-lavformat$(AVFORMAT_SUFFIX) -lavcodec$(AVFORMAT_SUFFIX) -lavutil$(AVFORMAT_SUFFIX) -lavdevice$(AVFORMAT_SUFFIX) $(EXTRA_LIBS) -lmlt -lpthread
+ 
+ ifdef SWSCALE
+ 	CFLAGS+=-DSWSCALE
+--- a/src/modules/jackrack/Makefile
++++ b/src/modules/jackrack/Makefile
+@@ -21,7 +21,7 @@ LDFLAGS += `pkg-config --libs jack`
+ LDFLAGS += `xml2-config --libs`
+ LDFLAGS += `pkg-config glib-2.0 --libs`
+ 
+-LDFLAGS+=-L../../framework -lmlt
++LDFLAGS+=-L../../framework -lmlt -ldl -lm
+ 
+ SRCS := $(OBJS:.o=.c)
+ 
+--- a/src/modules/core/Makefile
++++ b/src/modules/core/Makefile
+@@ -32,7 +32,7 @@ ASM_OBJS = 
+ 
+ CFLAGS += -I../..
+ 
+-LDFLAGS+=-L../../framework -lmlt
++LDFLAGS+=-L../../framework -lmlt -lm -lpthread
+ 
+ SRCS := $(OBJS:.o=.c)
+ 
+--- a/src/modules/motion_est/Makefile
++++ b/src/modules/motion_est/Makefile
+@@ -12,7 +12,7 @@ OBJS = factory.o \
+ 
+ CFLAGS += -I../.. 
+ 
+-LDFLAGS+=-L../../framework -lmlt
++LDFLAGS+=-L../../framework -lmlt -lm
+ 
+ SRCS := $(OBJS:.o=.c)
+ 

Deleted: krap/mlt/tags/0.3.6-1/debian/patches/09_add_gcc4.3_support.diff

Copied: krap/mlt/tags/0.3.6-1/debian/patches/09_add_gcc4.3_support.diff (from rev 13743, krap/mlt/trunk/debian/patches/09_add_gcc4.3_support.diff)
===================================================================
--- krap/mlt/tags/0.3.6-1/debian/patches/09_add_gcc4.3_support.diff	                        (rev 0)
+++ krap/mlt/tags/0.3.6-1/debian/patches/09_add_gcc4.3_support.diff	2009-02-04 12:08:41 UTC (rev 13744)
@@ -0,0 +1,46 @@
+--- a/src/modules/kino/kino_wrapper.cc
++++ b/src/modules/kino/kino_wrapper.cc
+@@ -20,8 +20,8 @@
+ 
+ #include "config.h"
+ 
+-#include <string.h>
+-#include <stdlib.h>
++#include <cstring>
++#include <cstdlib>
+ 
+ #include "kino_wrapper.h"
+ #include "filehandler.h"
+--- a/src/modules/kino/avi.cc
++++ b/src/modules/kino/avi.cc
+@@ -21,7 +21,7 @@
+ 
+ // C++ includes
+ 
+-#include <string>
++#include <cstring>
+ #include <iostream>
+ #include <iomanip>
+ 
+--- a/src/modules/kino/filehandler.cc
++++ b/src/modules/kino/filehandler.cc
+@@ -23,7 +23,7 @@ extern "C" {
+ #include <framework/mlt_frame.h>
+ }
+ 
+-#include <string>
++#include <cstring>
+ #include <iostream>
+ #include <sstream>
+ #include <iomanip>
+--- a/configure
++++ b/configure
+@@ -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"
+-		echo "LDFLAGS+= -Wl,--no-undefined -Wl,--as-needed"
++		echo "LDFLAGS+= -Wl,--no-undefined -Wl,--as-needed -lm"
+ 		echo "SHFLAGS=-shared"
+ 		echo "LIBDL=-ldl"
+ 		echo "RDYNAMIC=-rdynamic"

Deleted: krap/mlt/tags/0.3.6-1/debian/patches/10_fix_xine_module_cflags.diff

Copied: krap/mlt/tags/0.3.6-1/debian/patches/10_fix_xine_module_cflags.diff (from rev 13743, krap/mlt/trunk/debian/patches/10_fix_xine_module_cflags.diff)
===================================================================
--- krap/mlt/tags/0.3.6-1/debian/patches/10_fix_xine_module_cflags.diff	                        (rev 0)
+++ krap/mlt/tags/0.3.6-1/debian/patches/10_fix_xine_module_cflags.diff	2009-02-04 12:08:41 UTC (rev 13744)
@@ -0,0 +1,11 @@
+--- a/src/modules/xine/Makefile
++++ b/src/modules/xine/Makefile
+@@ -10,7 +10,7 @@ ifdef MMX_FLAGS
+ OBJS += cpu_accel.o
+ endif
+ 
+-CFLAGS += -I../../ -DARCH_X86
++CFLAGS += -I../../
+ 
+ LDFLAGS+=-L../../framework -lmlt
+ 




More information about the pkg-kde-commits mailing list