From a97ad8544d577ce0dedd5db55ae0813655eed949 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sat, 24 Feb 2024 17:39:47 -0500
Subject: mythtv: update to 34-fixes

---
 linhes/mythtv/PKGBUILD                 | 24 ++++++++++++++----------
 linhes/mythtv/defaultThemeLinHES.patch | 14 +++++++-------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/linhes/mythtv/PKGBUILD b/linhes/mythtv/PKGBUILD
index 445d6e1..908e5aa 100644
--- a/linhes/mythtv/PKGBUILD
+++ b/linhes/mythtv/PKGBUILD
@@ -7,14 +7,15 @@
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=mythtv
-pkgver=33+fixes.20240113.512d723c
-pkgrel=2
+pkgver=34+fixes.20240220.a88dd47b
+pkgrel=1
 pkgdesc="A Homebrew PVR project"
 arch=('x86_64')
 url="https://www.mythtv.org/"
 license=('GPL')
 depends=(
     'exiv2'
+    'fftw'
     'lame'
     'libass'
     'libavc1394'
@@ -30,6 +31,7 @@ depends=(
     'libxml2'
     'libxrandr'
     'libzip'
+    'lzo'
     'qt5-script'
     'soundtouch'
     'taglib'
@@ -79,6 +81,7 @@ makedepends=(
     'yasm'
 )
 
+options=(!lto)
 conflicts=('myththemes' 'mythplugins-mythvideo' 'mythtv-git')
 replaces=('myththemes' 'mythplugins-mythvideo' 'mythtv-git')
 
@@ -89,7 +92,7 @@ patches="0031-UPnP-Reduce-startup-latency-by-moving-blocking-code-to-own-thread.
          defaultThemeLinHES.patch"
 
 source=(
-    "git+https://github.com/MythTV/mythtv#branch=fixes/33"
+    "git+https://github.com/MythTV/mythtv#branch=fixes/34"
     'mythbackend.service'
     'mythfrontend.desktop'
     'mythtv-setup.desktop'
@@ -98,6 +101,7 @@ source=(
     'sysusers.d'
     $patches
 )
+
 sha256sums=('SKIP'
             '6adb9d3370111c7d0000b215ae2d83a07a19c1bef5c22657f8caa9593c8efda5'
             'ec4f2330f77f0ac92acf228a4afa3b480cdd2de913cdabedfd43d40b03507557'
@@ -109,17 +113,17 @@ sha256sums=('SKIP'
             '1ed4be912cd1ebd73553306958b7a2bc98e466b947dfb5d90ad7c0590a5a3747'
             '630c80c588a9b278c4421d356c5cbaa0debf149524bc896656b580b89d8fae88'
             '8a81e724d902976056dc824e7304df343c230ce67ec6ce1d18e110c5ef818ef6'
-            'ef1d0053d862a9c714093d375e20c96418d665fa504a5b8f30621a271d416dd8')
+            '3ff9f48ead83a8dd7a87cc08df066c00813b48b9171cc7bf74ba0e3cb2570d00')
 
 prepare() {
   msg2 "PKGBUILD pkgver: $pkgver"
   cd "${srcdir}/mythtv/mythtv"
-  gitsrcver=`echo "33+fixes.$(git show -s --format=%cd --date=short | tr -d -).$(git rev-parse --short=8 HEAD)"`
+  gitsrcver=`echo "34+fixes.$(git show -s --format=%cd --date=short | tr -d -).$(git rev-parse --short=8 HEAD)"`
   msg2 "GIT SOURCE pkgver: $gitsrcver"
   if [ $pkgver = $gitsrcver ]; then
     warning "pkgver did NOT change. Consider increasing pkgrel ($pkgrel)."
   fi
-
+  echo $srcdir
   msg "--------------------------applying patches------------------------------"
   for i in `echo ${patches[@]:0}`
   do
@@ -135,15 +139,15 @@ prepare() {
 
 pkgver() {
   cd "${srcdir}/mythtv/mythtv"
-  echo -n "33+fixes.$(git show -s --format=%cd --date=short | tr -d -).$(git rev-parse --short=8 HEAD)"
+  echo -n "34+fixes.$(git show -s --format=%cd --date=short | tr -d -).$(git rev-parse --short=8 HEAD)"
 }
 
 build() {
   cd "${srcdir}/mythtv/mythtv"
 
-CFLAGS="-march=x86-64 -mtune=amdfam10 -O2 -pipe -fno-plt -fexceptions \
-        -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \
-        -fstack-clash-protection -fcf-protection"
+#CFLAGS="-march=x86-64 -mtune=amdfam10 -O2 -pipe -fno-plt -fexceptions \
+#        -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \
+#        -fstack-clash-protection -fcf-protection"
 #  CFLAGS="${CFLAGS/flto=auto/fPIC}"
 #  CXXFLAGS="${CXXFLAGS/flto=auto/fPIC}"
 #  LDFLAGS="${LDFLAGS/flto=auto/fPIC}"
diff --git a/linhes/mythtv/defaultThemeLinHES.patch b/linhes/mythtv/defaultThemeLinHES.patch
index 15a91a7..8ce3016 100644
--- a/linhes/mythtv/defaultThemeLinHES.patch
+++ b/linhes/mythtv/defaultThemeLinHES.patch
@@ -1,13 +1,13 @@
-diff --git a/mythtv/libs/libmythui/mythuithemehelper.h b/mythtv/libs/libmythui/mythuithemehelper.h
-index f222fbf1f3..03435e0826 100644
---- a/mythtv/libs/libmythui/mythuithemehelper.h
-+++ b/mythtv/libs/libmythui/mythuithemehelper.h
-@@ -4,7 +4,7 @@
+--- ./mythtv/libs/libmythui/mythuithemehelper.h.orig	2024-02-24 15:52:57.889044873 -0500
++++ ./mythtv/libs/libmythui/mythuithemehelper.h	2024-02-24 15:55:01.849374522 -0500
+@@ -4,8 +4,8 @@
  // MythTV
  #include "themeinfo.h"
  
--static constexpr const char* DEFAULT_UI_THEME  { "MythCenter" };
+-static constexpr const char* DEFAULT_UI_THEME  { "MythCenter-wide" };
+-static constexpr const char* FALLBACK_UI_THEME { "Terra"           };
 +static constexpr const char* DEFAULT_UI_THEME  { "LinHES" };
- static constexpr const char* FALLBACK_UI_THEME { "Terra"      };
++static constexpr const char* FALLBACK_UI_THEME  { "MythCenter-wide" };
  
  class MUI_PUBLIC MythUIThemeHelper
+ {
-- 
cgit v0.12

