Sync from VDR4Arch (https://github.com/VDR4Arch/vdr4arch/commit/742236a31f91643f7705727dc15d1422d8944189)

2 files changed, 21 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d85434d9c484..73d1fc913897 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = vdr-epg-daemon
-	pkgver = 0.2.2
-	pkgrel = 1
+	pkgver = 0.5.32
+	pkgrel = 2
 	url = http://projects.vdr-developer.org/projects/vdr-epg-daemon
 	arch = x86_64
 	arch = i686
@@ -15,17 +15,22 @@ pkgbase = vdr-epg-daemon
 	makedepends = libarchive
 	makedepends = libjpeg
 	makedepends = libmariadbclient
+	makedepends = libmicrohttpd
 	makedepends = libxslt
-	source = git://projects.vdr-developer.org/vdr-epg-daemon.git#commit=e2230b6e8d0121233dc8861ceea3e6669fed8f57
-	md5sums = SKIP
+	makedepends = python
+	source = https://projects.vdr-developer.org/git/vdr-epg-daemon.git/snapshot/vdr-epg-daemon-0.5.32.tar.bz2
+	md5sums = c6369c844ec93422a7f0e22be949e527
 
 pkgname = epgd
 	pkgdesc = write epg data to a mysql database
 	depends = curl
+	depends = imlib2
 	depends = jansson
 	depends = libarchive
 	depends = libmariadbclient
+	depends = libmicrohttpd
 	depends = libxslt
+	depends = python
 	backup = 
 
 pkgname = mariadb-epglv
diff --git a/PKGBUILD b/PKGBUILD
index 9a2b6401e7ac..3de003f29625 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,37 +3,30 @@
 # Maintainer: Christopher Reimer <mail+vdr4arch[at]c-reimer[dot]de>
 pkgbase=vdr-epg-daemon
 pkgname=('epgd' 'mariadb-epglv')
-pkgver=0.2.2
-_gitver=e2230b6e8d0121233dc8861ceea3e6669fed8f57
-pkgrel=1
+pkgver=0.5.32
+pkgrel=2
 url='http://projects.vdr-developer.org/projects/vdr-epg-daemon'
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h')
 license=('GPL2')
-makedepends=('curl' 'git' 'imlib2' 'jansson' 'libarchive' 'libjpeg' 'libmariadbclient' 'libxslt')
-source=("git://projects.vdr-developer.org/$pkgbase.git#commit=$_gitver")
-md5sums=('SKIP')
-
-pkgver() {
-  cd "$srcdir/$pkgbase"
-  git tag -a v0.2.2 -m 'Added Tag' e2230b6e8d0121233dc8861ceea3e6669fed8f57 2> /dev/null
-  git describe --tags | sed 's/-/_/g;s/v//'
-}
+makedepends=('curl' 'git' 'imlib2' 'jansson' 'libarchive' 'libjpeg' 'libmariadbclient' 'libmicrohttpd' 'libxslt' 'python')
+source=("https://projects.vdr-developer.org/git/vdr-epg-daemon.git/snapshot/$pkgbase-$pkgver.tar.bz2")
+md5sums=('c6369c844ec93422a7f0e22be949e527')
 
 prepare() {
-  cd "$srcdir/$pkgbase"/epglv
+  cd "$srcdir/$pkgbase-$pkgver"/epglv
   sed -i '/CPP_FLAGS_32/d' Makefile
   sed -i '/CPP_FLAGS_64/d' Makefile
 }
 
 build() {
-  cd "$srcdir/$pkgbase"
-  make PREFIX=/usr
+  cd "$srcdir/$pkgbase-$pkgver"
+  make -j1 PREFIX=/usr
 }
 
 package_epgd() {
   pkgdesc='write epg data to a mysql database'
-  depends=('curl' 'jansson' 'libarchive' 'libmariadbclient' 'libxslt')
-  cd "$srcdir/$pkgbase"
+  depends=('curl' 'imlib2' 'jansson' 'libarchive' 'libmariadbclient' 'libmicrohttpd' 'libxslt' 'python')
+  cd "$srcdir/$pkgbase-$pkgver"
   make PREFIX=/usr DESTDIR="$pkgdir" install
   install -Dm644 contrib/epgd.service "$pkgdir/usr/lib/systemd/system/epgd.service"
   rm "$pkgdir/mysqlepglv.so"
@@ -44,8 +37,8 @@ package_epgd() {
 package_mariadb-epglv() {
   pkgdesc='epglv plugin for mysql/mariadb'
   depends=('libmariadbclient')
-  backup=("$(mysql_config --plugindir | cut -d/ -f2-)/mysqlepglv.so")
+  backup=("usr/lib/mysql/plugin/mysqlepglv.so")
   install='mariadb-epglv.install'
-  cd "$srcdir/$pkgbase"
+  cd "$srcdir/$pkgbase-$pkgver"
   install -Dm755 epglv/mysqlepglv.so "$pkgdir/$(mysql_config --plugindir)/mysqlepglv.so"
 }