fix build of neutrino & libbluray with freetype > 2.6

diff --git a/make/libraries.mk b/make/libraries.mk
index 6bfb5f609d5c0ed67e5d66b4c3e78ff3d97b847a..0620ce38f0a1ea57ba8efa26c53ee208efd4e209 100755 (executable)
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -319,7 +319,6 @@ $(D)/libbluray: $(ARCHIVE)/libbluray-0.5.0.tar.bz2 | $(TARGETPREFIX)
                $(PATCH)/libbluray-0003-Added-bd_get_clip_infos.patch && \
                $(PATCH)/libbluray-0005-Don-t-abort-demuxing-if-the-disc-looks-encrypted.patch && \
                $(PATCH)/libbluray-0006-disable-M2TS_TRACE.patch && \
-               $(CONFIGURE) --build=$(BUILD) --host=$(TARGET) --target=$(TARGET) --prefix= --enable-shared --disable-static --without-libxml2 && \
                $(CONFIGURE) \
                        --prefix= \
                        --build=$(BUILD) \
@@ -327,8 +326,15 @@ $(D)/libbluray: $(ARCHIVE)/libbluray-0.5.0.tar.bz2 | $(TARGETPREFIX)
                        --target=$(TARGET) \
                        --enable-shared \
                        --disable-static \
-                       --datarootdir=/.remove \
-                       --without-libxml2 && \
+                       --disable-extra-warnings \
+                       --disable-doxygen-doc \
+                       --disable-doxygen-dot \
+                       --disable-doxygen-html \
+                       --disable-doxygen-ps \
+                       --disable-doxygen-pdf \
+                       --disable-examples \
+                       --without-libxml2 \
+                       --without-freetype && \
                $(MAKE) && \
                $(MAKE) install DESTDIR=$(TARGETPREFIX)
        $(REWRITE_LIBTOOL)/libbluray.la

diff --git a/make/neutrino.mk b/make/neutrino.mk
index 3241e74dc15a2262fe66715b33a8b50b83772edd..5986dc4d59b0a7a8c905a5b9c57d940ee6cf2f01 100755 (executable)
--- a/make/neutrino.mk
+++ b/make/neutrino.mk
@@ -31,6 +31,7 @@ N_CFLAGS += -I$(NEUTRINO_OBJDIR)
 N_CFLAGS += -I$(NEUTRINO_OBJDIR)/src/gui
 
 N_CPPFLAGS = -I$(TARGETPREFIX)/include
+N_CPPFLAGS += -I$(TARGETPREFIX)/include/freetype2
 N_CPPFLAGS += -Werror -Wsign-compare
 #N_CPPFLAGS += -D_GLIBCXX_USE_CXX11_ABI=0