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

[Patrick Matthäi]

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

The following commit has been merged in the master branch:
commit 7dcc486ef3a52011d5363be6b64d58a08da0264e
Author: Patrick Matthäi <pmatthaei at debian.org>
Date:   Fri Jul 13 20:39:10 2012 +0200

    * Add patch 02-allow-file-prefix, which adds the file:// prefix support.
      Closes: #677276
---
 debian/changelog                         |    2 +
 debian/patches/02-allow-file-prefix.diff |   40 ++++++++++++++++++++++++++++++
 debian/patches/series                    |    1 +
 3 files changed, 43 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 18fdd05..23dd25f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ mlt (0.8.0-2) UNRELEASED; urgency=low
   * Add patch 01-changed-preset-path, which corrects the path to the changed
     location of the preset files.
     Closes: #681339
+  * Add patch 02-allow-file-prefix, which adds the file:// prefix support.
+    Closes: #677276
 
  -- Patrick Matthäi <pmatthaei at debian.org>  Thu, 12 Jul 2012 21:49:53 +0200
 
diff --git a/debian/patches/02-allow-file-prefix.diff b/debian/patches/02-allow-file-prefix.diff
new file mode 100644
index 0000000..481938e
--- /dev/null
+++ b/debian/patches/02-allow-file-prefix.diff
@@ -0,0 +1,40 @@
+# Kdenlive may produce rendering scripts with enabled plugins, which use the
+# file:// prefix. However melt normaly do not support them, so they are now
+# available for the SOURCE variable.
+# Closes: #677276
+
+diff -Naur mlt-0.8.0.orig/src/modules/core/producer_loader.c mlt-0.8.0/src/modules/core/producer_loader.c
+--- mlt-0.8.0.orig/src/modules/core/producer_loader.c	2012-06-01 22:51:32.000000000 +0200
++++ mlt-0.8.0/src/modules/core/producer_loader.c	2012-07-13 20:31:26.785453360 +0200
+@@ -90,11 +90,16 @@
+ 			p ++;
+ 		}
+ 
++		// Strip file:// prefix
++		p = lookup;
++		if ( strncmp( lookup, "file://", 7 ) == 0 )
++			p += 7;
++
+ 		// Iterate through the dictionary
+ 		for ( i = 0; result == NULL && i < mlt_properties_count( dictionary ); i ++ )
+ 		{
+ 			char *name = mlt_properties_get_name( dictionary, i );
+-			if ( fnmatch( name, lookup, 0 ) == 0 )
++			if ( fnmatch( name, p, 0 ) == 0 )
+ 				result = create_from( profile, file, mlt_properties_get_value( dictionary, i ) );
+ 		}	
+ 
+diff -Naur mlt-0.8.0.orig/src/modules/xml/producer_xml.c mlt-0.8.0/src/modules/xml/producer_xml.c
+--- mlt-0.8.0.orig/src/modules/xml/producer_xml.c	2012-06-01 22:51:32.000000000 +0200
++++ mlt-0.8.0/src/modules/xml/producer_xml.c	2012-07-13 20:31:26.789453250 +0200
+@@ -1535,6 +1535,10 @@
+ 	char *filename = NULL;
+ 	int info = strcmp( id, "xml-string" ) ? 0 : 1;
+ 
++	// Strip file:// prefix
++	if ( data && strlen( data ) >= 7 && strncmp( data, "file://", 7 ) == 0 )
++		data += 7;
++
+ 	if ( data == NULL || !strcmp( data, "" ) || ( info == 0 && !file_exists( data ) ) )
+ 		return NULL;
+ 
diff --git a/debian/patches/series b/debian/patches/series
index abc7af8..921375a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01-changed-preset-path.diff
+02-allow-file-prefix.diff

-- 
MLT multimedia framework packaging