Sync from VDR4Arch (https://github.com/VDR4Arch/vdr4arch/commit/6f5a8b55e0eecbb9850175cc9827cfb86d615bc7)

2 files changed, 15 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 82acecaa1c97..6d1da6a050c0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by makepkg 5.0.1
+# Wed Aug 17 16:28:38 UTC 2016
 pkgbase = kodi-addon-pvr-vdr-vnsi
 	pkgdesc = PVR add-on for XBMC to add VDR as a TV/PVR Backend
-	pkgver = 1.11.15
+	pkgver = 1.11.19
 	pkgrel = 1
 	url = https://github.com/kodi-pvr/pvr.vdr.vnsi
 	arch = x86_64
@@ -11,9 +13,8 @@ pkgbase = kodi-addon-pvr-vdr-vnsi
 	makedepends = cmake
 	makedepends = git
 	makedepends = kodi-platform
-	makedepends = libplatform
 	depends = kodi
-	source = git+https://github.com/kodi-pvr/pvr.vdr.vnsi.git#commit=7e11b853637ec436e30e4ac826de6ee87c303482
+	source = git+https://github.com/kodi-pvr/pvr.vdr.vnsi.git#commit=5d54ac0c420e97d48fe9d77f07ccb42d347be980
 	md5sums = SKIP
 
 pkgname = kodi-addon-pvr-vdr-vnsi
diff --git a/PKGBUILD b/PKGBUILD
index 73cf87626723..2d414f2cd5e2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,50 +2,48 @@
 
 # Maintainer: Christopher Reimer <mail+vdr4arch[at]c-reimer[dot]de>
 pkgname=kodi-addon-pvr-vdr-vnsi
-pkgver=1.11.15
-_gitver=7e11b853637ec436e30e4ac826de6ee87c303482
+pkgver=1.11.19
+# Note: Use commits from "Jarvis" branch for Kodi 16
+_gitver=5d54ac0c420e97d48fe9d77f07ccb42d347be980
 pkgrel=1
 url="https://github.com/kodi-pvr/pvr.vdr.vnsi"
 arch=('x86_64' 'i686' 'armv6h' 'armv7h')
 license=('GPL2')
 pkgdesc="PVR add-on for XBMC to add VDR as a TV/PVR Backend"
 depends=('kodi')
-makedepends=('cmake' 'git' 'kodi-platform' 'libplatform')
+makedepends=('cmake' 'git' 'kodi-platform')
 source=("git+https://github.com/kodi-pvr/pvr.vdr.vnsi.git#commit=$_gitver")
 md5sums=('SKIP')
 
 pkgver() {
   cd "${srcdir}/pvr.vdr.vnsi/pvr.vdr.vnsi"
-  grep '  version' addon.xml | cut -d'"' -f2
+  grep '  version' addon.xml.in | cut -d'"' -f2
 }
 
 prepare() {
-  mkdir -p build
   cd "${srcdir}/pvr.vdr.vnsi"
-  
+
+  # "libplatform" got renamed to "p8-platform" with version 2.0
   sed -i 's/{platform/{p8-platform/g' CMakeLists.txt
   sed -i 's/(platform/(p8-platform/g' CMakeLists.txt
   sed -i 's/"platform/"p8-platform/g' src/{*.cpp,*.h}
   sed -i 's/PLATFORM/P8PLATFORM/g' src/{*.cpp,*.h}
-
-  mv pvr.vdr.vnsi/addon.xml.in pvr.vdr.vnsi/addon.xml
-  sed -i 's/@PLATFORM@/linux/g' pvr.vdr.vnsi/addon.xml
-  sed -i 's/@LIBRARY_FILENAME@/pvr.vdr.vnsi.so/g' pvr.vdr.vnsi/addon.xml
 }
 
 build() {
-  cd build
+  mkdir -p "${srcdir}/pvr.vdr.vnsi/build"
+  cd "${srcdir}/pvr.vdr.vnsi/build"
 
   cmake -DCMAKE_INSTALL_PREFIX="/usr" \
         -DCMAKE_INSTALL_LIBDIR=/usr/lib/kodi \
         -DCMAKE_BUILD_TYPE=Release \
-        ../pvr.vdr.vnsi
+        ..
 
   make
 }
 
 package() {
-  cd build
+  cd "${srcdir}/pvr.vdr.vnsi/build"
   make DESTDIR="${pkgdir}" install
 
   cp -r "$srcdir"/pvr.vdr.vnsi/pvr.vdr.vnsi/* "$pkgdir/usr/lib/kodi/addons/pvr.vdr.vnsi"