Update to 18.4rc1pre24-1

2 files changed, 19 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 50af90596cce..1fea5abc34d0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = kodi-devel
-	pkgver = 18.4rc1pre23
+	pkgver = 18.4rc1pre24
 	pkgrel = 1
 	url = https://kodi.tv
 	arch = x86_64
@@ -93,6 +93,7 @@ pkgbase = kodi-devel
 	source = 021-PR16496.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/16496.patch
 	source = 022-PR16500.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/16500.patch
 	source = 023-PR16398.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/16398.patch
+	source = 024-PR16505.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/16505.patch
 	sha256sums = 4f265901c00f582beb8d6ad96c9c303e5ab82611e828c7121ae822b07c0915cc
 	sha256sums = 38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d
 	sha256sums = 071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a
@@ -126,6 +127,7 @@ pkgbase = kodi-devel
 	sha256sums = 6ddf1001c6facb4b32d4f0dbc012832df24a2c4b502a433f529c31fe581f9826
 	sha256sums = 5907ac068c171c9e7bc27900fa82c207175f87482bad060a96dfb9077450b3f9
 	sha256sums = 5ee750c89bee592246a1076f07882a69ea20c2e54e80691fe3b7bcb1e4e2bd75
+	sha256sums = f0396813eb5c0b290a584312a1dabb05d6cdf1bf6d72347019a9afdaa41a1978
 
 pkgname = kodi-devel
 	pkgdesc = Alpha, Beta, or RC versions of the software media player and entertainment hub for digital media
@@ -136,7 +138,7 @@ pkgname = kodi-devel
 	depends = python2-pillow
 	depends = python2-simplejson
 	depends = xorg-xdpyinfo
-	depends = kodi-bin-devel
+	depends = kodi-bin
 	optdepends = afpfs-ng: Apple shares support
 	optdepends = bluez: Blutooth support
 	optdepends = python2-pybluez: Bluetooth support
@@ -144,7 +146,7 @@ pkgname = kodi-devel
 	optdepends = pulseaudio: PulseAudio support
 	optdepends = shairplay: AirPlay support
 	optdepends = upower: Display battery level
-	provides = kodi=18.4rc1pre23
+	provides = kodi=18.4rc1pre24
 	conflicts = kodi
 
 pkgname = kodi-bin-devel
@@ -170,6 +172,7 @@ pkgname = kodi-bin-devel
 	depends = taglib
 	depends = tinyxml
 	depends = kodi-devel
+	provides = kodi-bin=18.4rc1pre24
 	conflicts = kodi-bin
 
 pkgname = kodi-wayland-devel
@@ -195,7 +198,8 @@ pkgname = kodi-wayland-devel
 	depends = tinyxml
 	depends = waylandpp
 	depends = kodi-devel
-	provides = kodi-bin=18.4rc1pre23
+	provides = kodi-bin=18.4rc1pre24
+	provides = kodi-wayland
 	conflicts = kodi-wayland
 
 pkgname = kodi-gbm-devel
@@ -221,14 +225,14 @@ pkgname = kodi-gbm-devel
 	depends = taglib
 	depends = tinyxml
 	depends = kodi-devel
-	provides = kodi-bin=18.4rc1pre23
+	provides = kodi-bin=18.4rc1pre24
 	provides = kodi-gbm
 	conflicts = kodi-gbm
 
 pkgname = kodi-eventclients-devel
 	pkgdesc = Kodi Event Clients
 	optdepends = python2: most eventclients are implemented in python2
-	provides = kodi-eventclients=18.4rc1pre23
+	provides = kodi-eventclients=18.4rc1pre24
 	conflicts = kodi-eventclients
 
 pkgname = kodi-tools-texturepacker-devel
@@ -237,12 +241,12 @@ pkgname = kodi-tools-texturepacker-devel
 	depends = giflib
 	depends = libjpeg-turbo
 	depends = lzo
-	provides = kodi-tools-texturepacker=18.4rc1pre23
+	provides = kodi-tools-texturepacker=18.4rc1pre24
 	conflicts = kodi-tools-texturepacker
 
 pkgname = kodi-dev-devel
 	pkgdesc = Kodi dev files
 	depends = kodi-devel
-	provides = kodi-dev=18.4rc1pre23
+	provides = kodi-dev=18.4rc1pre24
 	conflicts = kodi-dev
 
diff --git a/PKGBUILD b/PKGBUILD
index da21044a2e0a..87d0bb79b111 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,7 +22,7 @@ pkgname=(
   "$pkgbase" kodi-bin-devel kodi-wayland-devel kodi-gbm-devel
   kodi-eventclients-devel kodi-tools-texturepacker-devel kodi-dev-devel
 )
-pkgver=18.4rc1pre23
+pkgver=18.4rc1pre24
 _major=18.3
 pkgrel=1
 arch=('x86_64')
@@ -101,6 +101,7 @@ source=(
   021-PR16496.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/16496.patch
   022-PR16500.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/16500.patch
   023-PR16398.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/16398.patch
+  024-PR16505.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/16505.patch
 )
 noextract=(
   "libdvdcss-$_libdvdcss_version.tar.gz"
@@ -144,7 +145,8 @@ sha256sums=('4f265901c00f582beb8d6ad96c9c303e5ab82611e828c7121ae822b07c0915cc'
             '761d0bedc5ee7cb9bcdab426cbb32da072f39c3f620fafeb62a46fadbf10b878'
             '6ddf1001c6facb4b32d4f0dbc012832df24a2c4b502a433f529c31fe581f9826'
             '5907ac068c171c9e7bc27900fa82c207175f87482bad060a96dfb9077450b3f9'
-            '5ee750c89bee592246a1076f07882a69ea20c2e54e80691fe3b7bcb1e4e2bd75')
+            '5ee750c89bee592246a1076f07882a69ea20c2e54e80691fe3b7bcb1e4e2bd75'
+            'f0396813eb5c0b290a584312a1dabb05d6cdf1bf6d72347019a9afdaa41a1978')
 
 prepare() {
   # force python 'binary' as python2
@@ -276,7 +278,7 @@ package_kodi-devel() {
   depends=(
     'desktop-file-utils' 'hicolor-icon-theme' 'mesa' 'python2-pycryptodome'
     'python2-pillow' 'python2-simplejson' 'xorg-xdpyinfo'
-    'kodi-bin-devel'
+    'kodi-bin'
   )
   optdepends=(
     'afpfs-ng: Apple shares support'
@@ -326,6 +328,7 @@ package_kodi-bin-devel() {
     'libxslt' 'lirc' 'mariadb-libs' 'python2' 'smbclient' 'taglib'
     'tinyxml' "$pkgbase"
   )
+  provides=("kodi-bin=${pkgver}")
 
   cd kodi-build-x11
   install -Dm755 kodi-x11 "$pkgdir/usr/lib/kodi/kodi-x11"
@@ -337,7 +340,7 @@ package_kodi-bin-devel() {
 
 package_kodi-wayland-devel() {
   pkgdesc="wayland kodi binary"
-  provides=("kodi-bin=${pkgver}")
+  provides=("kodi-bin=${pkgver}" "kodi-wayland")
   conflicts=('kodi-wayland')
   depends=(
     'bluez-libs' 'curl' 'lcms2' 'libass' 'libbluray' 'libcdio' 'libcec'