upgrade to v30.0

6 files changed, 17 insertions, 170 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ceb4ad76f308..aad64be20379 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mythplugins
-	pkgver = 29.1
-	pkgrel = 6
+	pkgver = 30.0
+	pkgrel = 1
 	epoch = 1
 	url = http://www.mythtv.org
 	arch = x86_64
@@ -10,7 +10,7 @@ pkgbase = mythplugins
 	makedepends = ffmpeg
 	makedepends = libexif
 	makedepends = mesa-libgl
-	makedepends = mythtv=1:29.1
+	makedepends = mythtv=1:30.0
 	makedepends = perl-datetime-format-iso8601
 	makedepends = perl-date-manip
 	makedepends = perl-image-size
@@ -25,22 +25,17 @@ pkgbase = mythplugins
 	makedepends = python2-oauth
 	makedepends = gdb
 	makedepends = libmariadbclient
+	makedepends = minizip
 	makedepends = python2-lxml
 	makedepends = mysql-python
 	makedepends = urlgrabber
 	makedepends = python2-future
-	source = mythtv-29.1.tar.gz::https://github.com/MythTV/mythtv/archive/v29.1.tar.gz
-	source = mythweb-29.1.tar.gz::https://github.com/MythTV/mythweb/archive/v29.1.tar.gz
-	source = cdparanoia.patch
-	source = mythweb-php_7.2.patch
-	source = mythweb-php_7.3.patch
-	source = libx264.patch
-	sha256sums = e40ec8111d39fd059a9ec741b10016683bcc66ee3b33c4cdaab93d60851f5d3e
-	sha256sums = 30583d7c077dbc732053d0ee7b13a46ab3ceaeb0aaa7c8e9744ef6ac959989e8
-	sha256sums = 004f1e4734830709d2ab5ebb804560514f2bf525abc2f11142501a81eba0754c
-	sha256sums = 4246fb007e8fe8a99d5d333498a4b14c70e275afb0e89e665ada6a55d0c3211c
-	sha256sums = 86792ef1249df2b679431466312b3654f276aabb96791edf87ba41946cea67c1
-	sha256sums = 810f26ac761c1a4c43d67637091d2765ccaf4be98036d8f33506b29d208ef344
+	makedepends = libxnvctrl
+	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
+	sha256sums = 3c3f702b7d62046e43eb2f20036e39ef42856621c0641b57f0c749c46f1bbb6d
+	sha256sums = b0569bdd6f5e6fed959d98ff883912142da42e3ee6ea3984ece116f09a5dc01c
 
 pkgname = mythplugins-mytharchive
 	pkgdesc = Create DVDs or archive recorded shows in MythTV
diff --git a/PKGBUILD b/PKGBUILD
index 1ea2609f17d8..889cd8fd10ce 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,8 +13,8 @@ pkgname=('mythplugins-mytharchive'
          'mythplugins-mythweather'
          'mythplugins-mythweb'
          'mythplugins-mythzoneminder')
-pkgver=29.1
-pkgrel=6
+pkgver=30.0
+pkgrel=1
 epoch=1
 arch=('x86_64')
 url="http://www.mythtv.org"
@@ -22,34 +22,20 @@ license=('GPL')
 makedepends=('dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'libexif' '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'
-             'python2-pillow' 'python2-pycurl' 'python2-oauth' 'gdb' 'libmariadbclient'
-             'python2-lxml' 'mysql-python' 'urlgrabber' 'python2-future')
+             'python2-pillow' 'python2-pycurl' 'python2-oauth' 'gdb' 'libmariadbclient' 'minizip'
+             'python2-lxml' 'mysql-python' 'urlgrabber' 'python2-future' 'libxnvctrl' 'perl-xml-xpath')
 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"
-        'cdparanoia.patch'
-        'mythweb-php_7.2.patch' # can be removed for v29.2+
-        'mythweb-php_7.3.patch' # can be removed for v29.2+
-        'libx264.patch')        # can be removed for v29.2+
-sha256sums=('e40ec8111d39fd059a9ec741b10016683bcc66ee3b33c4cdaab93d60851f5d3e'
-            '30583d7c077dbc732053d0ee7b13a46ab3ceaeb0aaa7c8e9744ef6ac959989e8'
-            '004f1e4734830709d2ab5ebb804560514f2bf525abc2f11142501a81eba0754c'
-            '4246fb007e8fe8a99d5d333498a4b14c70e275afb0e89e665ada6a55d0c3211c'
-            '86792ef1249df2b679431466312b3654f276aabb96791edf87ba41946cea67c1'
-            '810f26ac761c1a4c43d67637091d2765ccaf4be98036d8f33506b29d208ef344')
+)
+sha256sums=('3c3f702b7d62046e43eb2f20036e39ef42856621c0641b57f0c749c46f1bbb6d'
+            'b0569bdd6f5e6fed959d98ff883912142da42e3ee6ea3984ece116f09a5dc01c')
 
 prepare() {
   cd "$srcdir/mythtv-$pkgver/$pkgbase"
 
   find . -name '*.py' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
-  patch -Np1 -i "$srcdir/cdparanoia.patch"
-
-  #apply libx264.patch
-  cd "$srcdir/mythtv-$pkgver/mythtv"
-  patch -Np1 -i ../../libx264.patch
 
   cd "$srcdir/mythweb-$pkgver"
-  patch -Np1 -i "$srcdir/mythweb-php_7.2.patch"
-  patch -Np1 -i "$srcdir/mythweb-php_7.3.patch"
 
   sed -re 's@/usr/local.*/usr/share@/usr/share@' -i 'mythweb.php'
 }
diff --git a/cdparanoia.patch b/cdparanoia.patch
deleted file mode 100644
index b4d1449d51fa..000000000000
--- a/cdparanoia.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -Nru a/configure b/configure
---- a/configure	2012-10-02 23:30:24.000000000 +1300
-+++ b/configure	2013-01-09 14:54:40.448916370 +1300
-@@ -649,7 +649,7 @@
-         echo "MythMusic requires FLAC."
-     fi
- 
--    if ! check_lib cdio/cdio.h cdio_open -lcdio || ! check_lib cdio/cdda.h cdio_cddap_open -lcdio_cdda || ! check_lib cdio/paranoia.h cdio_paranoia_init -lcdio_paranoia ; then
-+    if ! check_lib cdio/cdio.h cdio_open -lcdio || ! check_lib cdio/paranoia/cdda.h cdio_cddap_open -lcdio_cdda || ! check_lib cdio/paranoia/paranoia.h cdio_paranoia_init -lcdio_paranoia ; then
-         disable cdio
-     fi
- 
-diff -Nru a/mythmusic/mythmusic/cddecoder.cpp b/mythmusic/mythmusic/cddecoder.cpp
---- a/mythmusic/mythmusic/cddecoder.cpp	2012-10-02 23:30:24.000000000 +1300
-+++ b/mythmusic/mythmusic/cddecoder.cpp	2013-01-09 14:53:37.031690618 +1300
-@@ -14,7 +14,7 @@
- #include <QString>
- 
- // libcdio
--#include <cdio/cdda.h>
-+#include <cdio/paranoia/cdda.h>
- #include <cdio/logging.h>
- 
- // MythTV
-diff -Nru a/mythmusic/mythmusic/cddecoder.h b/mythmusic/mythmusic/cddecoder.h
---- a/mythmusic/mythmusic/cddecoder.h	2012-10-02 23:30:24.000000000 +1300
-+++ b/mythmusic/mythmusic/cddecoder.h	2013-01-09 14:53:12.328140979 +1300
-@@ -11,8 +11,8 @@
- #endif
- 
- #ifdef HAVE_CDIO
--# include <cdio/cdda.h>
--# include <cdio/paranoia.h>
-+# include <cdio/paranoia/cdda.h>
-+# include <cdio/paranoia/paranoia.h>
- #endif
- 
- class Metadata;
-diff -Nru a/mythmusic/mythmusic/cdrip.cpp b/mythmusic/mythmusic/cdrip.cpp
---- a/mythmusic/mythmusic/cdrip.cpp	2012-10-02 23:30:24.000000000 +1300
-+++ b/mythmusic/mythmusic/cdrip.cpp	2013-01-09 14:54:11.815330268 +1300
-@@ -8,8 +8,8 @@
- 
- #include "config.h"
- #ifdef HAVE_CDIO
--# include <cdio/cdda.h>
--# include <cdio/paranoia.h>
-+# include <cdio/paranoia/cdda.h>
-+# include <cdio/paranoia/paranoia.h>
- #endif //def HAVE_CDIO
- 
- // C++ includes
diff --git a/libx264.patch b/libx264.patch
deleted file mode 100644
index 8401b2f9c26e..000000000000
--- a/libx264.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/external/FFmpeg/libavcodec/libx264.c
-+++ b/external/FFmpeg/libavcodec/libx264.c
-@@ -279,7 +279,7 @@
- 
-     x264_picture_init( &x4->pic );
-     x4->pic.img.i_csp   = x4->params.i_csp;
--    if (x264_bit_depth > 8)
-+    if (X264_BIT_DEPTH > 8)
-         x4->pic.img.i_csp |= X264_CSP_HIGH_DEPTH;
-     x4->pic.img.i_plane = avfmt2_num_planes(ctx->pix_fmt);
- 
-@@ -889,11 +889,11 @@
- 
- static av_cold void X264_init_static(AVCodec *codec)
- {
--    if (x264_bit_depth == 8)
-+    if (X264_BIT_DEPTH == 8)
-         codec->pix_fmts = pix_fmts_8bit;
--    else if (x264_bit_depth == 9)
-+    else if (X264_BIT_DEPTH == 9)
-         codec->pix_fmts = pix_fmts_9bit;
--    else if (x264_bit_depth == 10)
-+    else if (X264_BIT_DEPTH == 10)
-         codec->pix_fmts = pix_fmts_10bit;
- }
diff --git a/mythweb-php_7.2.patch b/mythweb-php_7.2.patch
deleted file mode 100644
index a13493cddb01..000000000000
--- a/mythweb-php_7.2.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: modules/tv/recorded.php

-===================================================================

---- a/modules/tv/recorded.php	(revision 6976c802b700dfed902c5173ca2d1080902508c6)

-+++ b/modules/tv/recorded.php	(revision 664dc1707ccf7be8b0b1d9eadf6366de8bbaa9c9)

-@@ -180,12 +180,12 @@

-     // GMP functions should work better with 64 bit numbers.

-         $size = gmp_mul('1024', $size);

--        define(disk_size, gmp_strval($size));

-+        define('disk_size', gmp_strval($size));

-         $size = gmp_mul('1024', $used);

--        define(disk_used, gmp_strval($size));

-+        define('disk_used', gmp_strval($size));

-     }

-     else {

-     // This is inaccurate, but it's the best we can get without GMP.

--        define(disk_size, ($size * 1024));

--        define(disk_used, ($used * 1024));

-+        define('disk_size', ($size * 1024));

-+        define('disk_used', ($used * 1024));

-     }

- 

diff --git a/mythweb-php_7.3.patch b/mythweb-php_7.3.patch
deleted file mode 100644
index bf3babfac4dd..000000000000
--- a/mythweb-php_7.3.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).'%');

-         }

-     }