[SCM] MLT multimedia framework packaging branch, master, updated. debian/0.9.0+dfsg1-1-7-g6e14850

[Patrick Matthäi]

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

The following commit has been merged in the master branch:
commit 92e45227278f8f013b274e8e2c74912ab75e8475
Author: Patrick Matthäi <pmatthaei at debian.org>
Date:   Wed Jul 9 09:43:51 2014 +0200

    - Remove merged patch 02-crash-empty-ladspa-path.
---
 debian/changelog                               |  1 +
 debian/patches/02-crash-empty-ladspa-path.diff | 18 ------------------
 debian/patches/series                          |  1 -
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eefbff8..35c63cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mlt (0.9.2-1) UNRELEASED; urgency=medium
 
   * New upstream release.
     - Refresh hunky patch 01-changed-preset-path.
+    - Remove merged patch 02-crash-empty-ladspa-path.
     - Remove merged patch 03-freetype-ftbfs.
   * Overwrite lintian warning intra-source-package-circular-dependency, because
     those dependencies are required.
diff --git a/debian/patches/02-crash-empty-ladspa-path.diff b/debian/patches/02-crash-empty-ladspa-path.diff
deleted file mode 100644
index 1b8f80d..0000000
--- a/debian/patches/02-crash-empty-ladspa-path.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-# Upstream patch to fix crash if LADSPA_PATH is empty.
-# Closes: #726197
-
-diff -Naur mlt-0.9.0.orig/src/modules/jackrack/plugin_mgr.c mlt-0.9.0/src/modules/jackrack/plugin_mgr.c
---- mlt-0.9.0.orig/src/modules/jackrack/plugin_mgr.c	2013-06-03 05:34:35.000000000 +0200
-+++ mlt-0.9.0/src/modules/jackrack/plugin_mgr.c	2013-10-17 14:49:57.147889337 +0200
-@@ -237,10 +237,8 @@
-     ladspa_path = g_strdup ("/usr/local/lib/ladspa:/usr/lib/ladspa:/usr/lib64/ladspa");
- #endif
-   
--  dir = strtok (ladspa_path, ":");
--  do
-+  for (dir = strtok (ladspa_path, ":"); dir; dir = strtok (NULL, ":"))
-     plugin_mgr_get_dir_plugins (plugin_mgr, dir);
--  while ((dir = strtok (NULL, ":")));
- 
-   g_free (ladspa_path);
- }
diff --git a/debian/patches/series b/debian/patches/series
index 67ed1a9..abc7af8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 01-changed-preset-path.diff
-02-crash-empty-ladspa-path.diff

-- 
MLT multimedia framework packaging