Update to r62122.ce0bfc65020-2

3 files changed, 7 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 077699da782e..7d27ca756046 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = kodi-nexus-git
 	pkgver = r62122.ce0bfc65020
-	pkgrel = 1
+	pkgrel = 2
 	url = https://kodi.tv
 	arch = x86_64
 	license = GPL2
@@ -80,7 +80,7 @@ pkgbase = kodi-nexus-git
 	source = https://mirrors.kodi.tv/build-deps/sources/flatbuffers-23.3.3.tar.gz
 	source = https://mirrors.kodi.tv/build-deps/sources/libudfread-1.1.2.tar.gz
 	source = cheat-sse-build.patch
-	source = 0001-flatbuffers-use-23.3.3-to-fix-build-with-gcc13.patch
+	source = 23266.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/23266.patch
 	b2sums = SKIP
 	b2sums = 2f503d3ab767094958f7ec10b4ad11ffd02665deee571c8f3c739bef5fc7e2ff84babc5a3fdee638dc095f896b72fe3ce65e6b688674cb5f7b7b77190992688c
 	b2sums = db4d05836d8fbb3637ae50bdbfc0e4b612ee6b3be24addfea94ce772c3bf28d58b63a3f252d6f9f016f72f8cbb841cc1820b091226b136f4c4664385a32da73c
@@ -91,7 +91,7 @@ pkgbase = kodi-nexus-git
 	b2sums = be5e3c8ea81ce4b6f2e2c1b2f22e1172434c435f096fa7dade060578c506cff0310e3e2ef0627e26ce2be44f740652eb9a8e1b63578c18f430f7925820f04e66
 	b2sums = 1801d84a0ca38410a78f23e7d44f37e6d53346753c853df2e7380d259ce1ae7f0c712825b95a5753ad0bc6360cfffe1888b9e7bc30da8b84549e0f1198248f61
 	b2sums = 6d647177380c619529fb875374ec46f1fff6273be1550f056c18cb96e0dea8055272b47664bb18cdc964496a3e9007fda435e67c4f1cee6375a80c048ae83dd0
-	b2sums = d24ddcde4e78fea147e326e1b0257d5a7bcda45cd918f1c4d30d150cf83208662b2f9bded61a482ce1afca479d995ac029556b5b88330e53faa30878f8752331
+	b2sums = d0d1e805243a3371b0777fd062d171a142c89845713c8b0c3882ef819db7635e242ff501efc65a0205fa54888615dbee951a235bec9207d8bf960a3541dd1aff
 
 pkgname = kodi-nexus-git
 	pkgdesc = A software media player and entertainment hub for digital media (Nexus branch)
diff --git a/0001-flatbuffers-use-23.3.3-to-fix-build-with-gcc13.patch b/0001-flatbuffers-use-23.3.3-to-fix-build-with-gcc13.patch
deleted file mode 100644
index 416bc1bd8d1c..000000000000
--- a/0001-flatbuffers-use-23.3.3-to-fix-build-with-gcc13.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Subject: [PATCH] flatbuffers: use 23.3.3 to fix build with gcc13
-
----
- tools/depends/native/flatbuffers/Makefile            | 4 ++--
- tools/depends/target/flatbuffers/FLATBUFFERS-VERSION | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/tools/depends/native/flatbuffers/Makefile b/tools/depends/native/flatbuffers/Makefile
-index 6911d4c..2d55d7e 100644
---- a/tools/depends/native/flatbuffers/Makefile
-+++ b/tools/depends/native/flatbuffers/Makefile
-@@ -5,10 +5,10 @@ DEPS =../../Makefile.include Makefile ../../download-files.include
- 
- # lib name, version
- LIBNAME=flatbuffers
--VERSION=2.0.0
-+VERSION=23.3.3
- SOURCE=$(LIBNAME)-$(VERSION)
- ARCHIVE=$(SOURCE).tar.gz
--SHA512=26a06b572c0e4c9685743bd2d2162ac7dcd74b9324624cc3f3ef5b154c0cee7c52a04b77cdc184245d2d6ae38dfdcc4fd66001c318aa8ca001d2bf1d85d66a89
-+SHA512=4066c94f2473c7ea16917d29a613e16f840a329089c88e0bdbdb999aef3442ba00abfd2aa92266fa9c067e399dc88e6f0ccac40dc151378857e665638e78bbf0
- include ../../download-files.include
- 
- APP=$(PLATFORM)/build-cmake/flatc
-diff --git a/tools/depends/target/flatbuffers/FLATBUFFERS-VERSION b/tools/depends/target/flatbuffers/FLATBUFFERS-VERSION
-index 4d05761..5ccaa80 100644
---- a/tools/depends/target/flatbuffers/FLATBUFFERS-VERSION
-+++ b/tools/depends/target/flatbuffers/FLATBUFFERS-VERSION
-@@ -1,4 +1,4 @@
- LIBNAME=flatbuffers
--VERSION=2.0.0
-+VERSION=23.3.3
- ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz
--SHA512=26a06b572c0e4c9685743bd2d2162ac7dcd74b9324624cc3f3ef5b154c0cee7c52a04b77cdc184245d2d6ae38dfdcc4fd66001c318aa8ca001d2bf1d85d66a89
-+SHA512=4066c94f2473c7ea16917d29a613e16f840a329089c88e0bdbdb999aef3442ba00abfd2aa92266fa9c067e399dc88e6f0ccac40dc151378857e665638e78bbf0
--- 
-2.41.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 77c0a1d26d7c..821632b27c1a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -23,7 +23,7 @@ _clangbuild=
 pkgbase=kodi-nexus-git
 pkgname=("$pkgbase" "$pkgbase-eventclients" "$pkgbase-tools-texturepacker" "$pkgbase-dev")
 pkgver=r62122.ce0bfc65020
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url="https://kodi.tv"
 license=('GPL2')
@@ -68,7 +68,6 @@ _crossguid_version="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
 _fstrcmp_version="0.7.D001"
 _flatbuffers_version="23.3.3"
 _libudfread_version="1.1.2"
-
 source=(
   "git+https://github.com/xbmc/xbmc.git#branch=$_codename"
   "libdvdcss-$_libdvdcss_version.tar.gz::https://github.com/xbmc/libdvdcss/archive/$_libdvdcss_version.tar.gz"
@@ -80,7 +79,7 @@ source=(
   "https://mirrors.kodi.tv/build-deps/sources/flatbuffers-$_flatbuffers_version.tar.gz"
   "https://mirrors.kodi.tv/build-deps/sources/libudfread-$_libudfread_version.tar.gz"
   cheat-sse-build.patch
-  0001-flatbuffers-use-23.3.3-to-fix-build-with-gcc13.patch
+  23266.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/23266.patch
 )
 noextract=(
   "libdvdcss-$_libdvdcss_version.tar.gz"
@@ -102,7 +101,7 @@ b2sums=('SKIP'
         'be5e3c8ea81ce4b6f2e2c1b2f22e1172434c435f096fa7dade060578c506cff0310e3e2ef0627e26ce2be44f740652eb9a8e1b63578c18f430f7925820f04e66'
         '1801d84a0ca38410a78f23e7d44f37e6d53346753c853df2e7380d259ce1ae7f0c712825b95a5753ad0bc6360cfffe1888b9e7bc30da8b84549e0f1198248f61'
         '6d647177380c619529fb875374ec46f1fff6273be1550f056c18cb96e0dea8055272b47664bb18cdc964496a3e9007fda435e67c4f1cee6375a80c048ae83dd0'
-        'd24ddcde4e78fea147e326e1b0257d5a7bcda45cd918f1c4d30d150cf83208662b2f9bded61a482ce1afca479d995ac029556b5b88330e53faa30878f8752331')
+        'd0d1e805243a3371b0777fd062d171a142c89845713c8b0c3882ef819db7635e242ff501efc65a0205fa54888615dbee951a235bec9207d8bf960a3541dd1aff')
 
 pkgver() {
   cd "$_gitname"
@@ -118,7 +117,7 @@ prepare() {
   rm -rf system/certs # remove not needed cacert
 
   [[ "$_sse_workaround" -eq 1 ]] && patch -p1 -i "$srcdir/cheat-sse-build.patch"
-  patch -p1 -i ../0001-flatbuffers-use-23.3.3-to-fix-build-with-gcc13.patch
+  patch -p1 -i ../23266.patch
 
   if [[ -n "$_clangbuild" ]]; then
     msg "Building with clang"