diff --git a/libbluray.changes b/libbluray.changes index ab05a7a..e1bba99 100644 --- a/libbluray.changes +++ b/libbluray.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Dec 11 18:29:00 UTC 2013 - hrvoje.senjan@gmail.com + +- Added use-recommended-freetype-include.patch -- Freetype upstream + recommends using their macros together with ft2build include. + Positive sideeffect is that this patch makes it build with both + freetype2 2.5.1, and older version + ------------------------------------------------------------------- Fri Oct 4 19:46:37 UTC 2013 - zaitor@opensuse.org diff --git a/libbluray.spec b/libbluray.spec index 341e174..970ab2f 100644 --- a/libbluray.spec +++ b/libbluray.spec @@ -25,6 +25,9 @@ License: LGPL-2.1+ Group: Productivity/Multimedia/Other Url: http://bd.videolan.org Source: ftp://ftp.videolan.org/pub/videolan/%{name}/%{version}/%{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM use-recommended-freetype-include.patch -- Freetype upstream recommends using their macros together with +# ft2build include. Positive sideeffect is that this patch makes it build with both freetype2 2.5.1, and older versions +Patch0: use-recommended-freetype-include.patch Source99: baselibs.conf BuildRequires: pkg-config BuildRequires: pkgconfig(freetype2) @@ -66,6 +69,7 @@ MPlayer). We, the authors of this library, do not condone nor endorse piracy. %prep %setup -q +%patch0 -p1 %build %configure --disable-static diff --git a/use-recommended-freetype-include.patch b/use-recommended-freetype-include.patch new file mode 100644 index 0000000..513265f --- /dev/null +++ b/use-recommended-freetype-include.patch @@ -0,0 +1,13 @@ +diff --git a/src/libbluray/decoders/textst_render.c b/src/libbluray/decoders/textst_render.c +index 780b640..ffcb1bd 100644 +--- a/src/libbluray/decoders/textst_render.c ++++ b/src/libbluray/decoders/textst_render.c +@@ -30,7 +30,7 @@ + #ifdef HAVE_FT2 + #include + #include FT_FREETYPE_H +-#include ++#include FT_SYNTHESIS_H + #endif + + #include "textst_render.h"