[SCM] MLT multimedia framework packaging branch, master, updated. debian/0.8.0-4-6-gdcf6369
Patrick Matthäi
pmatthaei at alioth.debian.org
Sat Sep 1 11:33:54 UTC 2012
Gitweb-URL: http://git.debian.org/?p=pkg-kde/krap/mlt.git;a=commitdiff;h=893f8b4
The following commit has been merged in the master branch:
commit 893f8b4d58df1eee463774702b7e9f66db80e17e
Author: Patrick Matthäi <pmatthaei at debian.org>
Date: Sat Sep 1 13:20:23 2012 +0200
* New upstream release.
- Refresh hunky patch 01-changed-preset-path.
- Remove merged patch 02-allow-file-prefix.
- Remove merged patch 03-audio-limits-and-crash.
- Remove merged patch 04-cache-memory-leak.
- Remove merged patch 05-ladspa-crash.
---
debian/changelog | 11 +++++++
debian/patches/01-changed-preset-path.diff | 14 ++++----
debian/patches/02-allow-file-prefix.diff | 40 -------------------------
debian/patches/03-audio-limits-and-crash.diff | 32 --------------------
debian/patches/04-cache-memory-leak.diff | 35 ---------------------
debian/patches/05-ladspa-crash.diff | 14 ---------
debian/patches/series | 4 --
7 files changed, 18 insertions(+), 132 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3b7baa1..2d44247 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+mlt (0.8.2-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ - Refresh hunky patch 01-changed-preset-path.
+ - Remove merged patch 02-allow-file-prefix.
+ - Remove merged patch 03-audio-limits-and-crash.
+ - Remove merged patch 04-cache-memory-leak.
+ - Remove merged patch 05-ladspa-crash.
+
+ -- Patrick Matthäi <pmatthaei at debian.org> Sat, 01 Sep 2012 13:15:22 +0200
+
mlt (0.8.0-4) unstable; urgency=low
* Add upstream patch 04-cache-memory-leak, which fixes a memory leak when
diff --git a/debian/patches/01-changed-preset-path.diff b/debian/patches/01-changed-preset-path.diff
index 6cb98b1..65989ae 100644
--- a/debian/patches/01-changed-preset-path.diff
+++ b/debian/patches/01-changed-preset-path.diff
@@ -4,9 +4,9 @@
# /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
+diff -Naur mlt-0.8.2.orig/src/modules/avformat/configure mlt-0.8.2/src/modules/avformat/configure
+--- mlt-0.8.2.orig/src/modules/avformat/configure 2012-08-28 18:25:58.000000000 +0200
++++ mlt-0.8.2/src/modules/avformat/configure 2012-09-01 13:16:41.656242197 +0200
@@ -86,7 +86,7 @@
then
if [ -d "$static_ffmpeg" ]
@@ -16,10 +16,10 @@ diff -Naur mlt-0.8.0.orig/src/modules/avformat/configure mlt-0.8.0/src/modules/a
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 @@
+diff -Naur mlt-0.8.2.orig/src/modules/avformat/consumer_avformat.c mlt-0.8.2/src/modules/avformat/consumer_avformat.c
+--- mlt-0.8.2.orig/src/modules/avformat/consumer_avformat.c 2012-08-28 18:25:58.000000000 +0200
++++ mlt-0.8.2/src/modules/avformat/consumer_avformat.c 2012-09-01 13:16:41.656242197 +0200
+@@ -732,12 +732,12 @@
AVCodec *codec = avcodec_find_encoder( c->codec_id );
if ( codec )
{
diff --git a/debian/patches/02-allow-file-prefix.diff b/debian/patches/02-allow-file-prefix.diff
deleted file mode 100644
index 481938e..0000000
--- a/debian/patches/02-allow-file-prefix.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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/03-audio-limits-and-crash.diff b/debian/patches/03-audio-limits-and-crash.diff
deleted file mode 100644
index 48a5d95..0000000
--- a/debian/patches/03-audio-limits-and-crash.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-# melt/libav may crash if you supply invalid audio bitrates.
-# Closes: #681319
-
-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-07-13 20:27:19.692559127 +0200
-+++ mlt-0.8.0/src/modules/avformat/consumer_avformat.c 2012-07-13 20:34:17.714427055 +0200
-@@ -668,6 +668,7 @@
- else
- {
- mlt_log_warning( NULL, "%s: Unable to encode audio - disabling audio output.
", __FILE__ );
-+ audio_input_frame_size = 0;
- }
-
- return audio_input_frame_size;
-@@ -1405,7 +1406,17 @@
- audio_input_frame_size = open_audio( properties, oc, audio_st[i], audio_outbuf_size,
- acodec? acodec : NULL );
- if ( !audio_input_frame_size )
-+ {
-+ // Remove the audio stream from the output context
-+ int j;
-+ for ( j = 0; j < oc->nb_streams; j++ )
-+ {
-+ if ( oc->streams[j] == audio_st[i] )
-+ av_freep( &oc->streams[j] );
-+ }
-+ --oc->nb_streams;
- audio_st[i] = NULL;
-+ }
- }
-
- // Setup custom I/O if redirecting
diff --git a/debian/patches/04-cache-memory-leak.diff b/debian/patches/04-cache-memory-leak.diff
deleted file mode 100644
index d7c64a3..0000000
--- a/debian/patches/04-cache-memory-leak.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-# Upstream patch to fix a memory leak when using mlt_cache for frames.
-
-diff -Naur mlt-0.8.0.orig/src/framework/mlt_cache.c mlt-0.8.0/src/framework/mlt_cache.c
---- mlt-0.8.0.orig/src/framework/mlt_cache.c 2012-06-01 22:51:32.000000000 +0200
-+++ mlt-0.8.0/src/framework/mlt_cache.c 2012-08-28 20:27:03.371711652 +0200
-@@ -83,6 +83,7 @@
- {
- int count; /**< the number of items currently in the cache */
- int size; /**< the maximum number of items permitted in the cache <= \p MAX_CACHE_SIZE */
-+ int is_frames; /**< indicates if this cache is used to cache frames */
- void* *current; /**< pointer to the current array of pointers */
- void* A[ MAX_CACHE_SIZE ];
- void* B[ MAX_CACHE_SIZE ];
-@@ -122,6 +123,13 @@
- {
- char key[19];
-
-+ if ( cache->is_frames )
-+ {
-+ // Frame caches are easy - just close the object as mlt_frame.
-+ mlt_frame_close( object );
-+ return;
-+ }
-+
- // Fetch the cache item from the active list by its owner's address
- sprintf( key, "%p", object );
- mlt_cache_item item = mlt_properties_get_data( cache->active, key, NULL );
-@@ -554,6 +562,7 @@
-
- // swap the current array
- cache->current = (void**) alt;
-+ cache->is_frames = 1;
- pthread_mutex_unlock( &cache->mutex );
- }
-
diff --git a/debian/patches/05-ladspa-crash.diff b/debian/patches/05-ladspa-crash.diff
deleted file mode 100644
index 2038158..0000000
--- a/debian/patches/05-ladspa-crash.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-# Upstream patch to fix some LADSPA crashing on dlclose on some systems.
-
-diff -Naur mlt-0.8.0.orig/src/modules/jackrack/plugin_mgr.c mlt-0.8.0/src/modules/jackrack/plugin_mgr.c
---- mlt-0.8.0.orig/src/modules/jackrack/plugin_mgr.c 2012-06-01 22:51:32.000000000 +0200
-+++ mlt-0.8.0/src/modules/jackrack/plugin_mgr.c 2012-08-28 20:32:35.782841105 +0200
-@@ -80,7 +80,7 @@
- int err;
-
- /* open the object file */
-- dl_handle = dlopen (filename, RTLD_LAZY);
-+ dl_handle = dlopen (filename, RTLD_NOW);
- if (!dl_handle)
- {
- mlt_log_info( NULL, "%s: error opening shared object file '%s': %s
",
diff --git a/debian/patches/series b/debian/patches/series
index fd2dabd..abc7af8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1 @@
01-changed-preset-path.diff
-02-allow-file-prefix.diff
-03-audio-limits-and-crash.diff
-04-cache-memory-leak.diff
-05-ladspa-crash.diff
--
MLT multimedia framework packaging
More information about the pkg-kde-commits
mailing list