diff -u mlt-0.3.8/debian/control mlt-0.3.8/debian/control --- mlt-0.3.8/debian/control +++ mlt-0.3.8/debian/control @@ -1,12 +1,13 @@ Source: mlt Priority: optional -Maintainer: Fathi Boudra +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Fathi Boudra Uploaders: Patrick Matthäi 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, - libxine-dev, libxml2-dev + libxine-dev, libxml2-dev, frei0r-plugins-dev Standards-Version: 3.8.1 Section: libs Homepage: http://www.mltframework.org diff -u mlt-0.3.8/debian/rules mlt-0.3.8/debian/rules --- mlt-0.3.8/debian/rules +++ mlt-0.3.8/debian/rules @@ -5,11 +5,19 @@ include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -# 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 +# Enable motion estimation on certain architectures only +ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), "amd64")) + EXTRA_CONFIGURE_OPTS += --disable-motion_est +endif + +# Enable MMX on certain architectures only +ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), "amd64")) + EXTRA_CONFIGURE_OPTS += --disable-mmx +endif + +# Enable SSE support on certain architectures only +ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), "i386 amd64 lpia")) + EXTRA_CONFIGURE_OPTS += --disable-sse endif DEB_CONFIGURE_EXTRA_FLAGS := \ diff -u mlt-0.3.8/debian/changelog mlt-0.3.8/debian/changelog --- mlt-0.3.8/debian/changelog +++ mlt-0.3.8/debian/changelog @@ -1,3 +1,12 @@ +mlt (0.3.8-2ubuntu1) karmic; urgency=low + + * Merge from debian unstable (LP: #375622), remaining changes: + - debian/control: Add Build-Depends on frei0r-plugins-dev + - debian/patches/08_add_missing_ldlags.patch: Fix frei0r Makefile too + - debian/rules: Enable SSE on i386 and lpia too + + -- Michael Terry Wed, 13 May 2009 09:22:56 -0400 + mlt (0.3.8-2) unstable; urgency=low * Add manpage for inigo. Much thanks to Tatsuki Sugiura for his patch. @@ -18,6 +27,24 @@ -- Fathi Boudra Mon, 20 Apr 2009 20:47:32 +0200 +mlt (0.3.8-0ubuntu2) jaunty; urgency=low + + * Added frei0r-plugins-dev build-dep + * Fixed 08_add_missing_ldlags.diff for frei0or plugins + + -- Anthony Mercatante Fri, 17 Apr 2009 18:06:06 +0200 + +mlt (0.3.8-0ubuntu1) jaunty; urgency=low + + * New upstream release + * The following patches have been fixed to apply: + - 02_update_have_mmx.diff + - 03_update_prefix_data.diff + - 08_add_missing_ldlags.diff + * Closes LP: #362931 + + -- Anthony Mercatante Fri, 17 Apr 2009 16:34:36 +0200 + mlt (0.3.6-2) unstable; urgency=low * Uploading to unstable. @@ -51,6 +78,31 @@ -- Fathi Boudra Wed, 04 Feb 2009 12:07:14 +0100 +mlt (0.3.4-0ubuntu3) jaunty; urgency=low + + * No-change rebuild against libavcodec52. + + -- Steve Langasek Wed, 14 Jan 2009 00:54:00 +0000 + +mlt (0.3.4-0ubuntu2) jaunty; urgency=low + + * debian/patches/09_add_gcc4.3_support.diff: + - configure: add -lm to LDFLAGS, fix FTBFS on ppc and armel. + + -- Luca Falavigna Tue, 06 Jan 2009 12:05:39 +0100 + +mlt (0.3.4-0ubuntu1) jaunty; urgency=low + + * New upstream release. + * Adjust patches for new upstream release: + - debian/patches/02_update_have_mmx.diff + - debian/patches/04_update_install_target.diff + - debian/patches/09_add_gcc4.3_support.diff + * debian/patches/11_add_sox_14.2.0_support.diff disabled, implemented. + * Enable SSE support on i386, amd64 and lpia architectures only. + + -- Luca Falavigna Wed, 31 Dec 2008 16:33:24 +0100 + mlt (0.3.2-2) unstable; urgency=low * Add Patrick Matthäi as co-maintainer. @@ -60,6 +112,41 @@ -- Fathi Boudra Mon, 29 Dec 2008 17:07:28 +0100 +mlt (0.3.2-1ubuntu1) jaunty; urgency=low + + * Merge from Debian unstable. + * Dropped changes: + - revert the various undocumented changes to debian/rules + - restore Debian's path handling (03_update_prefix_data.diff, + 04_update_install_target.diff, 05_update_docs.diff) and drop the + Ubuntu-specific patches for this (02_path.dpatch and + 01_modules-patch.dpatch); there's no rationale for this divergence + in the changelog, and these patches don't apply properly in the + new upstream version. + - restore 06_disable_example.diff, 07_custom_ldflags.diff, + 08_add_missing_ldflags.diff, and 09_add_gcc4.3_support.diff, which + were dropped without explanation when rebasing on + debian-multimedia + - drop missing_declarations.dpatch, since this issue was already + addressed in the Debian package (09_add_gcc4.3_support.diff) + - re-merge libmiracle and libvalerie into libmlt1, no rationale is + given for this divergence + - drop build-dependencies on a large number of libraries that are + not used at all by this source: libflac-dev, libasound2-dev, + libmad0-dev, libavcodec-dev, libavutil-dev, libxcursor-dev, + libxinerama-dev, libxrandr-dev, and libxrender-dev + - drop our mlt-config manpage, the Debian package now includes one + that's nearly identical. + * Remaining changes: + - debian/copyright: Add copyright informations + - Conflict/Replace the previous ubuntu versions as needed + - include the watch file from debian-multimedia.org + * debian/patches/no-more-sox_size_t.patch: the latest upstream version + of sox no longer declares sox_size_t, so work around this by + substituting uint32_t. + + -- Steve Langasek Mon, 01 Dec 2008 14:31:01 +0000 + mlt (0.3.2-1) unstable; urgency=low * New upstream release. (Closes: #471079, #482254, #499329) @@ -83,6 +170,49 @@ -- Fathi Boudra Fri, 14 Nov 2008 11:03:40 +0100 +mlt (0.2.4.svn20071228-0.0ubuntu4) intrepid; urgency=low + + * debian/patches/missing_declarations.patch: include string.h and + stdlib.h where needed to fix a build failure due to undeclared + functions. LP: #264613. + + -- Steve Langasek Wed, 24 Sep 2008 15:19:14 +0000 + +mlt (0.2.4.svn20071228-0.0ubuntu3) intrepid; urgency=low + + * No-change rebuild against libavformat52 and libavcodec51. + + -- Steve Langasek Wed, 24 Sep 2008 09:52:46 +0000 + +mlt (0.2.4.svn20071228-0.0ubuntu2) hardy; urgency=low + + [ Murat Güneş ] + * Fixed typos in libvalerie and libmiracle descriptions (LP: #188440) + + [ Albin Tonnerre ] + * Sigh + + -- Murat Güneş Sun, 03 Feb 2008 04:03:15 +0200 + +mlt (0.2.4.svn20071228-0.0ubuntu1) hardy; urgency=low + + * Resync the package with debian-multimedia + * debian/copyright: Add copyright informations + * debian/control, *.install: Split the libraries in 3 different packages + * debian/rules + - Add shlibs informations for the other library packages + - Remove --disable ffmpeg and --disable-sox from configure flags + - Use dh_install instead of dh_movefiles, and install in debian/tmp + * debian/control + - Build-Depend on libsox-dev + - Remove the 'cvs' suffix from dependencies lib{avformat,avutil,swscale}cvs + so that we can use the libs actually in ubuntu + - Conflict/Replace the previous ubuntu versions as needed + * Add a manpage for libmlt-dev + * patches/02_path.dpatch: edit: still install the feeds files in /usr/share + + -- Albin Tonnerre Wed, 30 Jan 2008 15:13:32 +0100 + mlt (0.2.4-3) unstable; urgency=low * Update gcc-4.3 support patch. Link math library against libmltsox. diff -u mlt-0.3.8/debian/patches/08_add_missing_ldlags.diff mlt-0.3.8/debian/patches/08_add_missing_ldlags.diff --- mlt-0.3.8/debian/patches/08_add_missing_ldlags.diff +++ mlt-0.3.8/debian/patches/08_add_missing_ldlags.diff @@ -53,6 +53,17 @@ SRCS := $(OBJS:.o=.c) +--- a/src/modules/frei0r/Makefile ++++ b/src/modules/frei0r/Makefile +@@ -12,7 +12,7 @@ CFLAGS += -I../.. + + LDFLAGS += -lm + +-LDFLAGS+=-L../../framework -lmlt ++LDFLAGS+=-L../../framework -lmlt -ldl + + SRCS := $(OBJS:.o=.c) + --- a/src/modules/avformat/Makefile +++ b/src/modules/avformat/Makefile @@ -29,7 +29,7 @@ CFLAGS+=-I../..