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

[Patrick Matthäi]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/krap/mlt.git;a=commitdiff;h=452059e

The following commit has been merged in the master branch:
commit 452059e64a00675b2e417b19e21a864f83a56211
Author: Patrick Matthäi <pmatthaei at debian.org>
Date:   Wed Jul 8 11:11:47 2015 +0200

    * Switch from libav back to ffmpeg.
---
 debian/changelog                           |  6 +++++
 debian/control                             |  8 +++----
 debian/patches/01-changed-preset-path.diff | 36 ------------------------------
 debian/patches/series                      |  1 -
 debian/rules                               |  1 -
 5 files changed, 10 insertions(+), 42 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4a3524b..61dfa02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mlt (0.9.6-2) UNRELEASED; urgency=low
+
+  * Switch from libav back to ffmpeg.
+
+ -- Patrick Matthäi <pmatthaei at debian.org>  Wed, 08 Jul 2015 11:11:24 +0200
+
 mlt (0.9.6-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index d07078a..b925e2d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,13 @@ Priority: optional
 Maintainer: Fathi Boudra <fabo at debian.org>
 Uploaders: Patrick Matthäi <pmatthaei at debian.org>
 Build-Depends: debhelper (>= 9),
- libav-tools,
+ ffmpeg,
  kdelibs5-dev,
  libqt4-dev,
  libqt4-opengl-dev,
  ladspa-sdk,
- libavdevice-dev,
- libavformat-dev,
+ libavdevice-ffmpeg-dev,
+ libavformat-ffmpeg-dev,
  libdv4-dev,
  libgtk2.0-dev,
  libjack-dev,
@@ -17,7 +17,7 @@ Build-Depends: debhelper (>= 9),
  libsamplerate-dev,
  libsdl1.2-dev,
  libsox-dev (>= 14.3.0),
- libswscale-dev,
+ libswscale-ffmpeg-dev,
  libvorbis-dev,
  libxine2-dev,
  libxml2-dev,
diff --git a/debian/patches/01-changed-preset-path.diff b/debian/patches/01-changed-preset-path.diff
deleted file mode 100644
index 7a3224f..0000000
--- a/debian/patches/01-changed-preset-path.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-# The path and naming schema of the preset files has been changed from:
-# /usr/share/ffpresets/*.ffpreset
-# to:
-# /usr/share/avconv/*.avpreset
-# Closes: #681339
-
-diff -Naur mlt-0.9.2.orig/src/modules/avformat/configure mlt-0.9.2/src/modules/avformat/configure
---- mlt-0.9.2.orig/src/modules/avformat/configure	2014-06-29 22:23:17.000000000 +0200
-+++ mlt-0.9.2/src/modules/avformat/configure	2014-07-09 09:40:26.572402187 +0200
-@@ -84,7 +84,7 @@
- 	then 
- 		if [ -d "$static_ffmpeg" ]
- 		then
--			echo "CFLAGS+=-DAVDATADIR=\\"${static_ffmpeg}/ffpresets/\\"" >> config.mak
-+			echo "CFLAGS+=-DAVDATADIR=\\"${static_ffmpeg}/avconv/\\"" >> config.mak
- 			echo "CFLAGS+=-I$static_ffmpeg" >> config.mak
- 			echo "LDFLAGS+=-L$static_ffmpeg/libavformat -L$static_ffmpeg/libavcodec -L$static_ffmpeg/libavutil" >> config.mak
- 			echo "LDFLAGS+=-L$static_ffmpeg/libswscale" >> config.mak
-diff -Naur mlt-0.9.2.orig/src/modules/avformat/consumer_avformat.c mlt-0.9.2/src/modules/avformat/consumer_avformat.c
---- mlt-0.9.2.orig/src/modules/avformat/consumer_avformat.c	2014-06-29 22:23:17.000000000 +0200
-+++ mlt-0.9.2/src/modules/avformat/consumer_avformat.c	2014-07-09 09:40:26.572402187 +0200
-@@ -805,12 +805,12 @@
- 				AVCodec *codec = avcodec_find_encoder( c->codec_id );
- 				if ( codec )
- 				{
--					char *path = malloc( strlen(AVDATADIR) + strlen(codec->name) + strlen(vpre) + strlen(".ffpreset") + 2 );
-+					char *path = malloc( strlen(AVDATADIR) + strlen(codec->name) + strlen(vpre) + strlen(".avpreset") + 2 );
- 					strcpy( path, AVDATADIR );
- 					strcat( path, codec->name );
- 					strcat( path, "-" );
- 					strcat( path, vpre );
--					strcat( path, ".ffpreset" );
-+					strcat( path, ".avpreset" );
- 					
- 					mlt_properties_close( p );
- 					p = mlt_properties_load( path );
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index abc7af8..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01-changed-preset-path.diff
diff --git a/debian/rules b/debian/rules
index c5132f8..08ef29d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,6 @@ DEB_CONFIGURE_EXTRA_FLAGS := \
 	--enable-motion_est \
 	$(EXTRA_CONFIGURE_OPTS) \
 	--avformat-shared=/usr \
-	--avformat-swscale \
 	--swig-languages=python \
 	--qimage-libdir=/usr/lib \
 	--disable-rtaudio \

-- 
MLT multimedia framework packaging