Update to r59044.2fa799fc5d6-1

2 files changed, 14 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a75d04843a26..c08087e7cfa3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = kodi-git
-	pkgver = r57964.a4067bf75ae
+	pkgver = r59044.2fa799fc5d6
 	pkgrel = 1
 	url = https://kodi.tv
 	arch = x86_64
@@ -78,6 +78,7 @@ pkgbase = kodi-git
 	source = http://mirrors.kodi.tv/build-deps/sources/flatbuffers-1.12.0.tar.gz
 	source = http://mirrors.kodi.tv/build-deps/sources/libudfread-1.1.0.tar.gz
 	source = cheat-sse-build.patch
+	source = cmake-fix-building-internal-spdlog.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/20674.patch
 	b2sums = SKIP
 	b2sums = 283aa2cec0a2200d3569bc280cb9659e9224a6b3a77db8a35b269cd8caf1337ac9d8b92b806df66f63ef7458a46bd6261f0b8b14678b10e26644a79dcbeea5da
 	b2sums = 7573434a0ae8e8ccabf48173f81fcde29074eb138e119a2ae9156cde3c3d8bfd716f5d0e605b97f2dcac21f570781137c8533c5ae306b51e3905822fda318355
@@ -90,6 +91,7 @@ pkgbase = kodi-git
 	b2sums = 441123be124ad851efa30bda0d828a764ebaf79ba6692a6e5904000b33818e9de78c3a964037ac93ef562890980c58169141e55354dce86857c02bcd917150d6
 	b2sums = e7fab72ebecb372c54af77b4907e53f77a5503af66e129bd2083ef7f4209ebfbed163ffd552e32b7181829664fff6ab82a1cdf00c81dc6f3cc6bfc8fa7242f6e
 	b2sums = 6d647177380c619529fb875374ec46f1fff6273be1550f056c18cb96e0dea8055272b47664bb18cdc964496a3e9007fda435e67c4f1cee6375a80c048ae83dd0
+	b2sums = aef16c7f695daf71dfc70ecfdb5b0bb53c62576c5ce83194056b2037bc99d3812405f1ab4545b429d5bf65a1a69b93fe2517cf2477d7f545766bfda44052d9d8
 
 pkgname = kodi-git
 	pkgdesc = A software media player and entertainment hub for digital media (master branch)
@@ -130,7 +132,7 @@ pkgname = kodi-git
 	optdepends = python-pybluez: Bluetooth support
 	optdepends = pulseaudio: PulseAudio support
 	optdepends = upower: Display battery level
-	provides = kodi=r57964.a4067bf75ae
+	provides = kodi=r59044.2fa799fc5d6
 	provides = kodi-x11
 	provides = kodi-wayland
 	provides = kodi-gbm
@@ -147,7 +149,7 @@ pkgname = kodi-git-eventclients
 	pkgdesc = Kodi Event Clients (master branch)
 	optdepends = kodi: local machine eventclient use
 	optdepends = python: most eventclients are implemented in python
-	provides = kodi-eventclients=r57964.a4067bf75ae
+	provides = kodi-eventclients=r59044.2fa799fc5d6
 	conflicts = kodi-eventclients
 
 pkgname = kodi-git-tools-texturepacker
@@ -156,11 +158,11 @@ pkgname = kodi-git-tools-texturepacker
 	depends = giflib
 	depends = libjpeg-turbo
 	depends = lzo
-	provides = kodi-tools-texturepacker=r57964.a4067bf75ae
+	provides = kodi-tools-texturepacker=r59044.2fa799fc5d6
 	conflicts = kodi-tools-texturepacker
 
 pkgname = kodi-git-dev
 	pkgdesc = Kodi dev files (master branch)
 	depends = kodi-git
-	provides = kodi-dev=r57964.a4067bf75ae
+	provides = kodi-dev=r59044.2fa799fc5d6
 	conflicts = kodi-dev
diff --git a/PKGBUILD b/PKGBUILD
index 34e9be909bfa..77d4a4ab0f82 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,7 +22,7 @@ _clangbuild=
 
 pkgbase=kodi-git
 pkgname=("$pkgbase" "$pkgbase-eventclients" "$pkgbase-tools-texturepacker" "$pkgbase-dev")
-pkgver=r57964.a4067bf75ae
+pkgver=r59044.2fa799fc5d6
 pkgrel=1
 arch=('x86_64')
 url="https://kodi.tv"
@@ -82,6 +82,7 @@ source=(
   "http://mirrors.kodi.tv/build-deps/sources/flatbuffers-$_flatbuffers_version.tar.gz"
   "http://mirrors.kodi.tv/build-deps/sources/libudfread-$_libudfread_version.tar.gz"
   'cheat-sse-build.patch'
+  cmake-fix-building-internal-spdlog.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/20674.patch
 )
 noextract=(
   "libdvdcss-$_libdvdcss_version.tar.gz"
@@ -106,7 +107,8 @@ b2sums=('SKIP'
         'a8b68fcb8613f0d30e5ff7b862b37408472162585ca71cdff328e3299ff50476fd265467bbd77b352b22bb88c590969044f74d91c5468475504568fd269fa69e'
         '441123be124ad851efa30bda0d828a764ebaf79ba6692a6e5904000b33818e9de78c3a964037ac93ef562890980c58169141e55354dce86857c02bcd917150d6'
         'e7fab72ebecb372c54af77b4907e53f77a5503af66e129bd2083ef7f4209ebfbed163ffd552e32b7181829664fff6ab82a1cdf00c81dc6f3cc6bfc8fa7242f6e'
-        '6d647177380c619529fb875374ec46f1fff6273be1550f056c18cb96e0dea8055272b47664bb18cdc964496a3e9007fda435e67c4f1cee6375a80c048ae83dd0')
+        '6d647177380c619529fb875374ec46f1fff6273be1550f056c18cb96e0dea8055272b47664bb18cdc964496a3e9007fda435e67c4f1cee6375a80c048ae83dd0'
+        'aef16c7f695daf71dfc70ecfdb5b0bb53c62576c5ce83194056b2037bc99d3812405f1ab4545b429d5bf65a1a69b93fe2517cf2477d7f545766bfda44052d9d8')
 
 pkgver() {
   cd "$_gitname"
@@ -121,6 +123,9 @@ prepare() {
 
   [[ "$_sse_workaround" -eq 1 ]] && patch -p1 -i "$srcdir/cheat-sse-build.patch"
 
+  # fix spdlog error
+  patch -Np1 -i ../cmake-fix-building-internal-spdlog.patch
+
   if [[ -n "$_clangbuild" ]]; then
     msg "Building with clang"
     export CC=clang CXX=clang++