initial update to v31

6 files changed, 35 insertions, 160 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f8101d7366ad..bfb5eff1c76d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,14 @@
 pkgbase = mythplugins
-	pkgver = 30.0
-	pkgrel = 5
+	pkgver = 31.0
+	pkgrel = 1
 	epoch = 1
 	url = http://www.mythtv.org
-	arch = x86_64
+	arch = any
 	license = GPL
 	makedepends = dvdauthor
 	makedepends = dvd+rw-tools
-	makedepends = ffmpeg
-	makedepends = libexif
 	makedepends = mesa-libgl
-	makedepends = mythtv=1:30.0
+	makedepends = mythtv=1:31.0
 	makedepends = perl-datetime-format-iso8601
 	makedepends = perl-date-manip
 	makedepends = perl-image-size
@@ -21,47 +19,34 @@ pkgbase = mythplugins
 	makedepends = perl-xml-simple
 	makedepends = perl-xml-xpath
 	makedepends = libhdhomerun
-	makedepends = python2-pillow
-	makedepends = python2-pycurl
-	makedepends = python2-oauthlib
+	makedepends = python-pillow
+	makedepends = python-pycurl
+	makedepends = python-oauthlib
 	makedepends = gdb
 	makedepends = mariadb-libs
 	makedepends = minizip
-	makedepends = python2-lxml
-	makedepends = mysql-python
-	makedepends = urlgrabber
-	makedepends = python2-future
+	makedepends = python-lxml
 	makedepends = perl-xml-xpath
-	source = mythtv-30.0.tar.gz::https://github.com/MythTV/mythtv/archive/v30.0.tar.gz
-	source = mythweb-30.0.tar.gz::https://github.com/MythTV/mythweb/archive/v30.0.tar.gz
-	source = 001-mythwebcount.patch
-	source = 002-mythweb.patch
-	source = 003-mythweb-php7.4.patch
-	source = 004-mythweb-php7.4.patch
-	sha256sums = 7f7ae9b8927659616f181afc12d7ddc26b0a4b0d13982e2586985f4770640b43
-	sha256sums = b0569bdd6f5e6fed959d98ff883912142da42e3ee6ea3984ece116f09a5dc01c
-	sha256sums = 5761623dfcd36ecde723ca1b350f650c13a7d58f8107d4a88f6b0e3888df41d3
-	sha256sums = 86792ef1249df2b679431466312b3654f276aabb96791edf87ba41946cea67c1
-	sha256sums = 4ddb4143a2da5d7e49e9f13135d1a6bbc499acca0fe9a7765a5c412000006e7a
-	sha256sums = 4256469f5db78f8e28331a8f20576f0b917bb0d2b2d053354c4a328adfc4f0d2
+	makedepends = python-urllib3
+	makedepends = libcdio-paranoia
+	source = mythtv-31.0.tar.gz::https://github.com/MythTV/mythtv/archive/v31.0.tar.gz
+	source = mythweb-31.0.tar.gz::https://github.com/MythTV/mythweb/archive/v31.0.tar.gz
+	source = 001-mythnetvision-configure.patch
+	sha256sums = 096ace898e4a075293bb720bd9f33ae5818650f0ef62e722db290c68e522612f
+	sha256sums = 064a3417d2e04fc9d85355e8128ea93586fe63e17c26ba27ed758e056bd00afc
+	sha256sums = 08c46792e5bae7060a9362b1952caf5dc783f2ad7c609bdd61abd974499329c7
 
 pkgname = mythplugins-mytharchive
 	pkgdesc = Create DVDs or archive recorded shows in MythTV
 	depends = dvdauthor
 	depends = dvd+rw-tools
-	depends = ffmpeg
 	depends = mythtv
-	depends = python2-pillow
+	depends = python-pillow
 
 pkgname = mythplugins-mythbrowser
 	pkgdesc = Mini web browser for MythTV
 	depends = mythtv
 
-pkgname = mythplugins-mythgallery
-	pkgdesc = Image gallery plugin for MythTV
-	depends = libexif
-	depends = mythtv
-
 pkgname = mythplugins-mythgame
 	pkgdesc = Game emulator plugin for MythTV
 	depends = mythtv
@@ -75,7 +60,8 @@ pkgname = mythplugins-mythmusic
 pkgname = mythplugins-mythnetvision
 	pkgdesc = MythNetvision plugin for MythTV
 	depends = mythtv
-	depends = python2-oauthlib
+	depends = python-oauthlib
+	depends = python-urllib3
 
 pkgname = mythplugins-mythnews
 	pkgdesc = News checking plugin for MythTV
diff --git a/004-mythweb-php7.4.patch b/001-mythnetvision-configure.patch
index edae4a96c83c..e01f143b0104 100644
--- a/004-mythweb-php7.4.patch
+++ b/001-mythnetvision-configure.patch
@@ -3,8 +3,9 @@
 @@ -655,7 +655,7 @@
      check_py_lib xml     || disable_netvision "Python XML library (xml)"
      check_py_lib urllib  || disable_netvision "Python URL library (urllib)"
-     check_py_lib urllib2 || disable_netvision "Python URL library 2 (urllib2)"
+-    check_py_lib urllib2 || disable_netvision "Python URL library 2 (urllib2)"
 -    check_py_lib oauth   || disable_netvision "Python OAuth library (oauth)"
++    check_py_lib urllib3 || disable_netvision "Python URL library 3 (urllib3)"
 +    check_py_lib oauthlib   || disable_netvision "Python OAuth library (oauth)"
  
      disabled netvision && echo "Disabling MythNetvision due to missing dependencies."
diff --git a/001-mythwebcount.patch b/001-mythwebcount.patch
deleted file mode 100644
index 336c6817446b..000000000000
--- a/001-mythwebcount.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/modules/tv/classes/Schedule.php b/modules/tv/classes/Schedule.php
-index c63f9483..1814d6e2 100644
---- a/modules/tv/classes/Schedule.php
-+++ b/modules/tv/classes/Schedule.php
-@@ -103,7 +103,9 @@ class Schedule extends MythBase {
-     public static function findAll($sort = true) {
-         global $db;
-         $orderby = '';
--        if ($sort && count($_SESSION['schedules_sortby'])) {
-+        if ($_SESSION['schedules_sortby']) $schedule_sort = count($_SESSION['schedules_sortby']);
-+        else $schedule_sort = 0;
-+        if ($sort && $schedule_sort) {
-             $orderby = 'ORDER BY ';
-             foreach ($_SESSION['schedules_sortby'] AS $key => $sort) {
-                 if ($key > 0)
-diff --git a/modules/tv/tmpl/default/detail.php b/modules/tv/tmpl/default/detail.php
-index f6d1faa9..4a4ee5e1 100644
---- a/modules/tv/tmpl/default/detail.php
-+++ b/modules/tv/tmpl/default/detail.php
-@@ -842,7 +842,9 @@
-             }
-             echo '            </ul>';
-         }
--        if (count($program->jobs['queue'])) {
-+        if ($program->jobs['queue']) $jobcount = (count($program->jobs['queue']));
-+        else $jobcount = 0;
-+        if ($jobcount) {
-             echo t('Queued jobs'), ':',
-                  '            <ul class="-queued">';
-             foreach ($program->jobs['queue'] as $job) {
-@@ -856,7 +858,9 @@
-             }
-             echo '            </ul>';
-         }
--        if (count($program->jobs['done'])) {
-+        if ($program->jobs['done']) $jobsdone = count($program->jobs['done']);
-+        else $jobsdone = 0;
-+        if ($jobsdone) {
-             echo t('Recently completed jobs'), ':',
-                  '            <ul class="-done">';
-             foreach ($program->jobs['done'] as $job) {
diff --git a/002-mythweb.patch b/002-mythweb.patch
deleted file mode 100644
index bf3babfac4dd..000000000000
--- a/002-mythweb.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/modules/tv/search.php b/modules/tv/search.php

-index 468b3422..3fe893c7 100644

---- a/modules/tv/search.php

-+++ b/modules/tv/search.php

-@@ -344,7 +344,7 @@

-                 case 'Recorded':

-                 case 'NeverRecord':

-                     unset($Results[$key]);

--                    continue;

-+                    break;

-             }

-         }

-     }

-@@ -358,7 +358,7 @@

-                 case 'EarlierShowing':

-                 case 'LaterShowing':

-                     unset($Results[$key]);

--                    continue;

-+                    break;

-             }

-         }

-     }

-@@ -457,11 +457,11 @@

-             case 'both':

-                 return $db->escape($value);

-             case 'start':

--                return $db->escape(preg_replace('/[\\s-_]+/', '%', $value).'%');

-+                return $db->escape(preg_replace('/[\\s_-]+/', '%', $value).'%');

-             case 'end':

--                return $db->escape('%'.preg_replace('/[\\s-_]+/', '%', $value));

-+                return $db->escape('%'.preg_replace('/[\\s_-]+/', '%', $value));

-             default:

--                return $db->escape('%'.preg_replace('/[\\s-_]+/', '%', $value).'%');

-+                return $db->escape('%'.preg_replace('/[\\s_-]+/', '%', $value).'%');

-         }

-     }

diff --git a/003-mythweb-php7.4.patch b/003-mythweb-php7.4.patch
deleted file mode 100644
index 185b88add2e9..000000000000
--- a/003-mythweb-php7.4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/modules/tv/includes/programs.php    2019-12-11 22:16:57.423529528 +0100
-+++ b/modules/tv/includes/programs.php    2019-12-11 22:55:37.649127471 +0100
-@@ -201,6 +201,10 @@
-             }
-         // Add this program to the channel hash, etc.
-             $these_programs[]                          =& $program;
-+
-+            // Creating default object from empty value php warning
-+            $channel_hash[$data['chanid']] = new stdClass();
-+            
-             $channel_hash[$data['chanid']]->programs[] =& $program;
-         // Cleanup
-             unset($program);
diff --git a/PKGBUILD b/PKGBUILD
index 7bade564056d..d06772b3e0f5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,6 @@
 pkgbase=mythplugins
 pkgname=('mythplugins-mytharchive'
          'mythplugins-mythbrowser'
-         'mythplugins-mythgallery'
          'mythplugins-mythgame'
          'mythplugins-mythmusic'
          'mythplugins-mythnetvision'
@@ -13,43 +12,31 @@ pkgname=('mythplugins-mytharchive'
          'mythplugins-mythweather'
          'mythplugins-mythweb'
          'mythplugins-mythzoneminder')
-pkgver=30.0
-pkgrel=5
+pkgver=31.0
+pkgrel=1
 epoch=1
-arch=('x86_64')
+arch=('any')
 url="http://www.mythtv.org"
 license=('GPL')
-makedepends=('dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'libexif' 'mesa-libgl' "mythtv=$epoch:$pkgver"
+makedepends=('dvdauthor' 'dvd+rw-tools' 'mesa-libgl' "mythtv=$epoch:$pkgver"
              'perl-datetime-format-iso8601' 'perl-date-manip' 'perl-image-size' 'perl-cgi'
              'perl-json' 'perl-libwww' 'perl-soap-lite' 'perl-xml-simple' 'perl-xml-xpath' 'libhdhomerun'
-             'python2-pillow' 'python2-pycurl' 'python2-oauthlib' 'gdb' 'mariadb-libs' 'minizip'
-             'python2-lxml' 'mysql-python' 'urlgrabber' 'python2-future' 'perl-xml-xpath')
+             'python-pillow' 'python-pycurl' 'python-oauthlib' 'gdb' 'mariadb-libs' 'minizip'
+             'python-lxml' 'perl-xml-xpath' 'python-urllib3' 'libcdio-paranoia')
 source=("mythtv-$pkgver.tar.gz::https://github.com/MythTV/mythtv/archive/v$pkgver.tar.gz"
         "mythweb-$pkgver.tar.gz::https://github.com/MythTV/mythweb/archive/v$pkgver.tar.gz"
-        '001-mythwebcount.patch'
-        '002-mythweb.patch'
-        '003-mythweb-php7.4.patch'
-        '004-mythweb-php7.4.patch'
+        '001-mythnetvision-configure.patch'
 )
-sha256sums=('7f7ae9b8927659616f181afc12d7ddc26b0a4b0d13982e2586985f4770640b43'
-            'b0569bdd6f5e6fed959d98ff883912142da42e3ee6ea3984ece116f09a5dc01c'
-            '5761623dfcd36ecde723ca1b350f650c13a7d58f8107d4a88f6b0e3888df41d3'
-            '86792ef1249df2b679431466312b3654f276aabb96791edf87ba41946cea67c1'
-            '4ddb4143a2da5d7e49e9f13135d1a6bbc499acca0fe9a7765a5c412000006e7a'
-            '4256469f5db78f8e28331a8f20576f0b917bb0d2b2d053354c4a328adfc4f0d2')
+sha256sums=('096ace898e4a075293bb720bd9f33ae5818650f0ef62e722db290c68e522612f'
+            '064a3417d2e04fc9d85355e8128ea93586fe63e17c26ba27ed758e056bd00afc'
+            '08c46792e5bae7060a9362b1952caf5dc783f2ad7c609bdd61abd974499329c7')
 
 prepare() {
   cd "$srcdir/mythtv-$pkgver/$pkgbase"
-
-  find . -name '*.py' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
   
-  patch -Np1 < "../../004-mythweb-php7.4.patch"
+  patch -Np1 < "../../001-mythnetvision-configure.patch"
 
   cd "$srcdir/mythweb-$pkgver"
-
-  patch -Np1 < "../001-mythwebcount.patch"
-  patch -Np1 < "../002-mythweb.patch"
-  patch -Np1 < "../003-mythweb-php7.4.patch"
   
   sed -re 's@/usr/local.*/usr/share@/usr/share@' -i 'mythweb.php'
 }
@@ -58,15 +45,14 @@ build() {
   cd "$srcdir/mythtv-$pkgver/$pkgbase"
 
   ./configure --prefix=/usr \
-              --enable-all \
-              --python=python2
+              --enable-all
   qmake-qt5 mythplugins.pro
   make -s
 }
 
 package_mythplugins-mytharchive() {
   pkgdesc="Create DVDs or archive recorded shows in MythTV"
-  depends=('dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'mythtv' 'python2-pillow')
+  depends=('dvdauthor' 'dvd+rw-tools' 'mythtv' 'python-pillow')
 
   cd "$srcdir/mythtv-$pkgver/$pkgbase/mytharchive"
   make INSTALL_ROOT="$pkgdir" install
@@ -80,14 +66,6 @@ package_mythplugins-mythbrowser() {
   make INSTALL_ROOT="$pkgdir" install
 }
 
-package_mythplugins-mythgallery() {
-  pkgdesc="Image gallery plugin for MythTV"
-  depends=('libexif' 'mythtv')
-
-  cd "$srcdir/mythtv-$pkgver/$pkgbase/mythgallery"
-  make INSTALL_ROOT="$pkgdir" install
-}
-
 package_mythplugins-mythgame() {
   pkgdesc="Game emulator plugin for MythTV"
   depends=('mythtv' 'minizip')
@@ -106,7 +84,7 @@ package_mythplugins-mythmusic() {
 
 package_mythplugins-mythnetvision() {
   pkgdesc="MythNetvision plugin for MythTV"
-  depends=('mythtv' 'python2-oauthlib')
+  depends=('mythtv' 'python-oauthlib' 'python-urllib3')
 
   cd "$srcdir/mythtv-$pkgver/$pkgbase/mythnetvision"
   make INSTALL_ROOT="$pkgdir" install