tags 733400 patch user ubuntu-de...@lists.ubuntu.com usertags 733400 ubuntu-patch trusty thanks
On Sat, Dec 28, 2013 at 06:59:17PM +0100, David Suárez wrote: > On the new 2.5 version the headers are located at > '/usr/include/freetype2/ftglyph.h' instead of > '/usr/include/freetype2/freetype/ftglyph.h' like in previous versions. > > Relevant part (hopefully): > > /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. > > -I.. -D_FORTIFY_SOURCE=2 -std=c99 -D_ISOC99_SOURCE > > -D_POSIX_C_SOURCE=200112L -D_REENTRANT -I.. -Ifile -Ilibbluray > > -Ilibbluray/bdnav -I/usr/include/libxml2 -I/usr/include/freetype2 > > -I/usr/lib/jvm/default-java/include > > -I/usr/lib/jvm/default-java/include/linux -g -fstack-protector > > --param=ssp-buffer-size=4 -Wformat -Werror=format-security -Wall > > -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wcast-qual > > -Wwrite-strings -Wtype-limits -Wundef -Wmissing-prototypes -Wshadow > > -Werror=implicit-function-declaration -Wextra -Winline -O3 > > -fomit-frame-pointer -c -o textst_render.lo `test -f > > 'libbluray/decoders/textst_render.c' || echo > > './'`libbluray/decoders/textst_render.c > > libtool: compile: gcc -DHAVE_CONFIG_H -I. -I.. -D_FORTIFY_SOURCE=2 > > -std=c99 -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112L -D_REENTRANT -I.. > > -Ifile -Ilibbluray -Ilibbluray/bdnav -I/usr/include/libxml2 > > -I/usr/include/freetype2 -I/usr/lib/jvm/default-java/include > > -I/usr/lib/jvm/default-java/include/linux -g -fstack-protector > > --param=ssp-buffer-size=4 -Wformat -Werror=format-security -Wall > > -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wcast-qual > > -Wwrite-strings -Wtype-limits -Wundef -Wmissing-prototypes -Wshadow > > -Werror=implicit-function-declaration -Wextra -Winline -O3 > > -fomit-frame-pointer -c libbluray/decoders/textst_render.c -fPIC -DPIC -o > > .libs/textst_render.o > > libbluray/decoders/textst_render.c:33:30: fatal error: freetype/ftsynth.h: > > No such file or directory > > #include <freetype/ftsynth.h> > > ^ > > compilation terminated. > > make[4]: *** [textst_render.lo] Error 1 Here's a patch corresponding to the one I committed to GRUB upstream for the same issue. * Fix build with FreeType 2.5.1 (closes: #733400). diff -Nru libbluray-0.4.0/debian/patches/freetype-2.5.1.patch libbluray-0.4.0/debian/patches/freetype-2.5.1.patch --- libbluray-0.4.0/debian/patches/freetype-2.5.1.patch 1970-01-01 01:00:00.000000000 +0100 +++ libbluray-0.4.0/debian/patches/freetype-2.5.1.patch 2014-02-04 18:09:01.000000000 +0000 @@ -0,0 +1,21 @@ +Description: Fix build with FreeType 2.5.1 + Include FT_SYNTHESIS_H rather than <freetype/ftsynth.h>, fixing build with + FreeType 2.5.1. +Author: Colin Watson <cjwat...@ubuntu.com> +Bug-Debian: http://bugs.debian.org/733400 +Forwarded: no +Last-Update: 2014-02-04 + +Index: b/src/libbluray/decoders/textst_render.c +=================================================================== +--- a/src/libbluray/decoders/textst_render.c ++++ b/src/libbluray/decoders/textst_render.c +@@ -30,7 +30,7 @@ + #ifdef HAVE_FT2 + #include <ft2build.h> + #include FT_FREETYPE_H +-#include <freetype/ftsynth.h> ++#include FT_SYNTHESIS_H + #endif + + #include "textst_render.h" diff -Nru libbluray-0.4.0/debian/patches/series libbluray-0.4.0/debian/patches/series --- libbluray-0.4.0/debian/patches/series 2013-10-05 12:52:43.000000000 +0100 +++ libbluray-0.4.0/debian/patches/series 2014-02-04 18:07:45.000000000 +0000 @@ -1 +1,2 @@ 01_java-compat.patch +freetype-2.5.1.patch Thanks, -- Colin Watson [cjwat...@ubuntu.com] -- To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
