Track the MythTV fixes/31 branch

7 files changed, 189 insertions, 90 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cb903847a4c0..ee692020d51d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,61 +1,87 @@
 pkgbase = mythtv
 	pkgdesc = A Homebrew PVR project
-	pkgver = 31.0
-	pkgrel = 3
-	epoch = 1
+	pkgver = 31+fixes.20201012.eb3c84de
+	pkgrel = 1
 	url = https://www.mythtv.org/
-	arch = any
+	arch = x86_64
 	license = GPL
 	makedepends = git
 	makedepends = help2man
-	makedepends = yasm
-	makedepends = mariadb-libs
-	makedepends = libcec
 	makedepends = libcdio
+	makedepends = libcec
+	makedepends = libmariadbclient
+	makedepends = libxml2
 	makedepends = lirc
+	makedepends = perl-dbd-mysql
 	makedepends = perl-io-socket-inet6
 	makedepends = perl-libwww
-	makedepends = perl-dbd-mysql
-	makedepends = python-lxml
+	makedepends = perl-net-upnp
 	makedepends = perl-xml-simple
 	makedepends = perl-xml-xpath
+	makedepends = python-future
+	makedepends = python-lxml
+	makedepends = python-mysqlclient
 	makedepends = python-requests
-	depends = qt5-script
-	depends = fftw
+	makedepends = python-simplejson
+	makedepends = yasm
 	depends = exiv2
-	depends = taglib
-	depends = perl-net-upnp
-	depends = ffmpeg
+	depends = fftw
+	depends = jack
+	depends = lame
+	depends = libass
+	depends = libavc1394
+	depends = libbluray
+	depends = libhdhomerun
+	depends = libiec61883
+	depends = libpulse
+	depends = libsamplerate
+	depends = libva
+	depends = libvdpau
+	depends = libvpx
 	depends = libxinerama
+	depends = libxml2
 	depends = libxrandr
+	depends = qt5-script
 	depends = qt5-webkit
-	depends = python-mysqlclient
-	depends = libxnvctrl
-	depends = libhdhomerun
-	depends = python-simplejson
-	depends = python-future
+	depends = taglib
+	depends = x264
+	depends = x265
 	optdepends = glew: for GPU commercial flagging
 	optdepends = libcec: for consumer electronics control capabilities
-	optdepends = libhdhomerun: to work properly with HDHomerun devices
 	optdepends = mariadb: Database-Backend for server deployment
 	optdepends = mariadb-clients: Database-Frontend for client deployment
-	optdepends = python-requests: for metadata-lookup / cover art
-	optdepends = python-requests-cache: for metadata-lookup / cover art
-	optdepends = xmltv: for Schedule Direct TV listings
+	optdepends = perl-dbd-mysql: Perl bindings
+	optdepends = perl-io-socket-inet6: Perl bindings
+	optdepends = perl-libwww: Perl bindings
+	optdepends = perl-net-upnp: Perl bindings
+	optdepends = perl-xml-simple: Perl bindings
+	optdepends = perl-xml-xpath: Perl bindings
+	optdepends = python-future: Python bindings
+	optdepends = python-lxml: Python bindings
+	optdepends = python-mysqlclient: Python bindings
+	optdepends = python-requests: Python bindings
+	optdepends = python-requests-cache: Python bindings
+	optdepends = python-simplejson: Python bindings
 	conflicts = myththemes
 	conflicts = mythplugins-mythvideo
+	conflicts = mythtv
 	replaces = myththemes
 	replaces = mythplugins-mythvideo
-	source = mythtv-31.0.tar.gz::https://github.com/MythTV/mythtv/archive/v31.0.tar.gz
+	replaces = mythtv
+	source = git+https://github.com/MythTV/mythtv#branch=fixes/31
 	source = mythbackend.service
+	source = mythtv.desktop
+	source = mythtv.png
+	source = wayland-hide-mouse-cursor.patch
 	source = 99-mythbackend.rules
 	source = sysusers.d
-	source = 001-mythpainter.patch
-	sha256sums = 907d1747950ec6ef1ec965069c75500b4538b781333f60e16d62d519b221a86d
-	sha256sums = 086f573884e4df1ff6e6e8de5a423a9ff900166acfe085abe65b62f32730e4a3
+	sha256sums = SKIP
+	sha256sums = 0588fb34c116521590ff970083bffaf55722e184d06e80cbfe6c5f2b39ee80f1
+	sha256sums = 3fd2018d0d5aaa7d530835305dac80d4ca7d8fc991cdf9e1cebadebd86e25c03
+	sha256sums = 12cb52bf9b084a4f16419c9370fef0450ce6a11308b0c3f7240f4f83df7e2ab6
+	sha256sums = bc43d38acac43bbc15dd6b27b74ff5a7e7abc16ad80ce6e676b108a2d501660c
 	sha256sums = ecfd02bbbef5de9773f4de2c52e9b2b382ce8137735f249d7900270d304fd333
 	sha256sums = 470de0a4050c16c7af11a0e5cfe2810b7daae42df4acf5456c7eae274dc7c5ae
-	sha256sums = fcb078842ecceb636183ed358fb4acfb25ddbe456b2529763519a6661a29baec
 
 pkgname = mythtv
 
diff --git a/001-mythpainter.patch b/001-mythpainter.patch
deleted file mode 100644
index 7a046bee5f40..000000000000
--- a/001-mythpainter.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/libs/libmythui/mythpainter.cpp
-+++ b/libs/libmythui/mythpainter.cpp
-@@ -5,6 +5,7 @@
- // QT headers
- #include <QRect>
- #include <QPainter>
-+#include <QPainterPath>
-
- // libmythbase headers
- #include "mythlogging.h"
diff --git a/PKGBUILD b/PKGBUILD
index de206ca90cdc..1c7922012247 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,84 +7,143 @@
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=mythtv
-pkgver=31.0
-pkgrel=3
-epoch=1
+pkgver=31+fixes.20201012.eb3c84de
+pkgrel=1
 pkgdesc="A Homebrew PVR project"
-arch=('any')
+arch=('x86_64')
 url="https://www.mythtv.org/"
 license=('GPL')
-depends=('qt5-script' 'fftw' 'exiv2' 'taglib' 'perl-net-upnp' 'ffmpeg' 'libxinerama' 'libxrandr'
-         'qt5-webkit' 'python-mysqlclient' 'libxnvctrl' 'libhdhomerun' 'python-simplejson' 'python-future')
-makedepends=('git' 'help2man' 'yasm' 'mariadb-libs' 'libcec' 'libcdio' 'lirc' 'perl-io-socket-inet6' 'perl-libwww'
-             'perl-dbd-mysql' 'python-lxml' 'perl-xml-simple' 'perl-xml-xpath' 'python-requests')
-optdepends=('glew: for GPU commercial flagging'
-            'libcec: for consumer electronics control capabilities'
-            'libhdhomerun: to work properly with HDHomerun devices'
-            'mariadb: Database-Backend for server deployment'
-            'mariadb-clients: Database-Frontend for client deployment'
-            'python-requests: for metadata-lookup / cover art'
-            'python-requests-cache: for metadata-lookup / cover art'
-            'xmltv: for Schedule Direct TV listings')
-conflicts=('myththemes' 'mythplugins-mythvideo')
-replaces=('myththemes' 'mythplugins-mythvideo')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/MythTV/$pkgname/archive/v$pkgver.tar.gz"
-        'mythbackend.service'
-        '99-mythbackend.rules'
-        'sysusers.d'
-        '001-mythpainter.patch'
+depends=(
+    'exiv2'
+    'fftw'
+    'jack'
+    'lame'
+    'libass'
+    'libavc1394'
+    'libbluray'
+    'libhdhomerun'
+    'libiec61883'
+    'libpulse'
+    'libsamplerate'
+    'libva'
+    'libvdpau'
+    'libvpx'
+    'libxinerama'
+    'libxml2'
+    'libxrandr'
+    'qt5-script'
+    'qt5-webkit'
+    'taglib'
+    'x264'
+    'x265'
+)
+makedepends=(
+    'git'
+    'help2man'
+    'libcdio'
+    'libcec'
+    'libmariadbclient'
+    'libxml2'
+    'lirc'
+    'perl-dbd-mysql'
+    'perl-io-socket-inet6'
+    'perl-libwww'
+    'perl-net-upnp'
+    'perl-xml-simple'
+    'perl-xml-xpath'
+    'python-future'
+    'python-lxml'
+    'python-mysqlclient'
+    'python-requests'
+    'python-simplejson'
+    'yasm'
+)
+optdepends=(
+    'glew: for GPU commercial flagging'
+    'libcec: for consumer electronics control capabilities'
+    'mariadb: Database-Backend for server deployment'
+    'mariadb-clients: Database-Frontend for client deployment'
+    'perl-dbd-mysql: Perl bindings'
+    'perl-io-socket-inet6: Perl bindings'
+    'perl-libwww: Perl bindings'
+    'perl-net-upnp: Perl bindings'
+    'perl-xml-simple: Perl bindings'
+    'perl-xml-xpath: Perl bindings'
+    'python-future: Python bindings'
+    'python-lxml: Python bindings'
+    'python-mysqlclient: Python bindings'
+    'python-requests: Python bindings'
+    'python-requests-cache: Python bindings'
+    'python-simplejson: Python bindings'
+)
+conflicts=('myththemes' 'mythplugins-mythvideo' 'mythtv')
+replaces=('myththemes' 'mythplugins-mythvideo' 'mythtv')
+source=(
+    "git+https://github.com/MythTV/mythtv#branch=fixes/31"
+    'mythbackend.service'
+    'mythtv.desktop'
+    'mythtv.png'
+    'wayland-hide-mouse-cursor.patch'
+    '99-mythbackend.rules'
+    'sysusers.d'
+)
+sha256sums=(
+    'SKIP'
+    '0588fb34c116521590ff970083bffaf55722e184d06e80cbfe6c5f2b39ee80f1'
+    '3fd2018d0d5aaa7d530835305dac80d4ca7d8fc991cdf9e1cebadebd86e25c03'
+    '12cb52bf9b084a4f16419c9370fef0450ce6a11308b0c3f7240f4f83df7e2ab6'
+    'bc43d38acac43bbc15dd6b27b74ff5a7e7abc16ad80ce6e676b108a2d501660c'
+    'ecfd02bbbef5de9773f4de2c52e9b2b382ce8137735f249d7900270d304fd333'
+    '470de0a4050c16c7af11a0e5cfe2810b7daae42df4acf5456c7eae274dc7c5ae'
 )
-sha256sums=('907d1747950ec6ef1ec965069c75500b4538b781333f60e16d62d519b221a86d'
-            '086f573884e4df1ff6e6e8de5a423a9ff900166acfe085abe65b62f32730e4a3'
-            'ecfd02bbbef5de9773f4de2c52e9b2b382ce8137735f249d7900270d304fd333'
-            '470de0a4050c16c7af11a0e5cfe2810b7daae42df4acf5456c7eae274dc7c5ae'
-            'fcb078842ecceb636183ed358fb4acfb25ddbe456b2529763519a6661a29baec')
-
-prepare() {
-  cd $pkgname-$pkgver/$pkgname
 
-  local src
-  for src in "${source[@]}"; do
-    src="${src%%::*}"
-    src="${src##*/}"
-    [[ $src = *.patch ]] || continue
-    echo "Applying patch $src..."
-    patch -Np1 < "../../$src"
-  done
+pkgver() {
+  cd "${srcdir}/mythtv/mythtv"
+  echo -n "31+fixes.$(git show -s --format=%cd --date=short | tr -d -).$(git rev-parse --short=8 HEAD)"
+}
 
+prepare() {
+  cd "${srcdir}/mythtv/mythtv"
+  patch -Np2 < "${srcdir}/wayland-hide-mouse-cursor.patch"
 }
 
 build() {
-  cd $pkgname-$pkgver/$pkgname
+  cd "${srcdir}/mythtv/mythtv"
 
   ARCH="${CARCH/_/-}"
   ./configure --prefix=/usr \
               --cpu="$ARCH" \
               --disable-altivec \
+              --enable-audio-jack \
               --disable-distcc \
-              --enable-pic \
+              --enable-libfftw3 \
               --enable-libmp3lame \
               --enable-libvpx \
               --enable-libx264 \
               --enable-libx265 \
-              --enable-libvpx \
-              --enable-libxvid \
-              --perl-config-opts=INSTALLDIRS=vendor         
+              --enable-vaapi \
+              --with-bindings=python \
+              --with-bindings=perl \
+              --perl-config-opts=INSTALLDIRS=vendor
   make
 }
 
 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"
 
-# Install udev rules https://www.mythtv.org/wiki/Systemd_mythbackend_Configuration#Delay_starting_the_backend_until_tuners_have_initialized
+  # Install udev rules https://www.mythtv.org/wiki/Systemd_mythbackend_Configuration#Delay_starting_the_backend_until_tuners_have_initialized
   install -Dm644 "$srcdir/99-mythbackend.rules" "$pkgdir/usr/lib/udev/rules.d/99-mythbackend.rules"
+
+  # Install desktop file
+  install -Dm644 "$srcdir/mythtv.png" "$pkgdir/usr/share/pixmaps/mythtv.png"
+  install -Dm644 "$srcdir/mythtv.desktop" "$pkgdir/usr/share/applications/mythtv.desktop"
 }
diff --git a/mythbackend.service b/mythbackend.service
index 05ce1fb42997..0ac07b39cdd8 100644
--- a/mythbackend.service
+++ b/mythbackend.service
@@ -5,11 +5,8 @@ After=network.target mysqld.service
 
 [Service]
 Type=simple
-Environment=HOME=/var/lib/mythtv
 User=mythtv
-ExecStart=/usr/bin/mythbackend --logpath /var/log/mythtv
-ExecStop=/usr/bin/mythshutdown --setscheduledwakeup
-#ExecStop=/usr/bin/mythshutdown --shutdown
+ExecStart=/usr/bin/mythbackend
 Restart=on-failure
 
 [Install]
diff --git a/mythtv.desktop b/mythtv.desktop
new file mode 100644
index 000000000000..bf5b2f1a1783
--- /dev/null
+++ b/mythtv.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=MythTV
+Comment=A frontend for all content on a mythtv-backend
+Exec=mythfrontend --syslog local7 --noupnp
+Type=Application
+Icon=mythtv
diff --git a/mythtv.png b/mythtv.png
new file mode 100644
index 000000000000..0648d2858310
--- /dev/null
+++ b/mythtv.png
diff --git a/wayland-hide-mouse-cursor.patch b/wayland-hide-mouse-cursor.patch
new file mode 100644
index 000000000000..f7f84caf1eda
--- /dev/null
+++ b/wayland-hide-mouse-cursor.patch
@@ -0,0 +1,20 @@
+diff --git a/mythtv/libs/libmythui/mythmainwindow.cpp b/mythtv/libs/libmythui/mythmainwindow.cpp
+index 7bdfe41bb3..d111162286 100644
+--- a/mythtv/libs/libmythui/mythmainwindow.cpp
++++ b/mythtv/libs/libmythui/mythmainwindow.cpp
+@@ -1002,16 +1002,10 @@ void MythMainWindow::Init(bool mayReInit)
+ 
+     // On Compiz/Unit, when the window is fullscreen and frameless changing
+     // screen position ends up stuck. Adding a border temporarily prevents this
+     setWindowFlags(windowFlags() & ~Qt::FramelessWindowHint);
+ 
+-    if (!inwindow)
+-    {
+-        LOG(VB_GENERAL, LOG_INFO, "Using Frameless Window");
+-        flags |= Qt::FramelessWindowHint;
+-    }
+-
+     // Workaround Qt/Windows playback bug?
+ #ifdef _WIN32
+     flags |= Qt::MSWindowsOwnDC;
+ #endif