alarm/kodi-rbp4 to 18.6-1

alarm/kodi-rbp4/PKGBUILD

@@ -25,10 +25,9 @@ _prefix=/usr
 
 pkgbase=kodi-rbp4
 pkgname=('kodi-rbp4' 'kodi-rbp4-eventclients' 'kodi-rbp4-tools-texturepacker' 'kodi-rbp4-dev')
-pkgver=18.5
-pkgrel=3
+pkgver=18.6
+pkgrel=1
 _codename=Leia
-_tag="$_pkgver-$_codename"
 _ffmpeg_version="4.0.4-$_codename-18.4"
 _libdvdcss_version="1.4.2-$_codename-Beta-5"
 _libdvdnav_version="6.0.0-$_codename-Alpha-3"
@@ -61,7 +60,6 @@ source=(
   'kodi.service'
   '99-kodi.rules'
   'polkit.rules'
-  '00-fix.building.with.mariadb.patch::https://github.com/wsnipex/xbmc/commit/cd20c8eb8a0394db1f028b118c4ca9b91b7e746a.patch'
   "ffmpeg-$_ffmpeg_version.tar.gz::https://github.com/xbmc/FFmpeg/archive/$_ffmpeg_version.tar.gz"
   "libdvdcss-$_libdvdcss_version.tar.gz::https://github.com/xbmc/libdvdcss/archive/$_libdvdcss_version.tar.gz"
   "libdvdnav-$_libdvdnav_version.tar.gz::https://github.com/xbmc/libdvdnav/archive/$_libdvdnav_version.tar.gz"
@@ -84,11 +82,10 @@ noextract=(
   "fstrcmp-$_fstrcmp_version.tar.gz"
   "flatbuffers-$_flatbuffers_version.tar.gz"
 )
-sha256sums=('f5d48be9882af93ec3bfe94dbbddfd0224076077aff31dddb5e00245f4353b42'
+sha256sums=('afdadb63ba72010001361c622403dcb5fe6f3323849223669cb0eb9f5f59db40'
             '585796d8a7f1ece32c24ff67b38885f0e3397372a4b9879eee3160a59391e333'
             '8e14cf455898246d11edd4ff7f4ed11a44c729fb40c34455a5b336a90ccc1f7b'
             '9ea592205023ba861603d74b63cdb73126c56372a366dc4cb7beb379073cbb96'
-            '849daf1d5b081ef6d0e428bbc7d448799fc43a8ac9e79cd7513de0eb5a91b0bb'
             'e11e7594af35f36ab2711252c3d6bb106908f26605498aef4a9be2d7bc001db2'
             '38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d'
             '071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a'
@@ -128,8 +125,6 @@ prepare() {
   [[ -d kodi-build ]] && rm -rf kodi-build
   mkdir "$srcdir/kodi-build"
 
-  patch -Np1 -i ../00-fix.building.with.mariadb.patch
-
   # Big thanks to asavah for helpful advice here and in the cmake step
   patch -Np1 -i ../01-fix.in-tree.ffmpeg.paths.for.makechrootpkg.hack.patch
 }
@@ -177,8 +172,7 @@ build() {
     -DENABLE_VAAPI=OFF \
     -DENABLE_VDPAU=OFF \
     -DENABLE_OPENGL=OFF \
-    -DENABLE_MARIADBCLIENT=ON \
-    -DENABLE_MYSQLCLIENT=OFF \
+    -DENABLE_MYSQLCLIENT=ON \
     -Dlibdvdcss_URL="$srcdir/libdvdcss-$_libdvdcss_version.tar.gz" \
     -Dlibdvdnav_URL="$srcdir/libdvdnav-$_libdvdnav_version.tar.gz" \
     -Dlibdvdread_URL="$srcdir/libdvdread-$_libdvdread_version.tar.gz" \
@@ -280,6 +274,8 @@ package_kodi-rbp4-tools-texturepacker() {
   depends=('libpng' 'giflib' 'libjpeg-turbo' 'lzo')
   _components=('kodi-tools-texturepacker')
 
+  export PATH="$srcdir/path:$PATH"
+
   cd kodi-build
   for _cmp in ${_components[@]}; do
     DESTDIR="$pkgdir" /usr/bin/cmake \