Fri Sep 20 02:14:49 PDT 2013

3 files changed, 33 insertions, 89 deletions

diff --git a/community/mythplugins/PKGBUILD b/community/mythplugins/PKGBUILD
index ac9b96c0f..90d7eb7fc 100644
--- a/community/mythplugins/PKGBUILD
+++ b/community/mythplugins/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96153 2013-08-20 11:49:57Z jconder $
+# $Id: PKGBUILD 97427 2013-09-19 14:38:19Z jconder $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
@@ -13,7 +13,7 @@ pkgname=('mythplugins-mytharchive'
          'mythplugins-mythweather'
          'mythplugins-mythweb'
          'mythplugins-mythzoneminder')
-pkgver=0.26.1
+pkgver=0.27
 pkgrel=1
 epoch=1
 arch=('i686' 'x86_64')
@@ -21,28 +21,30 @@ url="http://www.mythtv.org"
 license=('GPL')
 makedepends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'flac' 'libexif'
              'libvorbis' 'mesa' 'mesa-libgl' 'mplayer' 'mythtv'
-	     'perl-datetime-format-iso8601' 'perl-date-manip' 'perl-image-size'
-	     'perl-json' 'perl-libwww' 'perl-soap-lite' 'perl-xml-sax'
-	     'perl-xml-simple' 'perl-xml-xpath' 'python2-oauth' 'python-imaging'
-	     'python2-pycurl' 'taglib' 'zlib')
-source=("ftp://ftp.osuosl.org/pub/mythtv/$pkgbase-$pkgver.tar.bz2"
-        'cdparanoia.patch'
-        'php55.patch'
-        'mtd.rc')
-md5sums=('d896d9f9313ba5dd95e2e977bf9c0f8f'
-         '5de8dd79d0b8a2b006f3c3258938b6b7'
-         'a6df720ef22fe6bef8c650b1bd5948cb'
-         '476c12ba074794ad7f4ae092bdf949d6')
+             'perl-datetime-format-iso8601' 'perl-date-manip' 'perl-image-size'
+             'perl-json' 'perl-libwww' 'perl-soap-lite' 'perl-xml-sax'
+             'perl-xml-simple' 'perl-xml-xpath' 'python2-oauth' 'python-imaging'
+             'python2-pycurl' 'zlib')
+source=("mythtv-$pkgver.tar.gz::http://www.mythtv.org/download/mythtv/$pkgver"
+        "mythweb-$pkgver.tar.gz::http://www.mythtv.org/download/mythweb/$pkgver"
+	'cdparanoia.patch')
+sha256sums=('670b378e379df05a4f2ac28cc3cb2578587b42cb03710e0b230b75d692f8e2b8'
+            'fe135281c4828a96762ea22a8a4cf622988b12e7f2189dce9273f1ce7bb367d3'
+	    '004f1e4734830709d2ab5ebb804560514f2bf525abc2f11142501a81eba0754c')
+
+prepare() {
+  cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase"
 
-build() {
-  cd "$srcdir/$pkgbase-$pkgver"
   find . -name '*.py' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
+  patch -Np1 -i "$srcdir/cdparanoia.patch"
 
-  sed -re 's@/usr/local.*/usr/share@/usr/share@' -i 'mythweb/mythweb.php'
-  sed -re 's@cstdio@cstdio>\n#include <unistd.h@' -i 'mythzoneminder/mythzmserver/zmserver.cpp'
+  cd "$srcdir/mythweb-fixes-$pkgver"
 
-  patch -Np1 -i "$srcdir/cdparanoia.patch"
-  patch -Np1 -i "$srcdir/php55.patch"
+  sed -re 's@/usr/local.*/usr/share@/usr/share@' -i 'mythweb.php'
+}
+
+build() {
+  cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase"
 
   ./configure --prefix=/usr \
               --enable-all \
@@ -56,7 +58,7 @@ package_mythplugins-mytharchive() {
   depends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'mythtv'
            'python-imaging')
 
-  cd "$srcdir/$pkgbase-$pkgver/mytharchive"
+  cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mytharchive"
   make INSTALL_ROOT="$pkgdir" install
 }
 
@@ -64,7 +66,7 @@ package_mythplugins-mythbrowser() {
   pkgdesc="Mini web browser for MythTV"
   depends=('mythtv')
 
-  cd "$srcdir/$pkgbase-$pkgver/mythbrowser"
+  cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythbrowser"
   make INSTALL_ROOT="$pkgdir" install
 }
 
@@ -72,7 +74,7 @@ package_mythplugins-mythgallery() {
   pkgdesc="Image gallery plugin for MythTV"
   depends=('libexif' 'mythtv')
 
-  cd "$srcdir/$pkgbase-$pkgver/mythgallery"
+  cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythgallery"
   make INSTALL_ROOT="$pkgdir" install
 }
 
@@ -80,15 +82,15 @@ package_mythplugins-mythgame() {
   pkgdesc="Game emulator plugin for MythTV"
   depends=('mythtv')
 
-  cd "$srcdir/$pkgbase-$pkgver/mythgame"
+  cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythgame"
   make INSTALL_ROOT="$pkgdir" install
 }
 
 package_mythplugins-mythmusic() {
   pkgdesc="Music playing plugin for MythTV"
-  depends=('mythtv' 'libcdio-paranoia' 'taglib')
+  depends=('mythtv' 'libcdio-paranoia')
 
-  cd "$srcdir/$pkgbase-$pkgver/mythmusic"
+  cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythmusic"
   make INSTALL_ROOT="$pkgdir" install
 }
 
@@ -96,7 +98,7 @@ package_mythplugins-mythnetvision() {
   pkgdesc="MythNetvision plugin for MythTV"
   depends=('mythtv' 'python2-oauth')
 
-  cd "$srcdir/$pkgbase-$pkgver/mythnetvision"
+  cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythnetvision"
   make INSTALL_ROOT="$pkgdir" install
 }
 
@@ -104,7 +106,7 @@ package_mythplugins-mythnews() {
   pkgdesc="News checking plugin for MythTV"
   depends=('mythtv')
 
-  cd "$srcdir/$pkgbase-$pkgver/mythnews"
+  cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythnews"
   make INSTALL_ROOT="$pkgdir" install
 }
 
@@ -114,7 +116,7 @@ package_mythplugins-mythweather() {
            'perl-xml-sax' 'perl-xml-simple' 'perl-xml-xpath' 'perl-image-size'
            'perl-datetime-format-iso8601')
 
-  cd "$srcdir/$pkgbase-$pkgver/mythweather"
+  cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythweather"
   make INSTALL_ROOT="$pkgdir" install
 }
 
@@ -126,7 +128,7 @@ package_mythplugins-mythweb() {
   install='mythplugins-mythweb.install'
 
   mkdir -p "$pkgdir/var/lib/mythtv/mythweb"/{image_cache,php_sessions}
-  cp -R "$srcdir/$pkgbase-$pkgver/mythweb"/* "$pkgdir/var/lib/mythtv/mythweb"
+  cp -R "$srcdir/mythweb-fixes-$pkgver"/* "$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}
 }
@@ -136,6 +138,6 @@ package_mythplugins-mythzoneminder() {
   depends=('mythtv')
   install='mythplugins-mythzoneminder.install'
 
-  cd "$srcdir/$pkgbase-$pkgver/mythzoneminder"
+  cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythzoneminder"
   make INSTALL_ROOT="$pkgdir" install
 }
diff --git a/community/mythplugins/mtd.rc b/community/mythplugins/mtd.rc
deleted file mode 100644
index 1f46dfed1..000000000
--- a/community/mythplugins/mtd.rc
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/mtd`
-case "$1" in
-  start)
-    stat_busy "Starting Myth Transcoding Daemon"
-    [ -z "$PID" ] && /usr/bin/mtd -d
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      echo $PID > /var/run/mtd.pid
-      add_daemon mythtranscode
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Myth Transcoding Daemon"
-    [ ! -z "$PID" ]  && kill $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon mtd 
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/mythplugins/php55.patch b/community/mythplugins/php55.patch
deleted file mode 100644
index eba7fd696..000000000
--- a/community/mythplugins/php55.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/mythweb/includes/errors.php
-+++ b/mythweb/includes/errors.php
-@@ -103,6 +103,9 @@
- /**/
-     function error_handler($errno, $errstr, $errfile, $errline, $vars) {
-         global $db;
-+    // Leave early if we haven't requested reports from this kind of error
-+        if (!($errno & error_reporting()))
-+            return;
-         if (class_exists('Translate'))
-             $errstr = Translate::find()->string($errstr);
-     // Try to auto-repair damaged SQL tables
-@@ -113,9 +116,6 @@
-             add_error('Regular Expression Error:  '.$match[1]);
-             return;
-         }
--    // Leave early if we haven't requested reports from this kind of error
--        if (!($errno & error_reporting()))
--            return;
-     // Fatal errors should report considerably more detail
-         if (in_array($errno, array(E_USER_ERROR, E_ERROR))) {
-         // What type of error?