From 116227b9da7745cef3601c00f901b24ff22bd16b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Thu, 26 Dec 2013 16:02:29 +0100
Subject: [PATCH] Fix FTBFS with libfreetype6 >= 2.5.x

---
 src/modules/gtk2/Makefile         | 2 +-
 src/modules/gtk2/config.h         | 4 ----
 src/modules/gtk2/config.mak       | 4 ----
 src/modules/gtk2/configure        | 7 +++++++
 src/modules/gtk2/producer_pango.c | 2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)
 delete mode 100644 src/modules/gtk2/config.h
 delete mode 100644 src/modules/gtk2/config.mak

diff --git a/src/modules/gtk2/Makefile b/src/modules/gtk2/Makefile
index bb4eb96..2d59081 100644
--- a/src/modules/gtk2/Makefile
+++ b/src/modules/gtk2/Makefile
@@ -27,7 +27,7 @@ CFLAGS += `pkg-config pangoft2 --cflags`
 LDFLAGS += `pkg-config pangoft2 --libs`
 endif
 
-CFLAGS += -I../..
+CFLAGS += -I../.. $(FT2_INCS)
 LDFLAGS+=-L../../framework -lmlt
 
 SRCS := $(OBJS:.o=.c)
diff --git a/src/modules/gtk2/config.h b/src/modules/gtk2/config.h
deleted file mode 100644
index c1fcb54..0000000
--- a/src/modules/gtk2/config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-
-#define USE_GTK2
-#define USE_PIXBUF
-#define USE_PANGO
diff --git a/src/modules/gtk2/config.mak b/src/modules/gtk2/config.mak
deleted file mode 100644
index e3f3560..0000000
--- a/src/modules/gtk2/config.mak
+++ /dev/null
@@ -1,4 +0,0 @@
-
-USE_GTK2=1
-USE_PIXBUF=1
-USE_PANGO=1
diff --git a/src/modules/gtk2/configure b/src/modules/gtk2/configure
index d6c7f3f..50e357d 100755
--- a/src/modules/gtk2/configure
+++ b/src/modules/gtk2/configure
@@ -38,6 +38,13 @@ then
 	[ "$disable_pixbuf" = "0" ] && echo "gtkrescale		libmltgtk2$LIBSUF" >> ../filters.dat
 	[ "$disable_gtk2" = "0" ] && echo "gtk2_preview	libmltgtk2$LIBSUF" >> ../consumers.dat
 
+	FT2_INCS=`pkg-config freetype2 --cflags-only-I`
+	FT2_INCS=${FT2_INCS%% *}
+	if [ -d "${FT2_INCS#-I}/freetype" ]; then
+		FT2_INCS="$FT2_INCS/freetype"
+	fi
+	echo "FT2_INCS=$FT2_INCS" >> config.mak
+
 	exit 0
 fi
 
diff --git a/src/modules/gtk2/producer_pango.c b/src/modules/gtk2/producer_pango.c
index b841c95..5d0d145 100644
--- a/src/modules/gtk2/producer_pango.c
+++ b/src/modules/gtk2/producer_pango.c
@@ -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>