Make fontconfig and freetype2 settings available to qmake, and make f…

…ontconfig required when bdjava is enabled.
MythTV · May 18, 2015 · 74f4a7a · 74f4a7a
1 parent b6331d7
commit 74f4a7a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/mythtv/configure b/mythtv/configure
@@ -2180,6 +2180,8 @@ USING_LIST='
     bindings_python
     bindings_php
     darwin_da
+    fontconfig
+    freetype2
     mythtranscode
     dxva2
     opengl
@@ -5831,6 +5833,9 @@ if enabled bdjava; then
     if test "$bdj_type" = "j2me"; then
         enable bdj_j2me
     fi
+
+    # Probably makes little sense to try to process Bluray menus without fontconfig
+    enable fontconfig
 fi
 
 disabled  zlib || check_lib   zlib.h      zlibVersion -lz   || disable  zlib

diff --git a/mythtv/external/libmythbluray/libmythbluray.pro b/mythtv/external/libmythbluray/libmythbluray.pro
@@ -101,6 +101,8 @@ mingw:DEFINES += STDC_HEADERS
 
 using_bdjava {
     DEFINES += USING_BDJAVA VERSION=\\\"$$bluray_version\\\"
+    using_freetype2:DEFINES += HAVE_FT2
+    using_fontconfig:DEFINES += HAVE_FONTCONFIG
 
     macx:javaos = darwin
     win32:javaos = win32