update patch to bring it in line with upstream solution

3 files changed, 61 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1bf80c567282..f3ad33f99cde 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -61,7 +61,7 @@ pkgbase = mythtv
 	sha256sums = ed5ca54de26b7cd8a64e09626eed6e09f35d677daf88c530bb24cc4252bcce6d
 	sha256sums = ecfd02bbbef5de9773f4de2c52e9b2b382ce8137735f249d7900270d304fd333
 	sha256sums = 470de0a4050c16c7af11a0e5cfe2810b7daae42df4acf5456c7eae274dc7c5ae
-	sha256sums = 92b332fc407461582d668ddca85aa614904b5454e08c3aa60351df6f2a452026
+	sha256sums = 4451cbb28513e03cc2f62c50581daeb436d027f8a0968ba5d99a3b05da103343
 
 pkgname = mythtv
 
diff --git a/PKGBUILD b/PKGBUILD
index fccad85c4883..24bc1edcf2db 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -36,7 +36,7 @@ sha256sums=('04a84eb0ded2d2b123624ab2b2e1b8cf824ff4bf8216e452b2516deb929082b2'
             'ed5ca54de26b7cd8a64e09626eed6e09f35d677daf88c530bb24cc4252bcce6d'
             'ecfd02bbbef5de9773f4de2c52e9b2b382ce8137735f249d7900270d304fd333'
 			'470de0a4050c16c7af11a0e5cfe2810b7daae42df4acf5456c7eae274dc7c5ae'
-            '92b332fc407461582d668ddca85aa614904b5454e08c3aa60351df6f2a452026')
+            '4451cbb28513e03cc2f62c50581daeb436d027f8a0968ba5d99a3b05da103343')
 
 prepare() {
   cd $pkgname-$pkgver/$pkgname
diff --git a/freetype2.patch b/freetype2.patch
index 19abde2f64c4..c28b5806a1ce 100644
--- a/freetype2.patch
+++ b/freetype2.patch
@@ -1,10 +1,39 @@
 --- a/configure
 +++ b/configure
-
-@@ -1629,19 +1629,18 @@
+@@ -1452,26 +1452,6 @@
+     use_pkg_config "$@" || die "ERROR: $pkg not found using pkg-config$pkg_config_fail_message"
+ }
+ 
+-require_libfreetype(){
+-    log require_libfreetype "$@"
+-    pkg="freetype2"
+-    check_cmd $pkg_config --exists --print-errors $pkg \
+-      || die "ERROR: $pkg not found"
+-    pkg_cflags=$($pkg_config --cflags $pkg_config_flags $pkg)
+-    pkg_libs=$($pkg_config --libs $pkg_config_flags $pkg)
+-    {
+-        echo "#include <ft2build.h>"
+-        echo "#include FT_FREETYPE_H"
+-        echo "long check_func(void) { return (long) FT_Init_FreeType; }"
+-        echo "int main(void) { return 0; }"
+-    } | check_ld "cc" $pkg_cflags $pkg_libs \
+-      && set_safe "${pkg}_cflags" $pkg_cflags \
+-      && set_safe "${pkg}_libs"   $pkg_libs \
+-      || die "ERROR: $pkg not found"
+-    add_cflags    $(get_safe "${pkg}_cflags")
+-    add_extralibs $(get_safe "${pkg}_libs")
+-}
+-
+ hostcc_e(){
+     eval printf '%s\\n' $HOSTCC_E
  }
+@@ -1626,25 +1606,6 @@
  
- check_foo_config(){
+ check_exec_cxx(){
+     check_ld_cxx "$@" && { enabled cross_compile || $TMPE >> $logfile 2>&1; }
+-}
+-
+-check_foo_config(){
 -    cfg=$1
 -    pkg=$2
 -    header=$3
@@ -12,42 +41,48 @@
 -    shift 4
 -    disable $cfg
 -    check_cmd ${pkg}-config --version
-+    pkg=$1
-+    header=$2
-+    func=$3
-+    shift 3
-+    disable $pkg
-+    check_cmd $pkg_config --exists --print-errors $pkg
-     err=$?
-     if test "$err" = 0; then
-         backup_cflags=$CFLAGS
+-    err=$?
+-    if test "$err" = 0; then
+-        backup_cflags=$CFLAGS
 -        temp_extralibs=$(${pkg}-config --libs)
 -        add_cflags $(${pkg}-config --cflags)
 -        check_lib "$@" $header $func $temp_extralibs && enable $cfg
-+        temp_extralibs=$($pkg_config --libs $pkg_config_flags $pkg)
-+        add_cflags $($pkg_config --cflags $pkg_config_flags $pkg)
-+        check_lib "$@" $header $func $temp_extralibs && enable $pkg
-         CFLAGS=$backup_cflags
-     fi
-     return $err
-@@ -7134,7 +7133,7 @@
+-        CFLAGS=$backup_cflags
+-    fi
+-    return $err
+ }
+ 
+ non_standard_header(){
+@@ -6921,7 +6882,7 @@
+ enabled libflite          && require2 libflite "flite/flite.h" flite_init $flite_libs
+ enabled fontconfig        && enable libfontconfig
+ enabled libfontconfig     && require_pkg_config fontconfig "fontconfig/fontconfig.h" FcInit
+-enabled libfreetype       && require_libfreetype
++enabled libfreetype       && require_pkg_config freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType
+ enabled libfribidi        && require_pkg_config fribidi fribidi.h fribidi_version_info
+ enabled libgme            && require  libgme gme/gme.h gme_new_emu -lgme -lstdc++
+ enabled libgsm            && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
+@@ -7134,7 +7095,11 @@
  EOF
  done
  
 -check_foo_config freetype2 freetype ft2build.h FT_Init_FreeType
-+check_foo_config freetype2 ft2build.h FT_Init_FreeType
++if require_pkg_config freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType ; then
++    enable freetype2
++else
++    disable freetype2
++fi
  
  enabled freetype2 ||
      die "ERROR! You must have FreeType installed to compile MythTV."
-@@ -8571,8 +8570,9 @@
+@@ -8571,8 +8536,8 @@
  fi
  
  if enabled freetype2; then
 -    echo "FREETYPE_CFLAGS=`freetype-config --cflags`" >> $TMPMAK
 -    echo "FREETYPE_LIBS=`freetype-config --libs`" >> $TMPMAK
-+    pkg="freetype2"
-+    echo "FREETYPE_CFLAGS=$($pkg_config --cflags $pkg_config_flags $pkg)" >> $TMPMAK
-+    echo "FREETYPE_LIBS=$($pkg_config --libs $pkg_config_flags $pkg)" >> $TMPMAK
++    echo "FREETYPE_CFLAGS=$($pkg_config --cflags $pkg_config_flags freetype2)" >> $TMPMAK
++    echo "FREETYPE_LIBS=$($pkg_config --libs $pkg_config_flags freetype2)" >> $TMPMAK
  fi
  
  if test $target_os = darwin; then