Update to 18.2rc1.r264.gf5636182c08-1

2 files changed, 25 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 66b8111221fd..7f6d233e93cc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,5 @@
-# Generated by mksrcinfo v8
-# Fri May  3 17:15:22 UTC 2019
 pkgbase = kodi-git
-	pkgver = 18.2rc1.r179.gd57182cafa4
+	pkgver = 18.2rc1.r264.gf5636182c08
 	pkgrel = 1
 	url = https://kodi.tv
 	arch = x86_64
@@ -102,7 +100,7 @@ pkgname = kodi-git
 	optdepends = pulseaudio: PulseAudio support
 	optdepends = shairplay: AirPlay support
 	optdepends = upower: Display battery level
-	provides = kodi=18.2rc1.r179.gd57182cafa4
+	provides = kodi=18.2rc1.r264.gf5636182c08
 	conflicts = kodi
 
 pkgname = kodi-git-bin
@@ -153,7 +151,7 @@ pkgname = kodi-git-wayland
 	depends = tinyxml
 	depends = waylandpp
 	depends = kodi-git
-	provides = kodi-git-bin=18.2rc1.r179.gd57182cafa4
+	provides = kodi-git-bin=18.2rc1.r264.gf5636182c08
 	conflicts = kodi-wayland
 
 pkgname = kodi-git-gbm
@@ -179,14 +177,14 @@ pkgname = kodi-git-gbm
 	depends = taglib
 	depends = tinyxml
 	depends = kodi-git
-	provides = kodi-git-bin=18.2rc1.r179.gd57182cafa4
+	provides = kodi-git-bin=18.2rc1.r264.gf5636182c08
 	provides = kodi-gbm
 	conflicts = kodi-gbm
 
 pkgname = kodi-git-eventclients
 	pkgdesc = Kodi Event Clients (master branch)
 	optdepends = python2: most eventclients are implemented in python2
-	provides = kodi-eventclients=18.2rc1.r179.gd57182cafa4
+	provides = kodi-eventclients=18.2rc1.r264.gf5636182c08
 	conflicts = kodi-eventclients
 
 pkgname = kodi-git-tools-texturepacker
@@ -195,12 +193,12 @@ pkgname = kodi-git-tools-texturepacker
 	depends = giflib
 	depends = libjpeg-turbo
 	depends = lzo
-	provides = kodi-tools-texturepacker=18.2rc1.r179.gd57182cafa4
+	provides = kodi-tools-texturepacker=18.2rc1.r264.gf5636182c08
 	conflicts = kodi-tools-texturepacker
 
 pkgname = kodi-git-dev
 	pkgdesc = Kodi dev files (master branch)
 	depends = kodi-git
-	provides = kodi-dev=18.2rc1.r179.gd57182cafa4
+	provides = kodi-dev=18.2rc1.r264.gf5636182c08
 	conflicts = kodi-dev
 
diff --git a/PKGBUILD b/PKGBUILD
index 1a51b2aa7145..5072a2ef9fe5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -21,7 +21,7 @@ pkgname=(
   "$pkgbase-eventclients" "$pkgbase-tools-texturepacker" "$pkgbase-dev"
 )
 _gitname='xbmc'
-pkgver=18.2rc1.r179.gd57182cafa4
+pkgver=18.2rc1.r264.gf5636182c08
 pkgrel=1
 arch=('x86_64')
 url="https://kodi.tv"
@@ -72,7 +72,7 @@ source=(
   "http://mirrors.kodi.tv/build-deps/sources/crossguid-$_crossguid_version.tar.gz"
   "http://mirrors.kodi.tv/build-deps/sources/fstrcmp-$_fstrcmp_version.tar.gz"
   "http://mirrors.kodi.tv/build-deps/sources/flatbuffers-$_flatbuffers_version.tar.gz"
-  'cpuinfo'
+  cpuinfo
   '00-fix.building.with.mariadb.patch::https://github.com/wsnipex/xbmc/commit/cd20c8eb8a0394db1f028b118c4ca9b91b7e746a.patch'
 )
 noextract=(
@@ -103,6 +103,11 @@ pkgver() {
 }
 
 prepare() {
+  # force python 'binary' as python2
+  [[ -d "$srcdir/path" ]] && rm -rf "$srcdir/path"
+  mkdir "$srcdir/path"
+  ln -s /usr/bin/python2 "$srcdir/path/python"
+
   [[ -d kodi-build-x11 ]] && rm -rf kodi-build-x11
   mkdir kodi-build-x11
   [[ -d kodi-build-wayland ]] && rm -rf kodi-build-wayland
@@ -123,6 +128,8 @@ prepare() {
 }
 
 build() {
+  export PATH="$srcdir/path:$PATH"
+
   ### Optionally uncomment and setup to your liking
   # export CFLAGS+=" -march=native"
   # export CXXFLAGS="${CFLAGS}"
@@ -175,7 +182,6 @@ build() {
   make
   make preinstall
 
-
   msg2 "building kodi-gbm"
   cd "$srcdir/kodi-build-gbm"
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
@@ -202,7 +208,7 @@ build() {
 }
 
 # kodi
-# components: kodi, kodi-bin
+# components: kodi
 
 package_kodi-git() {
   pkgdesc="A software media player and entertainment hub for digital media (master branch)"
@@ -228,6 +234,8 @@ package_kodi-git() {
     'kodi-bin'
   )
 
+  export PATH="$srcdir/path:$PATH"
+
   cd kodi-build-x11
   # install eventclients
   for _cmp in ${_components[@]}; do
@@ -314,6 +322,8 @@ package_kodi-git-eventclients() {
     'kodi-eventclients-kodi-send'
   )
 
+  export PATH="$srcdir/path:$PATH"
+
   cd kodi-build-x11
   # install eventclients
   for _cmp in ${_components[@]}; do
@@ -373,6 +383,8 @@ package_kodi-git-dev() {
     'kodi-visualization-dev'
   )
 
+  export PATH="$srcdir/path:$PATH"
+
   cd kodi-build-x11
   # install eventclients
   for _cmp in ${_components[@]}; do
@@ -383,5 +395,6 @@ package_kodi-git-dev() {
 
   # python2 is being used
   cd "$pkgdir"
-  grep -lR '#!.*python' * | while read file; do sed -s 's/\(#!.*python\)/\12/g' -i "$file"; done
+  grep -lR '#!.*python' * | \
+    while read file; do sed -s 's/\(#!.*python\)/\12/g' -i "$file"; done
 }