From: Dan Dennedy Date: Mon, 30 Dec 2013 20:35:49 +0000 (-0800) Subject: Fix build on Freetype 2.5. X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=4e96e011aee9b3607791b4c9b904937ab3fe8c00;p=mlt Fix build on Freetype 2.5. Reported by Patrick Matthhai/Debian. --- diff --git a/src/modules/gtk2/Makefile b/src/modules/gtk2/Makefile index b4fb3ffe..4a3f5cb4 100644 --- a/src/modules/gtk2/Makefile +++ b/src/modules/gtk2/Makefile @@ -35,6 +35,7 @@ endif ifdef USE_PANGO OBJS += producer_pango.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 --git a/src/modules/gtk2/producer_pango.c b/src/modules/gtk2/producer_pango.c index 4969dd20..ba902bd6 100644 --- a/src/modules/gtk2/producer_pango.c +++ b/src/modules/gtk2/producer_pango.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include