rev 15277 - in krap/mlt/branches/new-binarys/debian: . patches

[Fathi Boudra]

Author: fabo
Date: 2009-07-13 12:30:52 +0000 (Mon, 13 Jul 2009)
New Revision: 15277

Added:
   krap/mlt/branches/new-binarys/debian/patches/01_improve_mlt_normalisation.diff
   krap/mlt/branches/new-binarys/debian/patches/02_fix_sox_14.3.0_build.diff
Modified:
   krap/mlt/branches/new-binarys/debian/changelog
   krap/mlt/branches/new-binarys/debian/patches/series
Log:
merge trunk changes


Modified: krap/mlt/branches/new-binarys/debian/changelog
===================================================================
--- krap/mlt/branches/new-binarys/debian/changelog	2009-07-13 12:27:40 UTC (rev 15276)
+++ krap/mlt/branches/new-binarys/debian/changelog	2009-07-13 12:30:52 UTC (rev 15277)
@@ -1,10 +1,18 @@
-mlt (0.4.4-2) UNRELEASED; urgency=low
+mlt (0.4.4-3) UNRELEASED; urgency=low
 
   * Build libmlt-dbg package, which contains the debugging symbols.
   * Build and install the swig modules. (Closes: #533038)
 
- -- Patrick Matthäi <pmatthaei at debian.org>  Wed, 01 Jul 2009 21:33:59 +0200
+ -- Patrick Matthäi <pmatthaei at debian.org>  Mon, 13 Jul 2009 14:07:01 +0200
 
+mlt (0.4.4-2) unstable; urgency=low
+
+  * Add patches:
+    - 01_improve_mlt_normalisation - stolen upstream.
+    - 02_fix_sox_14.3.0_build - Fix build against sox 14.3.0. (Closes: #536671)
+
+ -- Fathi Boudra <fabo at debian.org>  Mon, 13 Jul 2009 14:07:01 +0200
+
 mlt (0.4.4-1) unstable; urgency=low
 
   * New upstream release.

Added: krap/mlt/branches/new-binarys/debian/patches/01_improve_mlt_normalisation.diff
===================================================================
--- krap/mlt/branches/new-binarys/debian/patches/01_improve_mlt_normalisation.diff	                        (rev 0)
+++ krap/mlt/branches/new-binarys/debian/patches/01_improve_mlt_normalisation.diff	2009-07-13 12:30:52 UTC (rev 15277)
@@ -0,0 +1,70 @@
+From: Dan Dennedy <dan at dennedy.org>
+Date: Fri, 3 Jul 2009 21:50:14 +0000 (-0700)
+Subject: Slightly improve auto-setting MLT_NORMALISATION.
+X-Git-Url: http://mltframework.org/gitweb/mlt.git?p=mltframework.org%2Fmlt.git;p=mltframework.org%2Fmlt.git;a=commitdiff_plain;h=114ee1f810399874b21744c0deb743a6f6d258de
+
+Slightly improve auto-setting MLT_NORMALISATION.
+
+Signed-off-by: Dan Dennedy <dan at dennedy.org>
+---
+
+--- a/src/framework/mlt_profile.c
++++ b/src/framework/mlt_profile.c
+@@ -138,6 +138,26 @@ mlt_profile mlt_profile_init( const char
+ 	return profile;
+ }
+ 
++static void set_mlt_normalisation( const char *profile_name )
++{
++	if ( profile_name )
++	{
++		if ( strstr( profile_name, "_ntsc" ) ||
++		     strstr( profile_name, "_60" ) ||
++		     strstr( profile_name, "_2997" ) ||
++		     strstr( profile_name, "_30" ) )
++		{
++			mlt_environment_set( "MLT_NORMALISATION", "NTSC" );
++		}
++		else if ( strstr( profile_name, "_pal" ) ||
++		          strstr( profile_name, "_50" ) ||
++		          strstr( profile_name, "_25" ) )
++		{
++			mlt_environment_set( "MLT_NORMALISATION", "PAL" );
++		}
++	}
++}
++
+ /** Load a profile from specific file.
+  *
+  * \public \memberof mlt_profile_s
+@@ -161,6 +181,7 @@ mlt_profile mlt_profile_load_file( const
+ 			// Set MLT_PROFILE to basename
+ 			char *filename = strdup( file );
+ 			mlt_environment_set( "MLT_PROFILE", basename( filename ) );
++			set_mlt_normalisation( basename( filename ) );
+ 			free( filename );
+ 		}
+ 		mlt_properties_close( properties );
+@@ -168,21 +189,7 @@ mlt_profile mlt_profile_load_file( const
+ 
+ 	// Set MLT_NORMALISATION to appease legacy modules
+ 	char *profile_name = mlt_environment( "MLT_PROFILE" );
+-	if ( profile_name )
+-	{
+-		if ( strstr( profile_name, "_ntsc" ) ||
+-			strstr( profile_name, "_60" ) ||
+-			strstr( profile_name, "_30" ) )
+-		{
+-			mlt_environment_set( "MLT_NORMALISATION", "NTSC" );
+-		}
+-		else if ( strstr( profile_name, "_pal" ) ||
+-				strstr( profile_name, "_50" ) ||
+-				strstr( profile_name, "_25" ) )
+-		{
+-			mlt_environment_set( "MLT_NORMALISATION", "PAL" );
+-		}
+-	}
++	set_mlt_normalisation( profile_name );
+ 	return profile;
+ }
+ 

Added: krap/mlt/branches/new-binarys/debian/patches/02_fix_sox_14.3.0_build.diff
===================================================================
--- krap/mlt/branches/new-binarys/debian/patches/02_fix_sox_14.3.0_build.diff	                        (rev 0)
+++ krap/mlt/branches/new-binarys/debian/patches/02_fix_sox_14.3.0_build.diff	2009-07-13 12:30:52 UTC (rev 15277)
@@ -0,0 +1,12 @@
+--- a/src/modules/sox/filter_sox.c
++++ b/src/modules/sox/filter_sox.c
+@@ -181,6 +181,9 @@ static int create_effect( mlt_filter thi
+ 
+ static int filter_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples )
+ {
++#if (ST_LIB_VERSION_CODE >= ST_LIB_VERSION(14,3,0))
++ 	SOX_SAMPLE_LOCALS;
++#endif
+ 	// Get the properties of the frame
+ 	mlt_properties properties = MLT_FRAME_PROPERTIES( frame );
+ 

Modified: krap/mlt/branches/new-binarys/debian/patches/series
===================================================================
--- krap/mlt/branches/new-binarys/debian/patches/series	2009-07-13 12:27:40 UTC (rev 15276)
+++ krap/mlt/branches/new-binarys/debian/patches/series	2009-07-13 12:30:52 UTC (rev 15277)
@@ -1,3 +1,5 @@
+01_improve_mlt_normalisation.diff
+02_fix_sox_14.3.0_build.diff
 01_fix_perl_swig_ftbfs.diff
 02_also_build_swig_modules.diff
 10_fix_xine_module_cflags.diff