Browse Source

Fix FTBFS with libfreetype6 >= 2.5.x

master
Slávek Banko 8 years ago
parent
commit
116227b9da
  1. 2
      src/modules/gtk2/Makefile
  2. 4
      src/modules/gtk2/config.h
  3. 4
      src/modules/gtk2/config.mak
  4. 7
      src/modules/gtk2/configure
  5. 2
      src/modules/gtk2/producer_pango.c

2
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)

4
src/modules/gtk2/config.h

@ -1,4 +0,0 @@
#define USE_GTK2
#define USE_PIXBUF
#define USE_PANGO

4
src/modules/gtk2/config.mak

@ -1,4 +0,0 @@
USE_GTK2=1
USE_PIXBUF=1
USE_PANGO=1

7
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

2
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>

Loading…
Cancel
Save