Update to r56710.cb9d28f8471-1

2 files changed, 26 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 12a64f06cfde..7414e8122414 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = kodi-git
-	pkgver = r56650.bc46b78216c
+	pkgver = r56710.cb9d28f8471
 	pkgrel = 1
 	url = https://kodi.tv
 	arch = x86_64
@@ -97,16 +97,17 @@ pkgname = kodi-git
 	depends = python-simplejson
 	depends = xorg-xdpyinfo
 	depends = shairplay
-	depends = KODI-BIN
+	depends = KODI-GIT-BIN
+	depends = libplist
 	optdepends = afpfs-ng: Apple shares support
 	optdepends = bluez: Blutooth support
 	optdepends = python-pybluez: Bluetooth support
-	optdepends = libplist: AirPlay support
 	optdepends = pulseaudio: PulseAudio support
 	optdepends = upower: Display battery level
 	provides = xbmc
-	provides = kodi=r56650.bc46b78216c
+	provides = kodi=r56710.cb9d28f8471
 	conflicts = xbmc
+	conflicts = kodi
 	replaces = xbmc
 
 pkgname = kodi-git-x11
@@ -132,8 +133,9 @@ pkgname = kodi-git-x11
 	depends = taglib
 	depends = tinyxml
 	depends = kodi-git
-	provides = KODI-BIN
-	provides = kodi-x11=r56650.bc46b78216c
+	provides = KODI-GIT-BIN
+	provides = kodi-x11=r56710.cb9d28f8471
+	conflicts = kodi-x11
 	replaces = kodi-bin
 
 pkgname = kodi-git-wayland
@@ -159,8 +161,9 @@ pkgname = kodi-git-wayland
 	depends = tinyxml
 	depends = waylandpp
 	depends = kodi-git
-	provides = KODI-BIN
-	provides = kodi-wayland=r56650.bc46b78216c
+	provides = KODI-GIT-BIN
+	provides = kodi-wayland=r56710.cb9d28f8471
+	conflicts = kodi-wayland
 
 pkgname = kodi-git-gbm
 	pkgdesc = gbm kodi binary
@@ -185,13 +188,14 @@ pkgname = kodi-git-gbm
 	depends = taglib
 	depends = tinyxml
 	depends = kodi-git
-	provides = KODI-BIN
-	provides = kodi-gbm=r56650.bc46b78216c
+	provides = KODI-GIT-BIN
+	provides = kodi-gbm=r56710.cb9d28f8471
+	conflicts = kodi-gbm
 
 pkgname = kodi-git-eventclients
 	pkgdesc = Kodi Event Clients (master branch)
 	optdepends = python: most eventclients are implemented in python
-	provides = kodi-eventclients=r56650.bc46b78216c
+	provides = kodi-eventclients=r56710.cb9d28f8471
 	conflicts = kodi-eventclients
 
 pkgname = kodi-git-tools-texturepacker
@@ -200,12 +204,12 @@ pkgname = kodi-git-tools-texturepacker
 	depends = giflib
 	depends = libjpeg-turbo
 	depends = lzo
-	provides = kodi-tools-texturepacker=r56650.bc46b78216c
+	provides = kodi-tools-texturepacker=r56710.cb9d28f8471
 	conflicts = kodi-tools-texturepacker
 
 pkgname = kodi-git-dev
 	pkgdesc = Kodi dev files (master branch)
 	depends = kodi-git
-	provides = kodi-dev=r56650.bc46b78216c
+	provides = kodi-dev=r56710.cb9d28f8471
 	conflicts = kodi-dev
 
diff --git a/PKGBUILD b/PKGBUILD
index f919e18567a8..23a9892079a3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -21,7 +21,7 @@ pkgname=(
   "$pkgbase" "$pkgbase-x11" "$pkgbase-wayland" "$pkgbase-gbm"
   "$pkgbase-eventclients" "$pkgbase-tools-texturepacker" "$pkgbase-dev"
 )
-pkgver=r56650.bc46b78216c
+pkgver=r56710.cb9d28f8471
 pkgrel=1
 arch=('x86_64')
 url="https://kodi.tv"
@@ -222,18 +222,17 @@ package_kodi-git() {
   depends=(
     'desktop-file-utils' 'hicolor-icon-theme' 'mesa' 'python-pycryptodomex'
     'python-pillow' 'python-simplejson' 'xorg-xdpyinfo' 'shairplay'
-    'KODI-BIN'
+    'KODI-GIT-BIN' 'libplist'
   )
   optdepends=(
     'afpfs-ng: Apple shares support'
     'bluez: Blutooth support'
     'python-pybluez: Bluetooth support'
-    'libplist: AirPlay support'
     'pulseaudio: PulseAudio support'
     'upower: Display battery level'
   )
   provides=('xbmc' "kodi=${pkgver}")
-  conflicts=('xbmc')
+  conflicts=('xbmc' 'kodi')
   replaces=('xbmc')
 
   _components=(
@@ -260,7 +259,8 @@ package_kodi-git() {
 
 package_kodi-git-x11() {
   pkgdesc="x11 kodi binary"
-  provides=('KODI-BIN' "kodi-x11=${pkgver}")
+  provides=('KODI-GIT-BIN' "kodi-x11=${pkgver}")
+  conflicts=('kodi-x11')
   replaces=('kodi-bin')
   depends=(
     'bluez-libs' 'curl' 'lcms2' 'libass' 'libbluray' 'libcdio' 'libcec'
@@ -279,7 +279,8 @@ package_kodi-git-x11() {
 
 package_kodi-git-wayland() {
   pkgdesc="wayland kodi binary"
-  provides=('KODI-BIN' "kodi-wayland=${pkgver}")
+  provides=('KODI-GIT-BIN' "kodi-wayland=${pkgver}")
+  conflicts=('kodi-wayland')
   depends=(
     'bluez-libs' 'curl' 'lcms2' 'libass' 'libbluray' 'libcdio' 'libcec'
     'libmicrohttpd' 'libnfs' 'libpulse' 'libva' 'libxkbcommon' 'libxslt'
@@ -296,7 +297,8 @@ package_kodi-git-wayland() {
 
 package_kodi-git-gbm() {
   pkgdesc="gbm kodi binary"
-  provides=('KODI-BIN' "kodi-gbm=${pkgver}")
+  provides=('KODI-GIT-BIN' "kodi-gbm=${pkgver}")
+  conflicts=('kodi-gbm')
   depends=(
     'bluez-libs' 'curl' 'lcms2' 'libass' 'libbluray' 'libcdio' 'libcec'
     'libinput' 'libmicrohttpd' 'libnfs' 'libpulse' 'libva' 'libxkbcommon'