[arch-commits] Commit in mythplugins/repos (6 files)
Maxime Gauduin
alucryd at archlinux.org
Sat Dec 30 21:57:14 UTC 2017
Date: Saturday, December 30, 2017 @ 21:57:09
Author: alucryd
Revision: 277490
archrelease: copy trunk to community-staging-x86_64
Added:
mythplugins/repos/community-staging-x86_64/
mythplugins/repos/community-staging-x86_64/PKGBUILD
(from rev 277489, mythplugins/trunk/PKGBUILD)
mythplugins/repos/community-staging-x86_64/cdparanoia.patch
(from rev 277489, mythplugins/trunk/cdparanoia.patch)
mythplugins/repos/community-staging-x86_64/mythplugins-mythweb.install
(from rev 277489, mythplugins/trunk/mythplugins-mythweb.install)
mythplugins/repos/community-staging-x86_64/mythplugins-mythzoneminder.install
(from rev 277489, mythplugins/trunk/mythplugins-mythzoneminder.install)
mythplugins/repos/community-staging-x86_64/qt510.patch
(from rev 277489, mythplugins/trunk/qt510.patch)
------------------------------------+
PKGBUILD | 147 +++++++++++++++++++++++++++++++++
cdparanoia.patch | 52 +++++++++++
mythplugins-mythweb.install | 4
mythplugins-mythzoneminder.install | 3
qt510.patch | 154 +++++++++++++++++++++++++++++++++++
5 files changed, 360 insertions(+)
Copied: mythplugins/repos/community-staging-x86_64/PKGBUILD (from rev 277489, mythplugins/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2017-12-30 21:57:09 UTC (rev 277490)
@@ -0,0 +1,147 @@
+# $Id$
+# Maintainer:
+# Contributor: 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=29.0
+pkgrel=4
+epoch=1
+arch=('x86_64')
+url="http://www.mythtv.org"
+license=('GPL')
+makedepends=('cdrtools' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'flac' 'libexif'
+ 'libvorbis' 'mesa' 'mesa-libgl' "mythtv=$epoch:$pkgver"
+ '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' 'python2-pillow'
+ 'python2-pycurl' 'zlib' 'gdb' 'perl-cgi')
+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'
+ 'qt510.patch')
+sha512sums=('6d79d943b95b1816b4fce52f3de3e01ebcdcc2779f852ec8cf5e3a81f8be4c730a254ff78b52e36ac522ff99b125501f0cba33a2d4c01571552e09fb4dba18c2'
+ 'bc6f4f6b73136f5c0342b055dd4814ed177b7ca05d70dcb43e7966c3cd854f77dcd7a391eef2b870acf87c82d09c018cf8fb5176724ab55b59a6f2ab3845e0fe'
+ '6a8c5e3f7500a657cef56d30b7141ab10bd14c65bf3c2d14a768ed180f38deaee6367224e6b0b2d09c26fae78908df08747f8c805250d71c42faaa2931ac577b'
+ 'da82e43545cf6c0e882e9729d30cdb1786019da6a1aaf59667594a3a9bebd613422557e470969d35dcad52bc9b255c5d762301eff4c8e759fb2b6a22cd0c8841')
+
+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"
+ patch -Np2 -i ../../qt510.patch
+
+ cd "$srcdir/mythweb-$pkgver"
+
+ sed -re 's@/usr/local.*/usr/share@/usr/share@' -i 'mythweb.php'
+}
+
+build() {
+ cd "$srcdir/mythtv-$pkgver/$pkgbase"
+
+ ./configure --prefix=/usr \
+ --enable-all \
+ --python=python2
+ qmake-qt5 mythplugins.pro
+ make -s
+}
+
+package_mythplugins-mytharchive() {
+ pkgdesc="Create DVDs or archive recorded shows in MythTV"
+ depends=('cdrtools' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'mythtv'
+ 'python2-pillow')
+
+ cd "$srcdir/mythtv-$pkgver/$pkgbase/mytharchive"
+ make INSTALL_ROOT="$pkgdir" install
+}
+
+package_mythplugins-mythbrowser() {
+ pkgdesc="Mini web browser for MythTV"
+ depends=('mythtv')
+
+ cd "$srcdir/mythtv-$pkgver/$pkgbase/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')
+
+ cd "$srcdir/mythtv-$pkgver/$pkgbase/mythgame"
+ make INSTALL_ROOT="$pkgdir" install
+}
+
+package_mythplugins-mythmusic() {
+ pkgdesc="Music playing plugin for MythTV"
+ depends=('mythtv' 'libcdio-paranoia')
+
+ cd "$srcdir/mythtv-$pkgver/$pkgbase/mythmusic"
+ make INSTALL_ROOT="$pkgdir" install
+}
+
+package_mythplugins-mythnetvision() {
+ pkgdesc="MythNetvision plugin for MythTV"
+ depends=('mythtv' 'python2-oauth')
+
+ cd "$srcdir/mythtv-$pkgver/$pkgbase/mythnetvision"
+ make INSTALL_ROOT="$pkgdir" install
+}
+
+package_mythplugins-mythnews() {
+ pkgdesc="News checking plugin for MythTV"
+ depends=('mythtv')
+
+ cd "$srcdir/mythtv-$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-$pkgver/$pkgbase/mythweather"
+ make INSTALL_ROOT="$pkgdir" install
+}
+
+package_mythplugins-mythweb() {
+ pkgdesc="Web interface for the MythTV scheduler"
+ depends=('mythtv' 'perl-cgi')
+ optdepends=('lighttpd'
+ 'php-apache')
+ install='mythplugins-mythweb.install'
+
+ mkdir -p "$pkgdir/var/lib/mythtv/mythweb"/{image_cache,php_sessions}
+ cp -R "$srcdir/mythweb-$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-$pkgver/$pkgbase/mythzoneminder"
+ make INSTALL_ROOT="$pkgdir" install
+}
Copied: mythplugins/repos/community-staging-x86_64/cdparanoia.patch (from rev 277489, mythplugins/trunk/cdparanoia.patch)
===================================================================
--- community-staging-x86_64/cdparanoia.patch (rev 0)
+++ community-staging-x86_64/cdparanoia.patch 2017-12-30 21:57:09 UTC (rev 277490)
@@ -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
Copied: mythplugins/repos/community-staging-x86_64/mythplugins-mythweb.install (from rev 277489, mythplugins/trunk/mythplugins-mythweb.install)
===================================================================
--- community-staging-x86_64/mythplugins-mythweb.install (rev 0)
+++ community-staging-x86_64/mythplugins-mythweb.install 2017-12-30 21:57:09 UTC (rev 277490)
@@ -0,0 +1,4 @@
+post_upgrade() {
+ echo "MythWeb files are now in /var/lib/mythtv/mythweb"
+ echo "Please update your server configuration accordingly"
+}
Copied: mythplugins/repos/community-staging-x86_64/mythplugins-mythzoneminder.install (from rev 277489, mythplugins/trunk/mythplugins-mythzoneminder.install)
===================================================================
--- community-staging-x86_64/mythplugins-mythzoneminder.install (rev 0)
+++ community-staging-x86_64/mythplugins-mythzoneminder.install 2017-12-30 21:57:09 UTC (rev 277490)
@@ -0,0 +1,3 @@
+post_install() {
+ echo "If you want to use this plugin, install zoneminder from AUR."
+}
Copied: mythplugins/repos/community-staging-x86_64/qt510.patch (from rev 277489, mythplugins/trunk/qt510.patch)
===================================================================
--- community-staging-x86_64/qt510.patch (rev 0)
+++ community-staging-x86_64/qt510.patch 2017-12-30 21:57:09 UTC (rev 277490)
@@ -0,0 +1,154 @@
+diff --git a/mythplugins/configure b/mythplugins/configure
+index 9ba22c8956..3b6cc3f914 100755
+--- a/mythplugins/configure
++++ b/mythplugins/configure
+@@ -527,14 +527,6 @@ EOF
+ die "Sanity test failed."
+ fi
+
+-is_qmake5(){
+- $1 --version 2>&1 | egrep -q -e "Qt version 5\.[0-9]\.[0-9]"
+-}
+-
+-is_qmake4(){
+- $1 --version 2>&1 | egrep -q -e "Qt version 4\.[8-9]\.[0-9]"
+-}
+-
+ # bring in mythtv config
+ if [ -e $prefix/include/mythtv/mythconfig.mak ] ; then
+ rm mythconfig.mak 2> /dev/null
+@@ -570,30 +562,40 @@ OPENGLES=$(cat mythconfig.mak | grep -e "^HAVE_GLES2_GL2_H=yes")
+ EXTRALIBS=$(cat mythconfig.mak | grep -e "^EXTRALIBS=")
+ EXTRALIBS=${EXTRALIBS#EXTRALIBS=}
+
++version2string(){
++ # accepts version as in 1.10.4 and turns it into 0001.0010.0004.0000.0000 which can be compared as a string
++ echo $1 | awk -F. '{ printf("%04d.%04d.%04d.%04d.%04d", $1, $2, $3, $4, $5); };'
++}
++
++# Minimum supported Qt version
++qt_minimum_version="5.2"
++
+ # qmake-qt5 /usr/lib64/qt5/bin/qmake /usr/lib/x86_64-linux-gnu/qt5/bin/qmake
+ if [ x"$qmake" = "xqmake" ]; then
+- CHECK_QMAKE="qmake-qt5 /usr/lib64/qt5/bin/qmake /usr/lib/x86_64-linux-gnu/qt5/bin/qmake /usr/lib/i386-linux-gnu/qt5/bin/qmake /usr/lib/arm-linux-gnueabihf/qt5/bin/qmake /usr/local/lib/qt5/bin/qmake $qmake qmake-qt4"
++ CHECK_QMAKE=`which -a qmake-qt5 2>/dev/null`" /usr/lib64/qt5/bin/qmake /usr/lib/x86_64-linux-gnu/qt5/bin/qmake /usr/lib/i386-linux-gnu/qt5/bin/qmake /usr/lib/arm-linux-gnueabihf/qt5/bin/qmake /usr/local/lib/qt5/bin/qmake `which -a $qmake 2>/dev/null`"
+ else
+- CHECK_QMAKE="$qmake qmake-qt5 /usr/lib64/qt5/bin/qmake /usr/lib/x86_64-linux-gnu/qt5/bin/qmake /usr/lib/i386-linux-gnu/qt5/bin/qmake /usr/lib/arm-linux-gnueabihf/qt5/bin/qmake /usr/local/lib/qt5/bin/qmake qmake-qt4"
++ CHECK_QMAKE=`which -a $qmake 2>/dev/null`" "`which -a qmake-qt5 2>/dev/null`" /usr/lib64/qt5/bin/qmake /usr/lib/x86_64-linux-gnu/qt5/bin/qmake /usr/lib/i386-linux-gnu/qt5/bin/qmake /usr/lib/arm-linux-gnueabihf/qt5/bin/qmake /usr/local/lib/qt5/bin/qmake"
+ fi
+ # try to find a qt5 qmake to use
+ found_qmake=''
+ for i in $CHECK_QMAKE; do
+- if is_qmake5 $i; then
+- found_qmake=$i
+- break;
+- elif is_qmake4 $i; then
+- found_qmake=$i
+- break;
++ if test -e $i ; then
++ qmake_version=`$i --version | sed -n "s/.*Qt version \([0-9]*\.[0-9]*\.[0-9]*\) .*/\1/p"`
++ if ! [ $(version2string $qmake_version) \< $(version2string $qt_minimum_version) ]; then
++ found_qmake=$i
++ break;
++ else
++ echo "found qmake at $i but version failed"
++ echo "got version: " `$i --version`
++ fi
+ fi
+ done
+ if [ x"$found_qmake" = "x" ]; then
+- die "qmake for Qt4.8 or newer not found.\nPlease specify the correct qmake with --qmake="
++ die "qmake for Qt version $qt_minimum_version or newer not found. Please specify the correct qmake with --qmake="
+ else
+ qmake=$found_qmake
+ fi
+
+-
+ # rely on what was discover during MythTV configure
+ if enabled opengl && test "$OPENGLV" != "CONFIG_OPENGL_VIDEO=yes"; then
+ disable opengl
+diff --git a/mythplugins/mythbrowser/mythbrowser/mythbrowser.pro b/mythplugins/mythbrowser/mythbrowser/mythbrowser.pro
+index 693e621b08..c7a39b5545 100644
+--- a/mythplugins/mythbrowser/mythbrowser/mythbrowser.pro
++++ b/mythplugins/mythbrowser/mythbrowser/mythbrowser.pro
+@@ -5,8 +5,7 @@ include (../../programs-libs.pro )
+ LIBS += -lmythtv-$$LIBVERSION
+
+ QT += network xml sql opengl
+-contains(QT_VERSION, ^4\\.[0-9]\\..*) : QT += webkit
+-contains(QT_VERSION, ^5\\.[0-9]\\..*) : QT += widgets webkitwidgets
++QT += widgets webkitwidgets
+
+ TEMPLATE = lib
+ CONFIG += thread opengl plugin warn_on
+diff --git a/mythplugins/mythmusic/mythmusic/mythmusic.pro b/mythplugins/mythmusic/mythmusic/mythmusic.pro
+index 0703da590f..88b35c3782 100644
+--- a/mythplugins/mythmusic/mythmusic/mythmusic.pro
++++ b/mythplugins/mythmusic/mythmusic/mythmusic.pro
+@@ -4,8 +4,7 @@ include ( ../../programs-libs.pro )
+ include (config.pro)
+
+ QT += xml sql opengl network
+-contains(QT_VERSION, ^4\\.[0-9]\\..*) : QT += webkit
+-contains(QT_VERSION, ^5\\.[0-9]\\..*) : QT += widgets webkitwidgets
++QT += widgets webkitwidgets
+
+ !exists( config.pro ) {
+ error(Missing config.pro: please run the configure script)
+diff --git a/mythplugins/mythnetvision/mythnetvision/mythnetvision.pro b/mythplugins/mythnetvision/mythnetvision/mythnetvision.pro
+index 2bf47ec5ee..a2f343ecef 100644
+--- a/mythplugins/mythnetvision/mythnetvision/mythnetvision.pro
++++ b/mythplugins/mythnetvision/mythnetvision/mythnetvision.pro
+@@ -3,9 +3,7 @@ include ( ../../settings.pro )
+ include ( ../../programs-libs.pro )
+
+ QT += network sql xml
+-contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+ QT += widgets
+-}
+
+ TEMPLATE = lib
+ CONFIG += plugin thread warn_on debug
+diff --git a/mythplugins/mythnews/mythnews/mythnews.pro b/mythplugins/mythnews/mythnews/mythnews.pro
+index d2bff02684..b757dffe07 100644
+--- a/mythplugins/mythnews/mythnews/mythnews.pro
++++ b/mythplugins/mythnews/mythnews/mythnews.pro
+@@ -3,9 +3,7 @@ include ( ../../settings.pro )
+ include ( ../../programs-libs.pro )
+
+ QT += network sql xml
+-contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+ QT += widgets
+-}
+
+ TEMPLATE = lib
+ CONFIG += plugin thread warn_on debug
+diff --git a/mythplugins/mythweather/mythweather/mythweather.pro b/mythplugins/mythweather/mythweather/mythweather.pro
+index ab0654b92d..3fb32a5c7c 100644
+--- a/mythplugins/mythweather/mythweather/mythweather.pro
++++ b/mythplugins/mythweather/mythweather/mythweather.pro
+@@ -3,9 +3,7 @@ include ( ../../settings.pro )
+ include ( ../../programs-libs.pro )
+
+ QT += sql xml network
+-contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+ QT += widgets
+-}
+
+ TEMPLATE = lib
+ CONFIG += plugin thread
+diff --git a/mythplugins/mythzoneminder/mythzoneminder/mythzoneminder.pro b/mythplugins/mythzoneminder/mythzoneminder/mythzoneminder.pro
+index e9b418c3d7..803be487ea 100644
+--- a/mythplugins/mythzoneminder/mythzoneminder/mythzoneminder.pro
++++ b/mythplugins/mythzoneminder/mythzoneminder/mythzoneminder.pro
+@@ -3,9 +3,7 @@ include ( ../../settings.pro )
+ include ( ../../programs-libs.pro )
+
+ QT += network
+-contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+ QT += widgets
+-}
+
+ TEMPLATE = lib
+ CONFIG += plugin thread
More information about the arch-commits
mailing list