From 74f4a7af434dc80ae22f80c8e3d4855f96b0dfb3 Mon Sep 17 00:00:00 2001
From: Richard Hulme <peper03@mythtv.org>
Date: Sun, 17 May 2015 13:30:07 +0200
Subject: [PATCH] Make fontconfig and freetype2 settings available to qmake,
 and make fontconfig required when bdjava is enabled.

---
 mythtv/configure                                | 5 +++++
 mythtv/external/libmythbluray/libmythbluray.pro | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/mythtv/configure b/mythtv/configure
index 098915291cf..bbf679bdea1 100755
--- 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
index 29906e1e9bf..ddbe523c850 100644
--- 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