Update to v34+fixes

3 files changed, 15 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6151238f8dd8..330648fb61fe 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = mythplugins
-	pkgver = 33.1.r11.g51cb10a678
+	pkgver = 34.0.r16.g95fb10412c
 	pkgrel = 1
 	epoch = 0
 	url = http://www.mythtv.org
@@ -8,7 +8,7 @@ pkgbase = mythplugins
 	makedepends = dvdauthor
 	makedepends = dvd+rw-tools
 	makedepends = mesa-libgl
-	makedepends = mythtv-git>=33.1.r11.g51cb10a678
+	makedepends = mythtv-git>=34.0.r16.g95fb10412c
 	makedepends = perl-datetime-format-iso8601
 	makedepends = perl-date-manip
 	makedepends = perl-image-size
@@ -21,7 +21,6 @@ pkgbase = mythplugins
 	makedepends = libhdhomerun
 	makedepends = python-pillow
 	makedepends = python-pycurl
-	makedepends = python-oauthlib
 	makedepends = gdb
 	makedepends = mariadb-libs
 	makedepends = minizip
@@ -29,12 +28,10 @@ pkgbase = mythplugins
 	makedepends = perl-xml-xpath
 	makedepends = python-urllib3
 	makedepends = libcdio-paranoia
-	source = git+https://github.com/MythTV/mythweb#branch=fixes/33
-	source = git+https://github.com/MythTV/mythtv#branch=fixes/33
-	source = 001-mythnetvision-configure.patch
+	source = git+https://github.com/MythTV/mythweb#branch=fixes/34
+	source = git+https://github.com/MythTV/mythtv#branch=fixes/34
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = 51c9fb042a3f2acf4ab9682cb48e9a123cf8f0e312fd8b25dd187bb56e0d701a
 
 pkgname = mythplugins-mytharchive
 	pkgdesc = Create DVDs or archive recorded shows in MythTV
@@ -60,7 +57,6 @@ pkgname = mythplugins-mythmusic
 pkgname = mythplugins-mythnetvision
 	pkgdesc = MythNetvision plugin for MythTV
 	depends = mythtv
-	depends = python-oauthlib
 	depends = python-urllib3
 
 pkgname = mythplugins-mythnews
@@ -83,8 +79,8 @@ pkgname = mythplugins-mythweb
 	depends = mythtv
 	depends = perl-cgi
 	optdepends = lighttpd
-	optdepends = php7-apache
-	optdepends = php7-fpm
+	optdepends = php-apache
+	optdepends = php-fpm
 	optdepends = nginx
 
 pkgname = mythplugins-mythzoneminder
diff --git a/001-mythnetvision-configure.patch b/001-mythnetvision-configure.patch
deleted file mode 100644
index 6ccdb8d4767d..000000000000
--- a/001-mythnetvision-configure.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -630,7 +630,7 @@
-     check_py_lib xml     || disable_netvision "Python XML library (xml)"
-     check_py_lib urllib  || disable_netvision "Python URL library (urllib)"
--    check_py_lib oauth   || disable_netvision "Python OAuth library (oauth)"
-+    check_py_lib oauthlib   || disable_netvision "Python OAuth library (oauth)"
- 
-     disabled netvision && echo "Disabling MythNetvision due to missing dependencies."
- fi
-
diff --git a/PKGBUILD b/PKGBUILD
index 9230d852e5d6..8ddee35c97bf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,9 +13,9 @@ pkgname=('mythplugins-mytharchive'
          'mythplugins-mythweather'
          'mythplugins-mythweb'
          'mythplugins-mythzoneminder')
-br=fixes/33
+br=fixes/34
 t="${br#*/}+${br%/[0-9][0-9]}"
-pkgver=33.1.r11.g51cb10a678
+pkgver=34.0.r16.g95fb10412c
 pkgrel=1
 epoch=0
 arch=('any')
@@ -24,15 +24,14 @@ license=('GPL')
 makedepends=('dvdauthor' 'dvd+rw-tools' 'mesa-libgl' "mythtv-git>=$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'
-             'python-pillow' 'python-pycurl' 'python-oauthlib' 'gdb' 'mariadb-libs' 'minizip'
+             'python-pillow' 'python-pycurl' 'gdb' 'mariadb-libs' 'minizip'
              'python-lxml' 'perl-xml-xpath' 'python-urllib3' 'libcdio-paranoia')
 source=("git+https://github.com/MythTV/mythweb#branch=$br"
         "git+https://github.com/MythTV/mythtv#branch=$br"
-        '001-mythnetvision-configure.patch'
 )
+
 sha256sums=('SKIP'
-            'SKIP'
-            '51c9fb042a3f2acf4ab9682cb48e9a123cf8f0e312fd8b25dd187bb56e0d701a')
+            'SKIP')
 
 pkgver() {
   cd "${srcdir}/mythtv/$pkgbase"
@@ -42,8 +41,6 @@ pkgver() {
 prepare() {
   cd "$srcdir/mythtv/$pkgbase"
   
-  patch -Np1 < "../../001-mythnetvision-configure.patch"
-
   cd "$srcdir/mythweb"
   
   sed -re 's@/usr/local.*/usr/share@/usr/share@' -i 'mythweb.php'
@@ -92,7 +89,7 @@ package_mythplugins-mythmusic() {
 
 package_mythplugins-mythnetvision() {
   pkgdesc="MythNetvision plugin for MythTV"
-  depends=('mythtv' 'python-oauthlib' 'python-urllib3')
+  depends=('mythtv' 'python-urllib3')
 
   cd "$srcdir/mythtv/$pkgbase/mythnetvision"
   make INSTALL_ROOT="$pkgdir" install
@@ -120,17 +117,16 @@ package_mythplugins-mythweb() {
   pkgdesc="Web interface for the MythTV scheduler"
   depends=('mythtv' 'perl-cgi')
   optdepends=('lighttpd'
-              'php7-apache'
-              'php7-fpm'
+              'php-apache'
+              'php-fpm'
               'nginx')
 
-  sed -i 's/unix.*-fpm\.sock;/unix:\/var\/run\/php-fpm7\/php-fpm\.sock;/' "$srcdir/mythweb/mythweb.conf.nginx"
+  sed -i 's/unix.*-fpm\.sock;/unix:\/var\/run\/php-fpm\/php-fpm\.sock;/' "$srcdir/mythweb/mythweb.conf.nginx"
 
   mkdir -p "$pkgdir/var/lib/mythtv/mythweb"/{image_cache,php_sessions}
   cp -R "$srcdir/mythweb"/* "$pkgdir/var/lib/mythtv/mythweb"
   chown -R http:http "$pkgdir/var/lib/mythtv/mythweb"
   chmod g+rw "$pkgdir/var/lib/mythtv/mythweb"/{image_cache,php_sessions}
-  
 }
 
 package_mythplugins-mythzoneminder() {