[SCM] MLT multimedia framework packaging branch, master, updated. debian/0.8.0-1-1-g07edc86

[Patrick Matthäi]

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

The following commit has been merged in the master branch:
commit 07edc866d4b1f7f45e1033265a50540f0b03be17
Author: Patrick Matthäi <pmatthaei at debian.org>
Date:   Thu Jul 12 21:52:00 2012 +0200

    * Add patch 01-changes-preset-path, which corrects the path to the changed
      location of the preset files.
      Closes: #681339
---
 debian/changelog                           |   10 +++++++-
 debian/patches/01-changes-preset-path.diff |   36 ++++++++++++++++++++++++++++
 debian/patches/series                      |    1 +
 3 files changed, 46 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 86cd1fd..04cd66f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,14 @@
+mlt (0.8.0-2) UNRELEASED; urgency=low
+
+  * Add patch 01-changes-preset-path, which corrects the path to the changed
+    location of the preset files.
+    Closes: #681339
+
+ -- Patrick Matthäi <pmatthaei at debian.org>  Thu, 12 Jul 2012 21:49:53 +0200
+
 mlt (0.8.0-1) unstable; urgency=low
 
-  * New upstreeam release.a
+  * New upstreeam release.
     - Adjust lintian overrides.
 
  -- Patrick Matthäi <pmatthaei at debian.org>  Sat, 02 Jun 2012 19:44:30 +0200
diff --git a/debian/patches/01-changes-preset-path.diff b/debian/patches/01-changes-preset-path.diff
new file mode 100644
index 0000000..6cb98b1
--- /dev/null
+++ b/debian/patches/01-changes-preset-path.diff
@@ -0,0 +1,36 @@
+# 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.8.0.orig/src/modules/avformat/configure mlt-0.8.0/src/modules/avformat/configure
+--- mlt-0.8.0.orig/src/modules/avformat/configure	2012-06-01 22:51:32.000000000 +0200
++++ mlt-0.8.0/src/modules/avformat/configure	2012-07-12 21:41:31.506776608 +0200
+@@ -86,7 +86,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
+ 			[ $targetos = "Darwin" ] &&
+diff -Naur mlt-0.8.0.orig/src/modules/avformat/consumer_avformat.c mlt-0.8.0/src/modules/avformat/consumer_avformat.c
+--- mlt-0.8.0.orig/src/modules/avformat/consumer_avformat.c	2012-06-01 22:51:32.000000000 +0200
++++ mlt-0.8.0/src/modules/avformat/consumer_avformat.c	2012-07-12 21:42:49.242780570 +0200
+@@ -731,12 +731,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
new file mode 100644
index 0000000..c15098c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-changes-preset-path.diff

-- 
MLT multimedia framework packaging