Update to r62188.6054ffa0f4b-1

3 files changed, 135 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7d27ca756046..45df60e27237 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = kodi-nexus-git
-	pkgver = r62122.ce0bfc65020
-	pkgrel = 2
+	pkgver = r62188.6054ffa0f4b
+	pkgrel = 1
 	url = https://kodi.tv
 	arch = x86_64
 	license = GPL2
@@ -80,7 +80,9 @@ 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 = 23266.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/23266.patch
+	source = kodi-fmt-10.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/23453.patch
+	source = flatb23.patch::https://github.com/xbmc/xbmc/commit/35be40daa39965a9ea5b3569eb7d515e6a14da5d.patch
+	source = 0001-ffmpeg-fix-build-with-binutils-update.patch
 	b2sums = SKIP
 	b2sums = 2f503d3ab767094958f7ec10b4ad11ffd02665deee571c8f3c739bef5fc7e2ff84babc5a3fdee638dc095f896b72fe3ce65e6b688674cb5f7b7b77190992688c
 	b2sums = db4d05836d8fbb3637ae50bdbfc0e4b612ee6b3be24addfea94ce772c3bf28d58b63a3f252d6f9f016f72f8cbb841cc1820b091226b136f4c4664385a32da73c
@@ -91,7 +93,9 @@ pkgbase = kodi-nexus-git
 	b2sums = be5e3c8ea81ce4b6f2e2c1b2f22e1172434c435f096fa7dade060578c506cff0310e3e2ef0627e26ce2be44f740652eb9a8e1b63578c18f430f7925820f04e66
 	b2sums = 1801d84a0ca38410a78f23e7d44f37e6d53346753c853df2e7380d259ce1ae7f0c712825b95a5753ad0bc6360cfffe1888b9e7bc30da8b84549e0f1198248f61
 	b2sums = 6d647177380c619529fb875374ec46f1fff6273be1550f056c18cb96e0dea8055272b47664bb18cdc964496a3e9007fda435e67c4f1cee6375a80c048ae83dd0
-	b2sums = d0d1e805243a3371b0777fd062d171a142c89845713c8b0c3882ef819db7635e242ff501efc65a0205fa54888615dbee951a235bec9207d8bf960a3541dd1aff
+	b2sums = 8c46990a06bc43eb5f5a38e559cae2bdca188f2fec2f58141b5cbedef7576ffbdf528234e893efdf957739141c01a10539c57ce102044cb46f83ba6867c95c1c
+	b2sums = bdc249920685a3738f872d9ea19a5c46b244d437d30b7dad958dcf33b5bfb88782c1a73bd15dcb1c26f0b643f1e4711775621a2753a1b5668efacc2144fd06e6
+	b2sums = 7e15afcc0cc7f529e6c491c985968bc53be413424b890e4eab2ce8e3d0f21b08347698e660e0f4f0cc50c5279f052be7a2d84d5351509d34193066d797a44130
 
 pkgname = kodi-nexus-git
 	pkgdesc = A software media player and entertainment hub for digital media (Nexus branch)
@@ -138,7 +142,7 @@ pkgname = kodi-nexus-git
 	optdepends = pulseaudio: PulseAudio support
 	optdepends = pipewire: PipeWire support
 	optdepends = upower: Display battery level
-	provides = kodi=r62122.ce0bfc65020
+	provides = kodi=r62188.6054ffa0f4b
 	provides = kodi-x11
 	provides = kodi-wayland
 	provides = kodi-gbm
@@ -151,7 +155,7 @@ pkgname = kodi-nexus-git-eventclients
 	pkgdesc = Kodi Event Clients (Nexus branch)
 	optdepends = kodi: local machine eventclient use
 	optdepends = python: most eventclients are implemented in python
-	provides = kodi-eventclients=r62122.ce0bfc65020
+	provides = kodi-eventclients=r62188.6054ffa0f4b
 	conflicts = kodi-eventclients
 
 pkgname = kodi-nexus-git-tools-texturepacker
@@ -160,11 +164,11 @@ pkgname = kodi-nexus-git-tools-texturepacker
 	depends = giflib
 	depends = libjpeg-turbo
 	depends = lzo
-	provides = kodi-tools-texturepacker=r62122.ce0bfc65020
+	provides = kodi-tools-texturepacker=r62188.6054ffa0f4b
 	conflicts = kodi-tools-texturepacker
 
 pkgname = kodi-nexus-git-dev
 	pkgdesc = Kodi dev files (Nexus branch)
 	depends = kodi-nexus-git
-	provides = kodi-nexus-dev=r62122.ce0bfc65020
+	provides = kodi-nexus-dev=r62188.6054ffa0f4b
 	conflicts = kodi-nexus-dev
diff --git a/0001-ffmpeg-fix-build-with-binutils-update.patch b/0001-ffmpeg-fix-build-with-binutils-update.patch
new file mode 100644
index 000000000000..3852ac24b62d
--- /dev/null
+++ b/0001-ffmpeg-fix-build-with-binutils-update.patch
@@ -0,0 +1,112 @@
+From 6a83b674531d980a459057a8fd7c8b5050ba2f7c Mon Sep 17 00:00:00 2001
+From: graysky <therealgraysky AT proton DOT me>
+Date: Wed, 2 Aug 2023 14:43:24 -0400
+Subject: [PATCH] ffmpeg: fix build with binutils update
+
+---
+ cmake/modules/FindFFMPEG.cmake                |  5 +-
+ ...1-Fixes-assembling-w-binutil-as-2.41.patch | 76 +++++++++++++++++++
+ 2 files changed, 80 insertions(+), 1 deletion(-)
+ create mode 100644 tools/depends/target/ffmpeg/0001-Fixes-assembling-w-binutil-as-2.41.patch
+
+diff --git a/cmake/modules/FindFFMPEG.cmake b/cmake/modules/FindFFMPEG.cmake
+index e53a121..eca8e27 100644
+--- a/cmake/modules/FindFFMPEG.cmake
++++ b/cmake/modules/FindFFMPEG.cmake
+@@ -85,7 +85,10 @@ macro(buildFFMPEG)
+                  -DPKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig)
+   set(PATCH_COMMAND ${CMAKE_COMMAND} -E copy
+                     ${CMAKE_SOURCE_DIR}/tools/depends/target/ffmpeg/CMakeLists.txt
+-                    <SOURCE_DIR>)
++                    <SOURCE_DIR> &&
++		    patch -p1 < ${CMAKE_SOURCE_DIR}/tools/depends/target/ffmpeg/0001-Fixes-assembling-w-binutil-as-2.41.patch &&
++		    echo "########################################## patched ffmpeg ##############################"
++		    )
+ 
+   if(CMAKE_GENERATOR STREQUAL Xcode)
+     set(FFMPEG_GENERATOR CMAKE_GENERATOR "Unix Makefiles")
+diff --git a/tools/depends/target/ffmpeg/0001-Fixes-assembling-w-binutil-as-2.41.patch b/tools/depends/target/ffmpeg/0001-Fixes-assembling-w-binutil-as-2.41.patch
+new file mode 100644
+index 0000000..33fd3d4
+--- /dev/null
++++ b/tools/depends/target/ffmpeg/0001-Fixes-assembling-w-binutil-as-2.41.patch
+@@ -0,0 +1,76 @@
++From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001
++From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
++Date: Sun, 16 Jul 2023 18:18:02 +0300
++Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift
++ instructions within inline assembly
++
++Fixes assembling with binutil as >= 2.41
++
++Signed-off-by: James Almer <jamrial@gmail.com>
++---
++ libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++---
++ 1 file changed, 23 insertions(+), 3 deletions(-)
++
++diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h
++index 6298f5ed19..ca7e2dffc1 100644
++--- a/libavcodec/x86/mathops.h
+++++ b/libavcodec/x86/mathops.h
++@@ -35,12 +35,20 @@
++ static av_always_inline av_const int MULL(int a, int b, unsigned shift)
++ {
++     int rt, dummy;
+++    if (__builtin_constant_p(shift))
++     __asm__ (
++         "imull %3               \n\t"
++         "shrdl %4, %%edx, %%eax \n\t"
++         :"=a"(rt), "=d"(dummy)
++-        :"a"(a), "rm"(b), "ci"((uint8_t)shift)
+++        :"a"(a), "rm"(b), "i"(shift & 0x1F)
++     );
+++    else
+++        __asm__ (
+++            "imull %3               \n\t"
+++            "shrdl %4, %%edx, %%eax \n\t"
+++            :"=a"(rt), "=d"(dummy)
+++            :"a"(a), "rm"(b), "c"((uint8_t)shift)
+++        );
++     return rt;
++ }
++ 
++@@ -113,19 +121,31 @@ __asm__ volatile(\
++ // avoid +32 for shift optimization (gcc should do that ...)
++ #define NEG_SSR32 NEG_SSR32
++ static inline  int32_t NEG_SSR32( int32_t a, int8_t s){
+++    if (__builtin_constant_p(s))
++     __asm__ ("sarl %1, %0\n\t"
++          : "+r" (a)
++-         : "ic" ((uint8_t)(-s))
+++         : "i" (-s & 0x1F)
++     );
+++    else
+++        __asm__ ("sarl %1, %0\n\t"
+++               : "+r" (a)
+++               : "c" ((uint8_t)(-s))
+++        );
++     return a;
++ }
++ 
++ #define NEG_USR32 NEG_USR32
++ static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
+++    if (__builtin_constant_p(s))
++     __asm__ ("shrl %1, %0\n\t"
++          : "+r" (a)
++-         : "ic" ((uint8_t)(-s))
+++         : "i" (-s & 0x1F)
++     );
+++    else
+++        __asm__ ("shrl %1, %0\n\t"
+++               : "+r" (a)
+++               : "c" ((uint8_t)(-s))
+++        );
++     return a;
++ }
++ 
++-- 
++2.30.2
++
+-- 
+2.41.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 821632b27c1a..36e60fa21be1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,8 +22,8 @@ _clangbuild=
 
 pkgbase=kodi-nexus-git
 pkgname=("$pkgbase" "$pkgbase-eventclients" "$pkgbase-tools-texturepacker" "$pkgbase-dev")
-pkgver=r62122.ce0bfc65020
-pkgrel=2
+pkgver=r62188.6054ffa0f4b
+pkgrel=1
 arch=('x86_64')
 url="https://kodi.tv"
 license=('GPL2')
@@ -79,7 +79,9 @@ 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
-  23266.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/23266.patch
+  kodi-fmt-10.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/23453.patch
+  flatb23.patch::https://github.com/xbmc/xbmc/commit/35be40daa39965a9ea5b3569eb7d515e6a14da5d.patch
+  0001-ffmpeg-fix-build-with-binutils-update.patch
 )
 noextract=(
   "libdvdcss-$_libdvdcss_version.tar.gz"
@@ -101,7 +103,9 @@ b2sums=('SKIP'
         'be5e3c8ea81ce4b6f2e2c1b2f22e1172434c435f096fa7dade060578c506cff0310e3e2ef0627e26ce2be44f740652eb9a8e1b63578c18f430f7925820f04e66'
         '1801d84a0ca38410a78f23e7d44f37e6d53346753c853df2e7380d259ce1ae7f0c712825b95a5753ad0bc6360cfffe1888b9e7bc30da8b84549e0f1198248f61'
         '6d647177380c619529fb875374ec46f1fff6273be1550f056c18cb96e0dea8055272b47664bb18cdc964496a3e9007fda435e67c4f1cee6375a80c048ae83dd0'
-        'd0d1e805243a3371b0777fd062d171a142c89845713c8b0c3882ef819db7635e242ff501efc65a0205fa54888615dbee951a235bec9207d8bf960a3541dd1aff')
+        '8c46990a06bc43eb5f5a38e559cae2bdca188f2fec2f58141b5cbedef7576ffbdf528234e893efdf957739141c01a10539c57ce102044cb46f83ba6867c95c1c'
+        'bdc249920685a3738f872d9ea19a5c46b244d437d30b7dad958dcf33b5bfb88782c1a73bd15dcb1c26f0b643f1e4711775621a2753a1b5668efacc2144fd06e6'
+        '7e15afcc0cc7f529e6c491c985968bc53be413424b890e4eab2ce8e3d0f21b08347698e660e0f4f0cc50c5279f052be7a2d84d5351509d34193066d797a44130')
 
 pkgver() {
   cd "$_gitname"
@@ -117,7 +121,9 @@ prepare() {
   rm -rf system/certs # remove not needed cacert
 
   [[ "$_sse_workaround" -eq 1 ]] && patch -p1 -i "$srcdir/cheat-sse-build.patch"
-  patch -p1 -i ../23266.patch
+  patch -p1 -i ../0001-ffmpeg-fix-build-with-binutils-update.patch
+  patch -p1 -i ../kodi-fmt-10.patch
+  patch -p1 -i ../flatb23.patch
 
   if [[ -n "$_clangbuild" ]]; then
     msg "Building with clang"