summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO49
-rw-r--r--PKGBUILD85
2 files changed, 63 insertions, 71 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4bb417c23135..330648fb61fe 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,14 @@
pkgbase = mythplugins
- pkgver = 30.0
- pkgrel = 3
- epoch = 1
+ pkgver = 34.0.r16.g95fb10412c
+ pkgrel = 1
+ epoch = 0
url = http://www.mythtv.org
- arch = x86_64
+ arch = any
license = GPL
makedepends = dvdauthor
makedepends = dvd+rw-tools
- makedepends = ffmpeg
- makedepends = libexif
makedepends = mesa-libgl
- makedepends = mythtv=1:30.0
+ makedepends = mythtv-git>=34.0.r16.g95fb10412c
makedepends = perl-datetime-format-iso8601
makedepends = perl-date-manip
makedepends = perl-image-size
@@ -21,39 +19,31 @@ pkgbase = mythplugins
makedepends = perl-xml-simple
makedepends = perl-xml-xpath
makedepends = libhdhomerun
- makedepends = python2-pillow
- makedepends = python2-pycurl
- makedepends = python2-oauth
+ makedepends = python-pillow
+ makedepends = python-pycurl
makedepends = gdb
- makedepends = libmariadbclient
+ makedepends = mariadb-libs
makedepends = minizip
- makedepends = python2-lxml
- makedepends = mysql-python
- makedepends = urlgrabber
- makedepends = python2-future
+ makedepends = python-lxml
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 = 7f7ae9b8927659616f181afc12d7ddc26b0a4b0d13982e2586985f4770640b43
- sha256sums = b0569bdd6f5e6fed959d98ff883912142da42e3ee6ea3984ece116f09a5dc01c
+ makedepends = python-urllib3
+ makedepends = libcdio-paranoia
+ source = git+https://github.com/MythTV/mythweb#branch=fixes/34
+ source = git+https://github.com/MythTV/mythtv#branch=fixes/34
+ sha256sums = SKIP
+ sha256sums = SKIP
pkgname = mythplugins-mytharchive
pkgdesc = Create DVDs or archive recorded shows in MythTV
depends = dvdauthor
depends = dvd+rw-tools
- depends = ffmpeg
depends = mythtv
- depends = python2-pillow
+ depends = python-pillow
pkgname = mythplugins-mythbrowser
pkgdesc = Mini web browser for MythTV
depends = mythtv
-pkgname = mythplugins-mythgallery
- pkgdesc = Image gallery plugin for MythTV
- depends = libexif
- depends = mythtv
-
pkgname = mythplugins-mythgame
pkgdesc = Game emulator plugin for MythTV
depends = mythtv
@@ -67,7 +57,7 @@ pkgname = mythplugins-mythmusic
pkgname = mythplugins-mythnetvision
pkgdesc = MythNetvision plugin for MythTV
depends = mythtv
- depends = python2-oauth
+ depends = python-urllib3
pkgname = mythplugins-mythnews
pkgdesc = News checking plugin for MythTV
@@ -90,10 +80,11 @@ pkgname = mythplugins-mythweb
depends = perl-cgi
optdepends = lighttpd
optdepends = php-apache
+ optdepends = php-fpm
+ optdepends = nginx
pkgname = mythplugins-mythzoneminder
pkgdesc = View CCTV footage from zoneminder in MythTV
depends = mythtv
- depends = libmariadbclient
+ depends = mariadb-libs
depends = zoneminder
-
diff --git a/PKGBUILD b/PKGBUILD
index cf1641673077..8ddee35c97bf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,11 @@
-# Maintainer: Taijian <taijian@posteo.de>
+# Maintainer: pvdp <pvdp@email.com>
+# Contributor: Taijian <taijian@posteo.de>
# Contributor: Jonathan Conder <jonno.conder@gmail.com>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
pkgbase=mythplugins
pkgname=('mythplugins-mytharchive'
'mythplugins-mythbrowser'
- 'mythplugins-mythgallery'
'mythplugins-mythgame'
'mythplugins-mythmusic'
'mythplugins-mythnetvision'
@@ -13,48 +13,53 @@ pkgname=('mythplugins-mytharchive'
'mythplugins-mythweather'
'mythplugins-mythweb'
'mythplugins-mythzoneminder')
-pkgver=30.0
-pkgrel=3
-epoch=1
-arch=('x86_64')
+br=fixes/34
+t="${br#*/}+${br%/[0-9][0-9]}"
+pkgver=34.0.r16.g95fb10412c
+pkgrel=1
+epoch=0
+arch=('any')
url="http://www.mythtv.org"
license=('GPL')
-makedepends=('dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'libexif' 'mesa-libgl' "mythtv=$epoch:$pkgver"
+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'
- 'python2-pillow' 'python2-pycurl' 'python2-oauth' 'gdb' 'libmariadbclient' 'minizip'
- 'python2-lxml' 'mysql-python' 'urlgrabber' 'python2-future' '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"
+ '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"
)
-sha256sums=('7f7ae9b8927659616f181afc12d7ddc26b0a4b0d13982e2586985f4770640b43'
- 'b0569bdd6f5e6fed959d98ff883912142da42e3ee6ea3984ece116f09a5dc01c')
-prepare() {
- cd "$srcdir/mythtv-$pkgver/$pkgbase"
-
- find . -name '*.py' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
+sha256sums=('SKIP'
+ 'SKIP')
- cd "$srcdir/mythweb-$pkgver"
+pkgver() {
+ cd "${srcdir}/mythtv/$pkgbase"
+ printf "%s" "$(git describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g')"
+}
+prepare() {
+ cd "$srcdir/mythtv/$pkgbase"
+
+ cd "$srcdir/mythweb"
+
sed -re 's@/usr/local.*/usr/share@/usr/share@' -i 'mythweb.php'
}
build() {
- cd "$srcdir/mythtv-$pkgver/$pkgbase"
+ cd "$srcdir/mythtv/$pkgbase"
./configure --prefix=/usr \
- --enable-all \
- --python=python2
+ --enable-all
qmake-qt5 mythplugins.pro
make -s
}
package_mythplugins-mytharchive() {
pkgdesc="Create DVDs or archive recorded shows in MythTV"
- depends=('dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'mythtv' 'python2-pillow')
+ depends=('dvdauthor' 'dvd+rw-tools' 'mythtv' 'python-pillow')
- cd "$srcdir/mythtv-$pkgver/$pkgbase/mytharchive"
+ cd "$srcdir/mythtv/$pkgbase/mytharchive"
make INSTALL_ROOT="$pkgdir" install
}
@@ -62,15 +67,7 @@ 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"
+ cd "$srcdir/mythtv/$pkgbase/mythbrowser"
make INSTALL_ROOT="$pkgdir" install
}
@@ -78,7 +75,7 @@ package_mythplugins-mythgame() {
pkgdesc="Game emulator plugin for MythTV"
depends=('mythtv' 'minizip')
- cd "$srcdir/mythtv-$pkgver/$pkgbase/mythgame"
+ cd "$srcdir/mythtv/$pkgbase/mythgame"
make INSTALL_ROOT="$pkgdir" install
}
@@ -86,15 +83,15 @@ package_mythplugins-mythmusic() {
pkgdesc="Music playing plugin for MythTV"
depends=('mythtv' 'libcdio-paranoia')
- cd "$srcdir/mythtv-$pkgver/$pkgbase/mythmusic"
+ cd "$srcdir/mythtv/$pkgbase/mythmusic"
make INSTALL_ROOT="$pkgdir" install
}
package_mythplugins-mythnetvision() {
pkgdesc="MythNetvision plugin for MythTV"
- depends=('mythtv' 'python2-oauth')
+ depends=('mythtv' 'python-urllib3')
- cd "$srcdir/mythtv-$pkgver/$pkgbase/mythnetvision"
+ cd "$srcdir/mythtv/$pkgbase/mythnetvision"
make INSTALL_ROOT="$pkgdir" install
}
@@ -102,7 +99,7 @@ package_mythplugins-mythnews() {
pkgdesc="News checking plugin for MythTV"
depends=('mythtv')
- cd "$srcdir/mythtv-$pkgver/$pkgbase/mythnews"
+ cd "$srcdir/mythtv/$pkgbase/mythnews"
make INSTALL_ROOT="$pkgdir" install
}
@@ -112,7 +109,7 @@ package_mythplugins-mythweather() {
'perl-xml-simple' 'perl-xml-xpath' 'perl-image-size'
'perl-datetime-format-iso8601')
- cd "$srcdir/mythtv-$pkgver/$pkgbase/mythweather"
+ cd "$srcdir/mythtv/$pkgbase/mythweather"
make INSTALL_ROOT="$pkgdir" install
}
@@ -120,18 +117,22 @@ package_mythplugins-mythweb() {
pkgdesc="Web interface for the MythTV scheduler"
depends=('mythtv' 'perl-cgi')
optdepends=('lighttpd'
- 'php-apache')
+ 'php-apache'
+ 'php-fpm'
+ '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-$pkgver"/* "$pkgdir/var/lib/mythtv/mythweb"
+ 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() {
pkgdesc="View CCTV footage from zoneminder in MythTV"
- depends=('mythtv' 'libmariadbclient' 'zoneminder')
+ depends=('mythtv' 'mariadb-libs' 'zoneminder')
- cd "$srcdir/mythtv-$pkgver/$pkgbase/mythzoneminder"
+ cd "$srcdir/mythtv/$pkgbase/mythzoneminder"
make INSTALL_ROOT="$pkgdir" install
}