[SCM] MLT multimedia framework packaging branch, master, updated. debian/0.9.0-2-6-g68ae3f0

[Patrick Matthäi]

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

The following commit has been merged in the master branch:
commit eda2ca4048ca558c6c0583d0e095163451c67ebe
Author: Patrick Matthäi <pmatthaei at debian.org>
Date:   Fri Jan 3 11:46:02 2014 +0100

    * Add upstream patch 03-freetype-ftbfs to fix a FTBFS.
      Closes: #733375
---
 debian/changelog                      |  4 +++-
 debian/patches/03-freetype-ftbfs.diff | 26 ++++++++++++++++++++++++++
 debian/patches/series                 |  1 +
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index abe6a52..44e6703 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
-mlt (0.9.0-3) UNRELEASED; urgency=low
+mlt (0.9.0-3) UNRELEASED; urgency=high
 
   * Bump Standards-Version to 3.9.5 (no changes needed).
   * Don't explicitly request xz compression - dpkg 1.17 does this by default.
   * Overwrite debian-watch-may-check-gpg-signature warning. There is no GPG
     signature available.
+  * Add upstream patch 03-freetype-ftbfs to fix a FTBFS.
+    Closes: #733375
 
  -- Patrick Matthäi <pmatthaei at debian.org>  Thu, 31 Oct 2013 10:46:56 +0100
 
diff --git a/debian/patches/03-freetype-ftbfs.diff b/debian/patches/03-freetype-ftbfs.diff
new file mode 100644
index 0000000..13a0ba3
--- /dev/null
+++ b/debian/patches/03-freetype-ftbfs.diff
@@ -0,0 +1,26 @@
+# Upstream patch to fix FTBFS with newer freetype versions.
+# Closes: #733375
+
+diff -Naur mlt-0.9.0.orig/src/modules/gtk2/Makefile mlt-0.9.0/src/modules/gtk2/Makefile
+--- mlt-0.9.0.orig/src/modules/gtk2/Makefile	2013-06-03 05:34:35.000000000 +0200
++++ mlt-0.9.0/src/modules/gtk2/Makefile	2014-01-03 11:43:13.518109987 +0100
+@@ -37,6 +37,7 @@
+ OBJS += producer_count.o
+ OBJS += filter_dynamictext.o
+ CFLAGS += `pkg-config $(PKGCONFIG_PREFIX) --cflags pangoft2`
++CFLAGS += `pkg-config --cflags-only-I freetype2 | sed 's/ *$$//g')`/freetype
+ LDFLAGS += `pkg-config $(PKGCONFIG_PREFIX) --libs pangoft2`
+ ifeq ($(targetos),Darwin)
+ LDFLAGS += -liconv
+diff -Naur mlt-0.9.0.orig/src/modules/gtk2/producer_pango.c mlt-0.9.0/src/modules/gtk2/producer_pango.c
+--- mlt-0.9.0.orig/src/modules/gtk2/producer_pango.c	2013-06-03 05:34:35.000000000 +0200
++++ mlt-0.9.0/src/modules/gtk2/producer_pango.c	2014-01-03 11:41:10.270113314 +0100
+@@ -25,7 +25,7 @@
+ #include <string.h>
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+ #include <pango/pangoft2.h>
+-#include <freetype/freetype.h>
++#include <freetype.h>
+ #include <iconv.h>
+ #include <pthread.h>
+ #include <ctype.h>
diff --git a/debian/patches/series b/debian/patches/series
index abc7af8..cf09355 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01-changed-preset-path.diff
+03-freetype-ftbfs.diff

-- 
MLT multimedia framework packaging