Switch to mythtv git branch: fixes/29

- The branch has many fixes compared to the 29.1 tarball release
- Remove unneeded freetype patch
- Fix x264 incompatibility

3 files changed, 22 insertions, 110 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1c68cebba241..6d5b913f1b72 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mythtv
 	pkgdesc = A Homebrew PVR project
-	pkgver = 29.1
-	pkgrel = 9
+	pkgver = 29+fixes.20180821.e5fc66e8
+	pkgrel = 1
 	epoch = 1
 	url = https://www.mythtv.org/
 	arch = x86_64
@@ -52,16 +52,14 @@ pkgbase = mythtv
 	conflicts = mythplugins-mythvideo
 	replaces = myththemes
 	replaces = mythplugins-mythvideo
-	source = mythtv-29.1.tar.gz::https://github.com/MythTV/mythtv/archive/v29.1.tar.gz
+	source = git+https://github.com/MythTV/mythtv#branch=fixes/29
 	source = mythbackend.service
 	source = 99-mythbackend.rules
 	source = sysusers.d
-	source = freetype2.patch
-	sha256sums = e40ec8111d39fd059a9ec741b10016683bcc66ee3b33c4cdaab93d60851f5d3e
+	sha256sums = SKIP
 	sha256sums = ed5ca54de26b7cd8a64e09626eed6e09f35d677daf88c530bb24cc4252bcce6d
 	sha256sums = ecfd02bbbef5de9773f4de2c52e9b2b382ce8137735f249d7900270d304fd333
 	sha256sums = 470de0a4050c16c7af11a0e5cfe2810b7daae42df4acf5456c7eae274dc7c5ae
-	sha256sums = 4451cbb28513e03cc2f62c50581daeb436d027f8a0968ba5d99a3b05da103343
 
 pkgname = mythtv
 
diff --git a/PKGBUILD b/PKGBUILD
index 75db45613ad8..214ba1ea82bf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
-# Maintainer: Taijian <taijian@posteo.de>
+# Maintainer: James Bunton <jamesbunton@delx.net.au>
+# Contributor: Taijian <taijian@posteo.de>
 # Contributor: Jonathan Conder <jonno.conder@gmail.com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
@@ -6,8 +7,8 @@
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=mythtv
-pkgver=29.1
-pkgrel=9
+pkgver=29+fixes.20180821.e5fc66e8
+pkgrel=1
 epoch=1
 pkgdesc="A Homebrew PVR project"
 arch=('x86_64')
@@ -27,28 +28,30 @@ optdepends=('glew: for GPU commercial flagging'
             'python2-requests-cache: for metadata-lookup / cover art')
 conflicts=('myththemes' 'mythplugins-mythvideo')
 replaces=('myththemes' 'mythplugins-mythvideo')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/MythTV/$pkgname/archive/v$pkgver.tar.gz"
+source=("git+https://github.com/MythTV/mythtv#branch=fixes/29"
         'mythbackend.service'
         '99-mythbackend.rules'
-        'sysusers.d'
-        'freetype2.patch')
-sha256sums=('e40ec8111d39fd059a9ec741b10016683bcc66ee3b33c4cdaab93d60851f5d3e'
+        'sysusers.d')
+sha256sums=('SKIP'
             'ed5ca54de26b7cd8a64e09626eed6e09f35d677daf88c530bb24cc4252bcce6d'
             'ecfd02bbbef5de9773f4de2c52e9b2b382ce8137735f249d7900270d304fd333'
-			'470de0a4050c16c7af11a0e5cfe2810b7daae42df4acf5456c7eae274dc7c5ae'
-            '4451cbb28513e03cc2f62c50581daeb436d027f8a0968ba5d99a3b05da103343')
+            '470de0a4050c16c7af11a0e5cfe2810b7daae42df4acf5456c7eae274dc7c5ae')
+
+pkgver() {
+  cd "${srcdir}/mythtv/mythtv"
+  echo -n "29+fixes.$(date +%Y%m%d).$(git rev-parse --short=8 HEAD)"
+}
 
 prepare() {
-  cd $pkgname-$pkgver/$pkgname
+  cd "${srcdir}/mythtv/mythtv"
 
   find 'bindings/python' 'contrib' 'programs/scripts' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
 
-  #apply freetype2.patch to fix configure error
-  patch -Np1 -i ../../freetype2.patch
+  find 'external/FFmpeg' -type f | xargs sed -i 's/x264_bit_depth/X264_BIT_DEPTH/'
 }
 
 build() {
-  cd $pkgname-$pkgver/$pkgname
+  cd "${srcdir}/mythtv/mythtv"
 
   ARCH="${CARCH/_/-}"
   ./configure --prefix=/usr \
@@ -68,14 +71,14 @@ build() {
 }
 
 package() {
-  cd $pkgname-$pkgver/$pkgname
+  cd "${srcdir}/mythtv/mythtv"
   make INSTALL_ROOT="$pkgdir" install
 
   install -D -m644 "$srcdir/mythbackend.service" "$pkgdir/usr/lib/systemd/system/mythbackend.service"
   install -D -m644 'database/mc.sql' "$pkgdir/usr/share/mythtv/mc.sql"
   install -D -m644 "$srcdir/sysusers.d" "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
 
-#  mkdir -p "$pkgdir/usr/share/mythtv"
+  mkdir -p "$pkgdir/usr/share/mythtv"
   cp -R 'contrib' "$pkgdir/usr/share/mythtv"
   mkdir -p "$pkgdir/var/log/mythtv"
 
diff --git a/freetype2.patch b/freetype2.patch
deleted file mode 100644
index c28b5806a1ce..000000000000
--- a/freetype2.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -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_exec_cxx(){
-     check_ld_cxx "$@" && { enabled cross_compile || $TMPE >> $logfile 2>&1; }
--}
--
--check_foo_config(){
--    cfg=$1
--    pkg=$2
--    header=$3
--    func=$4
--    shift 4
--    disable $cfg
--    check_cmd ${pkg}-config --version
--    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
--        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
-+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 +8536,8 @@
- fi
- 
- if enabled freetype2; then
--    echo "FREETYPE_CFLAGS=`freetype-config --cflags`" >> $TMPMAK
--    echo "FREETYPE_LIBS=`freetype-config --libs`" >> $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
-