Default to Kodi 18 version

2 files changed, 25 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e895258eb47d..f6483d18ed7b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,20 @@
 pkgbase = kodi-addon-inputstream-adaptive-git
-	pkgdesc = InputStream client for adaptive streams for Kodi 17+
-	pkgver = r244.c51b9a9
+	pkgdesc = InputStream client for adaptive streams for Kodi 18+
+	pkgver = 2.3.13.r0.g9b944a5
 	pkgrel = 1
 	url = https://github.com/peak3d/inputstream.adaptive
 	arch = x86_64
 	arch = i686
 	arch = armv7h
 	license = GPL2
-	makedepends = kodi-dev
+	makedepends = kodi-dev>=18
 	makedepends = cmake
 	makedepends = git
+	depends = kodi>=18
+	depends = expat
 	provides = kodi-addon-inputstream-adaptive
 	conflicts = kodi-addon-inputstream-adaptive
-	source = kodi-addon-inputstream-adaptive-git::git+https://github.com/peak3d/inputstream.adaptive.git#branch=Krypton
+	source = kodi-addon-inputstream-adaptive-git::git+https://github.com/peak3d/inputstream.adaptive.git
 	md5sums = SKIP
 
 pkgname = kodi-addon-inputstream-adaptive-git
diff --git a/PKGBUILD b/PKGBUILD
index 35aa14fdc3e6..a2d57f938307 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,38 @@
 # Maintainer: kevku <kevku@gmx.com>
 pkgname=kodi-addon-inputstream-adaptive-git
-pkgver=r244.c51b9a9
+pkgver=2.3.13.r0.g9b944a5
 pkgrel=1
-pkgdesc="InputStream client for adaptive streams for Kodi 17+"
+pkgdesc="InputStream client for adaptive streams for Kodi 18+"
 arch=('x86_64' 'i686' 'armv7h')
 url="https://github.com/peak3d/inputstream.adaptive"
 license=('GPL2')
-makedepends=('kodi-dev' 'cmake' 'git')
+depends=('kodi>=18' 'expat')
+makedepends=('kodi-dev>=18' 'cmake' 'git')
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
-# kodi 17 2.0
-source=('kodi-addon-inputstream-adaptive-git::git+https://github.com/peak3d/inputstream.adaptive.git#branch=Krypton')
+# kodi 17
+# source=('kodi-addon-inputstream-adaptive-git::git+https://github.com/peak3d/inputstream.adaptive.git#branch=Krypton')
 # kodi 18
-# source=('kodi-addon-inputstream-adaptive-git::git+https://github.com/peak3d/inputstream.adaptive.git')
+source=('kodi-addon-inputstream-adaptive-git::git+https://github.com/peak3d/inputstream.adaptive.git')
 md5sums=('SKIP')
 
 pkgver() {
-        cd "$srcdir/$pkgname"
-        printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  cd "$srcdir/$pkgname"
+  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+prepare() {
+  [[ -d "$srcdir/$pkgname/$pkgname-build" ]] && rm -r "$srcdir/$pkgname/$pkgname-build"
+  mkdir -p "$srcdir/$pkgname/$pkgname-build"
 }
 
 build() {
-        cd "$srcdir/$pkgname"
-        cmake \
-            -DCMAKE_INSTALL_PREFIX=/usr
-        make
+  cd "$srcdir/$pkgname/$pkgname-build"
+  cmake .. -DCMAKE_INSTALL_PREFIX="/usr"
+  make
 }
 
 package() {
-        cd "$srcdir/$pkgname"
-        make DESTDIR="$pkgdir/" install
+  cd "$srcdir/$pkgname/$pkgname-build"
+  make DESTDIR="$pkgdir/" install
 }