[arch-commits] Commit in mythplugins/repos (20 files)
Jonathan Conder
jconder at nymeria.archlinux.org
Thu Sep 19 14:38:20 UTC 2013
Date: Thursday, September 19, 2013 @ 16:38:19
Author: jconder
Revision: 97427
archrelease: copy trunk to community-i686, community-x86_64
Added:
mythplugins/repos/community-i686/PKGBUILD
(from rev 97426, mythplugins/trunk/PKGBUILD)
mythplugins/repos/community-i686/cdparanoia.patch
(from rev 97426, mythplugins/trunk/cdparanoia.patch)
mythplugins/repos/community-i686/mythplugins-mythweb.install
(from rev 97426, mythplugins/trunk/mythplugins-mythweb.install)
mythplugins/repos/community-i686/mythplugins-mythzoneminder.install
(from rev 97426, mythplugins/trunk/mythplugins-mythzoneminder.install)
mythplugins/repos/community-x86_64/PKGBUILD
(from rev 97426, mythplugins/trunk/PKGBUILD)
mythplugins/repos/community-x86_64/cdparanoia.patch
(from rev 97426, mythplugins/trunk/cdparanoia.patch)
mythplugins/repos/community-x86_64/mythplugins-mythweb.install
(from rev 97426, mythplugins/trunk/mythplugins-mythweb.install)
mythplugins/repos/community-x86_64/mythplugins-mythzoneminder.install
(from rev 97426, mythplugins/trunk/mythplugins-mythzoneminder.install)
Deleted:
mythplugins/repos/community-i686/PKGBUILD
mythplugins/repos/community-i686/cdparanoia.patch
mythplugins/repos/community-i686/mtd.rc
mythplugins/repos/community-i686/mythplugins-mythweb.install
mythplugins/repos/community-i686/mythplugins-mythzoneminder.install
mythplugins/repos/community-i686/php55.patch
mythplugins/repos/community-x86_64/PKGBUILD
mythplugins/repos/community-x86_64/cdparanoia.patch
mythplugins/repos/community-x86_64/mtd.rc
mythplugins/repos/community-x86_64/mythplugins-mythweb.install
mythplugins/repos/community-x86_64/mythplugins-mythzoneminder.install
mythplugins/repos/community-x86_64/php55.patch
-----------------------------------------------------+
/PKGBUILD | 286 ++++++++++++++++++
/cdparanoia.patch | 104 ++++++
/mythplugins-mythweb.install | 8
/mythplugins-mythzoneminder.install | 6
community-i686/PKGBUILD | 141 --------
community-i686/cdparanoia.patch | 52 ---
community-i686/mtd.rc | 36 --
community-i686/mythplugins-mythweb.install | 4
community-i686/mythplugins-mythzoneminder.install | 3
community-i686/php55.patch | 22 -
community-x86_64/PKGBUILD | 141 --------
community-x86_64/cdparanoia.patch | 52 ---
community-x86_64/mtd.rc | 36 --
community-x86_64/mythplugins-mythweb.install | 4
community-x86_64/mythplugins-mythzoneminder.install | 3
community-x86_64/php55.patch | 22 -
16 files changed, 404 insertions(+), 516 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-09-19 14:37:16 UTC (rev 97426)
+++ community-i686/PKGBUILD 2013-09-19 14:38:19 UTC (rev 97427)
@@ -1,141 +0,0 @@
-# $Id$
-# Maintainer: Jonathan Conder <jonno.conder at gmail.com>
-# Contributor: Giovanni Scafora <giovanni at archlinux.org>
-
-pkgbase=mythplugins
-pkgname=('mythplugins-mytharchive'
- 'mythplugins-mythbrowser'
- 'mythplugins-mythgallery'
- 'mythplugins-mythgame'
- 'mythplugins-mythmusic'
- 'mythplugins-mythnetvision'
- 'mythplugins-mythnews'
- 'mythplugins-mythweather'
- 'mythplugins-mythweb'
- 'mythplugins-mythzoneminder')
-pkgver=0.26.1
-pkgrel=1
-epoch=1
-arch=('i686' 'x86_64')
-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')
-
-build() {
- cd "$srcdir/$pkgbase-$pkgver"
- find . -name '*.py' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
-
- sed -re 's@/usr/local.*/usr/share@/usr/share@' -i 'mythweb/mythweb.php'
- sed -re 's at cstdio@cstdio>\n#include <unistd.h@' -i 'mythzoneminder/mythzmserver/zmserver.cpp'
-
- patch -Np1 -i "$srcdir/cdparanoia.patch"
- patch -Np1 -i "$srcdir/php55.patch"
-
- ./configure --prefix=/usr \
- --enable-all \
- --python=python2
- qmake-qt4 mythplugins.pro
- make -s
-}
-
-package_mythplugins-mytharchive() {
- pkgdesc="Create DVDs or archive recorded shows in MythTV"
- depends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'mythtv'
- 'python-imaging')
-
- cd "$srcdir/$pkgbase-$pkgver/mytharchive"
- make INSTALL_ROOT="$pkgdir" install
-}
-
-package_mythplugins-mythbrowser() {
- pkgdesc="Mini web browser for MythTV"
- depends=('mythtv')
-
- cd "$srcdir/$pkgbase-$pkgver/mythbrowser"
- make INSTALL_ROOT="$pkgdir" install
-}
-
-package_mythplugins-mythgallery() {
- pkgdesc="Image gallery plugin for MythTV"
- depends=('libexif' 'mythtv')
-
- cd "$srcdir/$pkgbase-$pkgver/mythgallery"
- make INSTALL_ROOT="$pkgdir" install
-}
-
-package_mythplugins-mythgame() {
- pkgdesc="Game emulator plugin for MythTV"
- depends=('mythtv')
-
- cd "$srcdir/$pkgbase-$pkgver/mythgame"
- make INSTALL_ROOT="$pkgdir" install
-}
-
-package_mythplugins-mythmusic() {
- pkgdesc="Music playing plugin for MythTV"
- depends=('mythtv' 'libcdio-paranoia' 'taglib')
-
- cd "$srcdir/$pkgbase-$pkgver/mythmusic"
- make INSTALL_ROOT="$pkgdir" install
-}
-
-package_mythplugins-mythnetvision() {
- pkgdesc="MythNetvision plugin for MythTV"
- depends=('mythtv' 'python2-oauth')
-
- cd "$srcdir/$pkgbase-$pkgver/mythnetvision"
- make INSTALL_ROOT="$pkgdir" install
-}
-
-package_mythplugins-mythnews() {
- pkgdesc="News checking plugin for MythTV"
- depends=('mythtv')
-
- cd "$srcdir/$pkgbase-$pkgver/mythnews"
- make INSTALL_ROOT="$pkgdir" install
-}
-
-package_mythplugins-mythweather() {
- pkgdesc="Weather checking plugin for MythTV"
- depends=('mythtv' 'perl-date-manip' 'perl-json' 'perl-soap-lite'
- 'perl-xml-sax' 'perl-xml-simple' 'perl-xml-xpath' 'perl-image-size'
- 'perl-datetime-format-iso8601')
-
- cd "$srcdir/$pkgbase-$pkgver/mythweather"
- make INSTALL_ROOT="$pkgdir" install
-}
-
-package_mythplugins-mythweb() {
- pkgdesc="Web interface for the MythTV scheduler"
- depends=('mythtv')
- optdepends=('lighttpd'
- 'php-apache')
- 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"
- chown -R http:http "$pkgdir/var/lib/mythtv/mythweb"
- chmod g+rw "$pkgdir/var/lib/mythtv/mythweb"/{image_cache,php_sessions}
-}
-
-package_mythplugins-mythzoneminder() {
- pkgdesc="View CCTV footage from zoneminder in MythTV"
- depends=('mythtv')
- install='mythplugins-mythzoneminder.install'
-
- cd "$srcdir/$pkgbase-$pkgver/mythzoneminder"
- make INSTALL_ROOT="$pkgdir" install
-}
Copied: mythplugins/repos/community-i686/PKGBUILD (from rev 97426, mythplugins/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-09-19 14:38:19 UTC (rev 97427)
@@ -0,0 +1,143 @@
+# $Id$
+# Maintainer: Jonathan Conder <jonno.conder at gmail.com>
+# Contributor: Giovanni Scafora <giovanni at archlinux.org>
+
+pkgbase=mythplugins
+pkgname=('mythplugins-mytharchive'
+ 'mythplugins-mythbrowser'
+ 'mythplugins-mythgallery'
+ 'mythplugins-mythgame'
+ 'mythplugins-mythmusic'
+ 'mythplugins-mythnetvision'
+ 'mythplugins-mythnews'
+ 'mythplugins-mythweather'
+ 'mythplugins-mythweb'
+ 'mythplugins-mythzoneminder')
+pkgver=0.27
+pkgrel=1
+epoch=1
+arch=('i686' 'x86_64')
+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' '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"
+
+ find . -name '*.py' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
+ patch -Np1 -i "$srcdir/cdparanoia.patch"
+
+ cd "$srcdir/mythweb-fixes-$pkgver"
+
+ sed -re 's@/usr/local.*/usr/share@/usr/share@' -i 'mythweb.php'
+}
+
+build() {
+ cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase"
+
+ ./configure --prefix=/usr \
+ --enable-all \
+ --python=python2
+ qmake-qt4 mythplugins.pro
+ make -s
+}
+
+package_mythplugins-mytharchive() {
+ pkgdesc="Create DVDs or archive recorded shows in MythTV"
+ depends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'mythtv'
+ 'python-imaging')
+
+ cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mytharchive"
+ make INSTALL_ROOT="$pkgdir" install
+}
+
+package_mythplugins-mythbrowser() {
+ pkgdesc="Mini web browser for MythTV"
+ depends=('mythtv')
+
+ cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythbrowser"
+ make INSTALL_ROOT="$pkgdir" install
+}
+
+package_mythplugins-mythgallery() {
+ pkgdesc="Image gallery plugin for MythTV"
+ depends=('libexif' 'mythtv')
+
+ cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythgallery"
+ make INSTALL_ROOT="$pkgdir" install
+}
+
+package_mythplugins-mythgame() {
+ pkgdesc="Game emulator plugin for MythTV"
+ depends=('mythtv')
+
+ 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')
+
+ cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythmusic"
+ make INSTALL_ROOT="$pkgdir" install
+}
+
+package_mythplugins-mythnetvision() {
+ pkgdesc="MythNetvision plugin for MythTV"
+ depends=('mythtv' 'python2-oauth')
+
+ cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythnetvision"
+ make INSTALL_ROOT="$pkgdir" install
+}
+
+package_mythplugins-mythnews() {
+ pkgdesc="News checking plugin for MythTV"
+ depends=('mythtv')
+
+ cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythnews"
+ make INSTALL_ROOT="$pkgdir" install
+}
+
+package_mythplugins-mythweather() {
+ pkgdesc="Weather checking plugin for MythTV"
+ depends=('mythtv' 'perl-date-manip' 'perl-json' 'perl-soap-lite'
+ 'perl-xml-sax' 'perl-xml-simple' 'perl-xml-xpath' 'perl-image-size'
+ 'perl-datetime-format-iso8601')
+
+ cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythweather"
+ make INSTALL_ROOT="$pkgdir" install
+}
+
+package_mythplugins-mythweb() {
+ pkgdesc="Web interface for the MythTV scheduler"
+ depends=('mythtv')
+ optdepends=('lighttpd'
+ 'php-apache')
+ install='mythplugins-mythweb.install'
+
+ mkdir -p "$pkgdir/var/lib/mythtv/mythweb"/{image_cache,php_sessions}
+ 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}
+}
+
+package_mythplugins-mythzoneminder() {
+ pkgdesc="View CCTV footage from zoneminder in MythTV"
+ depends=('mythtv')
+ install='mythplugins-mythzoneminder.install'
+
+ cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythzoneminder"
+ make INSTALL_ROOT="$pkgdir" install
+}
Deleted: community-i686/cdparanoia.patch
===================================================================
--- community-i686/cdparanoia.patch 2013-09-19 14:37:16 UTC (rev 97426)
+++ community-i686/cdparanoia.patch 2013-09-19 14:38:19 UTC (rev 97427)
@@ -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
Copied: mythplugins/repos/community-i686/cdparanoia.patch (from rev 97426, mythplugins/trunk/cdparanoia.patch)
===================================================================
--- community-i686/cdparanoia.patch (rev 0)
+++ community-i686/cdparanoia.patch 2013-09-19 14:38:19 UTC (rev 97427)
@@ -0,0 +1,52 @@
+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
Deleted: community-i686/mtd.rc
===================================================================
--- community-i686/mtd.rc 2013-09-19 14:37:16 UTC (rev 97426)
+++ community-i686/mtd.rc 2013-09-19 14:38:19 UTC (rev 97427)
@@ -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
Deleted: community-i686/mythplugins-mythweb.install
===================================================================
--- community-i686/mythplugins-mythweb.install 2013-09-19 14:37:16 UTC (rev 97426)
+++ community-i686/mythplugins-mythweb.install 2013-09-19 14:38:19 UTC (rev 97427)
@@ -1,4 +0,0 @@
-post_upgrade() {
- echo "MythWeb files are now in /var/lib/mythtv/mythweb"
- echo "Please update your server configuration accordingly"
-}
Copied: mythplugins/repos/community-i686/mythplugins-mythweb.install (from rev 97426, mythplugins/trunk/mythplugins-mythweb.install)
===================================================================
--- community-i686/mythplugins-mythweb.install (rev 0)
+++ community-i686/mythplugins-mythweb.install 2013-09-19 14:38:19 UTC (rev 97427)
@@ -0,0 +1,4 @@
+post_upgrade() {
+ echo "MythWeb files are now in /var/lib/mythtv/mythweb"
+ echo "Please update your server configuration accordingly"
+}
Deleted: community-i686/mythplugins-mythzoneminder.install
===================================================================
--- community-i686/mythplugins-mythzoneminder.install 2013-09-19 14:37:16 UTC (rev 97426)
+++ community-i686/mythplugins-mythzoneminder.install 2013-09-19 14:38:19 UTC (rev 97427)
@@ -1,3 +0,0 @@
-post_install() {
- echo "If you want to use this plugin, install zoneminder from AUR."
-}
Copied: mythplugins/repos/community-i686/mythplugins-mythzoneminder.install (from rev 97426, mythplugins/trunk/mythplugins-mythzoneminder.install)
===================================================================
--- community-i686/mythplugins-mythzoneminder.install (rev 0)
+++ community-i686/mythplugins-mythzoneminder.install 2013-09-19 14:38:19 UTC (rev 97427)
@@ -0,0 +1,3 @@
+post_install() {
+ echo "If you want to use this plugin, install zoneminder from AUR."
+}
Deleted: community-i686/php55.patch
===================================================================
--- community-i686/php55.patch 2013-09-19 14:37:16 UTC (rev 97426)
+++ community-i686/php55.patch 2013-09-19 14:38:19 UTC (rev 97427)
@@ -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?
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-09-19 14:37:16 UTC (rev 97426)
+++ community-x86_64/PKGBUILD 2013-09-19 14:38:19 UTC (rev 97427)
@@ -1,141 +0,0 @@
-# $Id$
-# Maintainer: Jonathan Conder <jonno.conder at gmail.com>
-# Contributor: Giovanni Scafora <giovanni at archlinux.org>
-
-pkgbase=mythplugins
-pkgname=('mythplugins-mytharchive'
- 'mythplugins-mythbrowser'
- 'mythplugins-mythgallery'
- 'mythplugins-mythgame'
- 'mythplugins-mythmusic'
- 'mythplugins-mythnetvision'
- 'mythplugins-mythnews'
- 'mythplugins-mythweather'
- 'mythplugins-mythweb'
- 'mythplugins-mythzoneminder')
-pkgver=0.26.1
-pkgrel=1
-epoch=1
-arch=('i686' 'x86_64')
-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')
-
-build() {
- cd "$srcdir/$pkgbase-$pkgver"
- find . -name '*.py' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
-
- sed -re 's@/usr/local.*/usr/share@/usr/share@' -i 'mythweb/mythweb.php'
- sed -re 's at cstdio@cstdio>\n#include <unistd.h@' -i 'mythzoneminder/mythzmserver/zmserver.cpp'
-
- patch -Np1 -i "$srcdir/cdparanoia.patch"
- patch -Np1 -i "$srcdir/php55.patch"
-
- ./configure --prefix=/usr \
- --enable-all \
- --python=python2
- qmake-qt4 mythplugins.pro
- make -s
-}
-
-package_mythplugins-mytharchive() {
- pkgdesc="Create DVDs or archive recorded shows in MythTV"
- depends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'mythtv'
- 'python-imaging')
-
- cd "$srcdir/$pkgbase-$pkgver/mytharchive"
- make INSTALL_ROOT="$pkgdir" install
-}
-
-package_mythplugins-mythbrowser() {
- pkgdesc="Mini web browser for MythTV"
- depends=('mythtv')
-
- cd "$srcdir/$pkgbase-$pkgver/mythbrowser"
- make INSTALL_ROOT="$pkgdir" install
-}
-
-package_mythplugins-mythgallery() {
- pkgdesc="Image gallery plugin for MythTV"
- depends=('libexif' 'mythtv')
-
- cd "$srcdir/$pkgbase-$pkgver/mythgallery"
- make INSTALL_ROOT="$pkgdir" install
-}
-
-package_mythplugins-mythgame() {
- pkgdesc="Game emulator plugin for MythTV"
- depends=('mythtv')
-
- cd "$srcdir/$pkgbase-$pkgver/mythgame"
- make INSTALL_ROOT="$pkgdir" install
-}
-
-package_mythplugins-mythmusic() {
- pkgdesc="Music playing plugin for MythTV"
- depends=('mythtv' 'libcdio-paranoia' 'taglib')
-
- cd "$srcdir/$pkgbase-$pkgver/mythmusic"
- make INSTALL_ROOT="$pkgdir" install
-}
-
-package_mythplugins-mythnetvision() {
- pkgdesc="MythNetvision plugin for MythTV"
- depends=('mythtv' 'python2-oauth')
-
- cd "$srcdir/$pkgbase-$pkgver/mythnetvision"
- make INSTALL_ROOT="$pkgdir" install
-}
-
-package_mythplugins-mythnews() {
- pkgdesc="News checking plugin for MythTV"
- depends=('mythtv')
-
- cd "$srcdir/$pkgbase-$pkgver/mythnews"
- make INSTALL_ROOT="$pkgdir" install
-}
-
-package_mythplugins-mythweather() {
- pkgdesc="Weather checking plugin for MythTV"
- depends=('mythtv' 'perl-date-manip' 'perl-json' 'perl-soap-lite'
- 'perl-xml-sax' 'perl-xml-simple' 'perl-xml-xpath' 'perl-image-size'
- 'perl-datetime-format-iso8601')
-
- cd "$srcdir/$pkgbase-$pkgver/mythweather"
- make INSTALL_ROOT="$pkgdir" install
-}
-
-package_mythplugins-mythweb() {
- pkgdesc="Web interface for the MythTV scheduler"
- depends=('mythtv')
- optdepends=('lighttpd'
- 'php-apache')
- 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"
- chown -R http:http "$pkgdir/var/lib/mythtv/mythweb"
- chmod g+rw "$pkgdir/var/lib/mythtv/mythweb"/{image_cache,php_sessions}
-}
-
-package_mythplugins-mythzoneminder() {
- pkgdesc="View CCTV footage from zoneminder in MythTV"
- depends=('mythtv')
- install='mythplugins-mythzoneminder.install'
-
- cd "$srcdir/$pkgbase-$pkgver/mythzoneminder"
- make INSTALL_ROOT="$pkgdir" install
-}
Copied: mythplugins/repos/community-x86_64/PKGBUILD (from rev 97426, mythplugins/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-09-19 14:38:19 UTC (rev 97427)
@@ -0,0 +1,143 @@
+# $Id$
+# Maintainer: Jonathan Conder <jonno.conder at gmail.com>
+# Contributor: Giovanni Scafora <giovanni at archlinux.org>
+
+pkgbase=mythplugins
+pkgname=('mythplugins-mytharchive'
+ 'mythplugins-mythbrowser'
+ 'mythplugins-mythgallery'
+ 'mythplugins-mythgame'
+ 'mythplugins-mythmusic'
+ 'mythplugins-mythnetvision'
+ 'mythplugins-mythnews'
+ 'mythplugins-mythweather'
+ 'mythplugins-mythweb'
+ 'mythplugins-mythzoneminder')
+pkgver=0.27
+pkgrel=1
+epoch=1
+arch=('i686' 'x86_64')
+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' '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"
+
+ find . -name '*.py' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
+ patch -Np1 -i "$srcdir/cdparanoia.patch"
+
+ cd "$srcdir/mythweb-fixes-$pkgver"
+
+ sed -re 's@/usr/local.*/usr/share@/usr/share@' -i 'mythweb.php'
+}
+
+build() {
+ cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase"
+
+ ./configure --prefix=/usr \
+ --enable-all \
+ --python=python2
+ qmake-qt4 mythplugins.pro
+ make -s
+}
+
+package_mythplugins-mytharchive() {
+ pkgdesc="Create DVDs or archive recorded shows in MythTV"
+ depends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'mythtv'
+ 'python-imaging')
+
+ cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mytharchive"
+ make INSTALL_ROOT="$pkgdir" install
+}
+
+package_mythplugins-mythbrowser() {
+ pkgdesc="Mini web browser for MythTV"
+ depends=('mythtv')
+
+ cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythbrowser"
+ make INSTALL_ROOT="$pkgdir" install
+}
+
+package_mythplugins-mythgallery() {
+ pkgdesc="Image gallery plugin for MythTV"
+ depends=('libexif' 'mythtv')
+
+ cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythgallery"
+ make INSTALL_ROOT="$pkgdir" install
+}
+
+package_mythplugins-mythgame() {
+ pkgdesc="Game emulator plugin for MythTV"
+ depends=('mythtv')
+
+ 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')
+
+ cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythmusic"
+ make INSTALL_ROOT="$pkgdir" install
+}
+
+package_mythplugins-mythnetvision() {
+ pkgdesc="MythNetvision plugin for MythTV"
+ depends=('mythtv' 'python2-oauth')
+
+ cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythnetvision"
+ make INSTALL_ROOT="$pkgdir" install
+}
+
+package_mythplugins-mythnews() {
+ pkgdesc="News checking plugin for MythTV"
+ depends=('mythtv')
+
+ cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythnews"
+ make INSTALL_ROOT="$pkgdir" install
+}
+
+package_mythplugins-mythweather() {
+ pkgdesc="Weather checking plugin for MythTV"
+ depends=('mythtv' 'perl-date-manip' 'perl-json' 'perl-soap-lite'
+ 'perl-xml-sax' 'perl-xml-simple' 'perl-xml-xpath' 'perl-image-size'
+ 'perl-datetime-format-iso8601')
+
+ cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythweather"
+ make INSTALL_ROOT="$pkgdir" install
+}
+
+package_mythplugins-mythweb() {
+ pkgdesc="Web interface for the MythTV scheduler"
+ depends=('mythtv')
+ optdepends=('lighttpd'
+ 'php-apache')
+ install='mythplugins-mythweb.install'
+
+ mkdir -p "$pkgdir/var/lib/mythtv/mythweb"/{image_cache,php_sessions}
+ 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}
+}
+
+package_mythplugins-mythzoneminder() {
+ pkgdesc="View CCTV footage from zoneminder in MythTV"
+ depends=('mythtv')
+ install='mythplugins-mythzoneminder.install'
+
+ cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythzoneminder"
+ make INSTALL_ROOT="$pkgdir" install
+}
Deleted: community-x86_64/cdparanoia.patch
===================================================================
--- community-x86_64/cdparanoia.patch 2013-09-19 14:37:16 UTC (rev 97426)
+++ community-x86_64/cdparanoia.patch 2013-09-19 14:38:19 UTC (rev 97427)
@@ -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
Copied: mythplugins/repos/community-x86_64/cdparanoia.patch (from rev 97426, mythplugins/trunk/cdparanoia.patch)
===================================================================
--- community-x86_64/cdparanoia.patch (rev 0)
+++ community-x86_64/cdparanoia.patch 2013-09-19 14:38:19 UTC (rev 97427)
@@ -0,0 +1,52 @@
+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
Deleted: community-x86_64/mtd.rc
===================================================================
--- community-x86_64/mtd.rc 2013-09-19 14:37:16 UTC (rev 97426)
+++ community-x86_64/mtd.rc 2013-09-19 14:38:19 UTC (rev 97427)
@@ -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
Deleted: community-x86_64/mythplugins-mythweb.install
===================================================================
--- community-x86_64/mythplugins-mythweb.install 2013-09-19 14:37:16 UTC (rev 97426)
+++ community-x86_64/mythplugins-mythweb.install 2013-09-19 14:38:19 UTC (rev 97427)
@@ -1,4 +0,0 @@
-post_upgrade() {
- echo "MythWeb files are now in /var/lib/mythtv/mythweb"
- echo "Please update your server configuration accordingly"
-}
Copied: mythplugins/repos/community-x86_64/mythplugins-mythweb.install (from rev 97426, mythplugins/trunk/mythplugins-mythweb.install)
===================================================================
--- community-x86_64/mythplugins-mythweb.install (rev 0)
+++ community-x86_64/mythplugins-mythweb.install 2013-09-19 14:38:19 UTC (rev 97427)
@@ -0,0 +1,4 @@
+post_upgrade() {
+ echo "MythWeb files are now in /var/lib/mythtv/mythweb"
+ echo "Please update your server configuration accordingly"
+}
Deleted: community-x86_64/mythplugins-mythzoneminder.install
===================================================================
--- community-x86_64/mythplugins-mythzoneminder.install 2013-09-19 14:37:16 UTC (rev 97426)
+++ community-x86_64/mythplugins-mythzoneminder.install 2013-09-19 14:38:19 UTC (rev 97427)
@@ -1,3 +0,0 @@
-post_install() {
- echo "If you want to use this plugin, install zoneminder from AUR."
-}
Copied: mythplugins/repos/community-x86_64/mythplugins-mythzoneminder.install (from rev 97426, mythplugins/trunk/mythplugins-mythzoneminder.install)
===================================================================
--- community-x86_64/mythplugins-mythzoneminder.install (rev 0)
+++ community-x86_64/mythplugins-mythzoneminder.install 2013-09-19 14:38:19 UTC (rev 97427)
@@ -0,0 +1,3 @@
+post_install() {
+ echo "If you want to use this plugin, install zoneminder from AUR."
+}
Deleted: community-x86_64/php55.patch
===================================================================
--- community-x86_64/php55.patch 2013-09-19 14:37:16 UTC (rev 97426)
+++ community-x86_64/php55.patch 2013-09-19 14:38:19 UTC (rev 97427)
@@ -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?
More information about the arch-commits
mailing list