Sync from VDR4Arch (https://github.com/VDR4Arch/vdr4arch/commit/570f9f8122dd444fbb6198b66f7efbe48f6a6e90)

3 files changed, 6 insertions, 94 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2510bc559f72..ed3c2cde027b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
-# Generated by makepkg 5.0.1
-# Thu Feb  9 10:09:35 UTC 2017
+# Generated by makepkg 5.0.2
+# Thu Sep  7 22:03:31 UTC 2017
 pkgbase = kodi-addon-pvr-vdr-vnsi
 	pkgdesc = PVR add-on for XBMC to add VDR as a TV/PVR Backend
-	pkgver = 2.6.17
+	pkgver = 2.6.21
 	pkgrel = 1
 	url = https://github.com/kodi-pvr/pvr.vdr.vnsi
 	arch = x86_64
@@ -15,7 +15,7 @@ pkgbase = kodi-addon-pvr-vdr-vnsi
 	makedepends = kodi-dev
 	makedepends = kodi-platform
 	depends = kodi
-	source = git+https://github.com/kodi-pvr/pvr.vdr.vnsi.git#commit=2a90c2f9a1f3e5889336a8df5426ff99b0318b0f
+	source = git+https://github.com/kodi-pvr/pvr.vdr.vnsi.git#commit=4ed7d602924dbfcdd2770c0e13423092e829460d
 	md5sums = SKIP
 
 pkgname = kodi-addon-pvr-vdr-vnsi
diff --git a/PKGBUILD b/PKGBUILD
index 91b522c0e41a..91f4a2e8c726 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,9 +2,9 @@
 
 # Maintainer: Christopher Reimer <mail+vdr4arch[at]c-reimer[dot]de>
 pkgname=kodi-addon-pvr-vdr-vnsi
-pkgver=2.6.17
+pkgver=2.6.21
 # Note: Use commits from "Krypton" branch for Kodi 17
-_gitver=2a90c2f9a1f3e5889336a8df5426ff99b0318b0f
+_gitver=4ed7d602924dbfcdd2770c0e13423092e829460d
 pkgrel=1
 url="https://github.com/kodi-pvr/pvr.vdr.vnsi"
 arch=('x86_64' 'i686' 'armv6h' 'armv7h')
diff --git a/PKGBUILD.orig b/PKGBUILD.orig
deleted file mode 100644
index f7af9827f079..000000000000
--- a/PKGBUILD.orig
+++ /dev/null
@@ -1,88 +0,0 @@
-# This PKGBUILD is part of the VDR4Arch project [https://github.com/vdr4arch]
-
-# Maintainer: Christopher Reimer <mail+vdr4arch[at]c-reimer[dot]de>
-pkgname=kodi-addon-pvr-vdr-vnsi
-<<<<<<< af4d4fc06aac0e2726bd687fc0ea2829a4053cf2
-pkgver=1.11.15
-_gitver=7e11b853637ec436e30e4ac826de6ee87c303482
-=======
-pkgver=1.11.19
-# Note: Use commits from "Jarvis" branch for Kodi 16
-_gitver=5d54ac0c420e97d48fe9d77f07ccb42d347be980
->>>>>>> Sync from VDR4Arch (https://github.com/VDR4Arch/vdr4arch/commit/6f5a8b55e0eecbb9850175cc9827cfb86d615bc7)
-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')
-<<<<<<< af4d4fc06aac0e2726bd687fc0ea2829a4053cf2
-makedepends=('cmake' 'git' 'kodi-platform' 'libplatform')
-=======
-makedepends=('cmake' 'git' 'kodi-platform')
->>>>>>> Sync from VDR4Arch (https://github.com/VDR4Arch/vdr4arch/commit/6f5a8b55e0eecbb9850175cc9827cfb86d615bc7)
-source=("git+https://github.com/kodi-pvr/pvr.vdr.vnsi.git#commit=$_gitver")
-md5sums=('SKIP')
-
-pkgver() {
-  cd "${srcdir}/pvr.vdr.vnsi/pvr.vdr.vnsi"
-<<<<<<< af4d4fc06aac0e2726bd687fc0ea2829a4053cf2
-  grep '  version' addon.xml | cut -d'"' -f2
-}
-
-prepare() {
-  mkdir -p build
-  cd "${srcdir}/pvr.vdr.vnsi"
-  
-=======
-  grep '  version' addon.xml.in | cut -d'"' -f2
-}
-
-prepare() {
-  cd "${srcdir}/pvr.vdr.vnsi"
-
-  # "libplatform" got renamed to "p8-platform" with version 2.0
->>>>>>> Sync from VDR4Arch (https://github.com/VDR4Arch/vdr4arch/commit/6f5a8b55e0eecbb9850175cc9827cfb86d615bc7)
-  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}
-<<<<<<< af4d4fc06aac0e2726bd687fc0ea2829a4053cf2
-
-  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
-=======
-}
-
-build() {
-  mkdir -p "${srcdir}/pvr.vdr.vnsi/build"
-  cd "${srcdir}/pvr.vdr.vnsi/build"
->>>>>>> Sync from VDR4Arch (https://github.com/VDR4Arch/vdr4arch/commit/6f5a8b55e0eecbb9850175cc9827cfb86d615bc7)
-
-  cmake -DCMAKE_INSTALL_PREFIX="/usr" \
-        -DCMAKE_INSTALL_LIBDIR=/usr/lib/kodi \
-        -DCMAKE_BUILD_TYPE=Release \
-<<<<<<< af4d4fc06aac0e2726bd687fc0ea2829a4053cf2
-        ../pvr.vdr.vnsi
-=======
-        ..
->>>>>>> Sync from VDR4Arch (https://github.com/VDR4Arch/vdr4arch/commit/6f5a8b55e0eecbb9850175cc9827cfb86d615bc7)
-
-  make
-}
-
-package() {
-<<<<<<< af4d4fc06aac0e2726bd687fc0ea2829a4053cf2
-  cd build
-=======
-  cd "${srcdir}/pvr.vdr.vnsi/build"
->>>>>>> Sync from VDR4Arch (https://github.com/VDR4Arch/vdr4arch/commit/6f5a8b55e0eecbb9850175cc9827cfb86d615bc7)
-  make DESTDIR="${pkgdir}" install
-
-  cp -r "$srcdir"/pvr.vdr.vnsi/pvr.vdr.vnsi/* "$pkgdir/usr/lib/kodi/addons/pvr.vdr.vnsi"
-}