Update to r64505.6818b390a6a-1

3 files changed, 12 insertions, 131 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b8755eec2413..fc509dc27647 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = kodi-git
-	pkgver = r64096.b96c33a2015
+	pkgver = r64505.6818b390a6a
 	pkgrel = 1
 	url = https://kodi.tv
 	arch = x86_64
@@ -66,7 +66,7 @@ pkgbase = kodi-git
 	noextract = libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz
 	noextract = libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz
 	noextract = libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz
-	noextract = ffmpeg-6.0.tar.gz
+	noextract = ffmpeg-6.0.1.tar.gz
 	noextract = crossguid-ca1bf4b810e2d188d04cb6286f957008ee1b7681.tar.gz
 	noextract = fstrcmp-0.7.D001.tar.gz
 	noextract = flatbuffers-23.3.3.tar.gz
@@ -76,24 +76,22 @@ pkgbase = kodi-git
 	source = libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz::https://github.com/xbmc/libdvdcss/archive/1.4.3-Next-Nexus-Alpha2-2.tar.gz
 	source = libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz::https://github.com/xbmc/libdvdnav/archive/6.1.1-Next-Nexus-Alpha2-2.tar.gz
 	source = libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz::https://github.com/xbmc/libdvdread/archive/6.1.3-Next-Nexus-Alpha2-2.tar.gz
-	source = https://ffmpeg.org/releases/ffmpeg-6.0.tar.gz
+	source = https://ffmpeg.org/releases/ffmpeg-6.0.1.tar.gz
 	source = https://mirrors.kodi.tv/build-deps/sources/crossguid-ca1bf4b810e2d188d04cb6286f957008ee1b7681.tar.gz
 	source = https://mirrors.kodi.tv/build-deps/sources/fstrcmp-0.7.D001.tar.gz
 	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-ffmpeg-fix-build-with-binutils-update.patch
 	b2sums = SKIP
 	b2sums = 2f503d3ab767094958f7ec10b4ad11ffd02665deee571c8f3c739bef5fc7e2ff84babc5a3fdee638dc095f896b72fe3ce65e6b688674cb5f7b7b77190992688c
 	b2sums = db4d05836d8fbb3637ae50bdbfc0e4b612ee6b3be24addfea94ce772c3bf28d58b63a3f252d6f9f016f72f8cbb841cc1820b091226b136f4c4664385a32da73c
 	b2sums = c94feb5a03a12efa5b7767965118d2500a088299ea36f3b82e46d157e45893e6b04503cb50f179ca681bac914457607fab26acfa6e304752b355c407578572d1
-	b2sums = 6f5d3279fc09ac8624b9353337515858fd588660e9d6d17ef70c95c241cb69ef2b320a6e4aad20fcdd9d99d13647e1a75f1ebb51b16a25368a9e57585a6bed24
+	b2sums = 6424e30c6d354abbbea8a807822ae61589413189e9c4ba7aa51c307179287506b9072626e9745861fe83753c0015b50d179f9b4f298fe9abf74bee13936639af
 	b2sums = 0f78a8ab5a420297f666b3b8156d499a9141ec25c049d4d2bb2ba594dc585abe211a149b83c605cce4f5530207231a065d5f3a87a0c969781de8c6381afa2527
 	b2sums = a8b68fcb8613f0d30e5ff7b862b37408472162585ca71cdff328e3299ff50476fd265467bbd77b352b22bb88c590969044f74d91c5468475504568fd269fa69e
 	b2sums = be5e3c8ea81ce4b6f2e2c1b2f22e1172434c435f096fa7dade060578c506cff0310e3e2ef0627e26ce2be44f740652eb9a8e1b63578c18f430f7925820f04e66
 	b2sums = 1801d84a0ca38410a78f23e7d44f37e6d53346753c853df2e7380d259ce1ae7f0c712825b95a5753ad0bc6360cfffe1888b9e7bc30da8b84549e0f1198248f61
 	b2sums = 6d647177380c619529fb875374ec46f1fff6273be1550f056c18cb96e0dea8055272b47664bb18cdc964496a3e9007fda435e67c4f1cee6375a80c048ae83dd0
-	b2sums = 7e15afcc0cc7f529e6c491c985968bc53be413424b890e4eab2ce8e3d0f21b08347698e660e0f4f0cc50c5279f052be7a2d84d5351509d34193066d797a44130
 
 pkgname = kodi-git
 	pkgdesc = A software media player and entertainment hub for digital media (master branch)
@@ -142,7 +140,7 @@ pkgname = kodi-git
 	optdepends = pulseaudio: PulseAudio support
 	optdepends = pipewire: PipeWire support
 	optdepends = upower: Display battery level
-	provides = kodi=r64096.b96c33a2015
+	provides = kodi=r64505.6818b390a6a
 	provides = kodi-x11
 	provides = kodi-wayland
 	provides = kodi-gbm
@@ -155,7 +153,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=r64096.b96c33a2015
+	provides = kodi-eventclients=r64505.6818b390a6a
 	conflicts = kodi-eventclients
 
 pkgname = kodi-git-tools-texturepacker
@@ -164,11 +162,11 @@ pkgname = kodi-git-tools-texturepacker
 	depends = giflib
 	depends = libjpeg-turbo
 	depends = lzo
-	provides = kodi-tools-texturepacker=r64096.b96c33a2015
+	provides = kodi-tools-texturepacker=r64505.6818b390a6a
 	conflicts = kodi-tools-texturepacker
 
 pkgname = kodi-git-dev
 	pkgdesc = Kodi dev files (master branch)
 	depends = kodi-git
-	provides = kodi-dev=r64096.b96c33a2015
+	provides = kodi-dev=r64505.6818b390a6a
 	conflicts = kodi-dev
diff --git a/0001-ffmpeg-fix-build-with-binutils-update.patch b/0001-ffmpeg-fix-build-with-binutils-update.patch
deleted file mode 100644
index 3852ac24b62d..000000000000
--- a/0001-ffmpeg-fix-build-with-binutils-update.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-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 41afcae9b324..6273360dcde1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,7 +22,7 @@ _clangbuild=
 
 pkgbase=kodi-git
 pkgname=("$pkgbase" "$pkgbase-eventclients" "$pkgbase-tools-texturepacker" "$pkgbase-dev")
-pkgver=r64096.b96c33a2015
+pkgver=r64505.6818b390a6a
 pkgrel=1
 arch=('x86_64')
 url="https://kodi.tv"
@@ -62,7 +62,7 @@ _sse_workaround=1
 _libdvdcss_version="1.4.3-Next-Nexus-Alpha2-2"
 _libdvdnav_version="6.1.1-Next-Nexus-Alpha2-2"
 _libdvdread_version="6.1.3-Next-Nexus-Alpha2-2"
-_ffmpeg_version="6.0"
+_ffmpeg_version="6.0.1"
 _crossguid_version="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
 _fstrcmp_version="0.7.D001"
 _flatbuffers_version="23.3.3"
@@ -78,7 +78,6 @@ 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-ffmpeg-fix-build-with-binutils-update.patch
 )
 noextract=(
   "libdvdcss-$_libdvdcss_version.tar.gz"
@@ -94,13 +93,12 @@ b2sums=('SKIP'
         '2f503d3ab767094958f7ec10b4ad11ffd02665deee571c8f3c739bef5fc7e2ff84babc5a3fdee638dc095f896b72fe3ce65e6b688674cb5f7b7b77190992688c'
         'db4d05836d8fbb3637ae50bdbfc0e4b612ee6b3be24addfea94ce772c3bf28d58b63a3f252d6f9f016f72f8cbb841cc1820b091226b136f4c4664385a32da73c'
         'c94feb5a03a12efa5b7767965118d2500a088299ea36f3b82e46d157e45893e6b04503cb50f179ca681bac914457607fab26acfa6e304752b355c407578572d1'
-        '6f5d3279fc09ac8624b9353337515858fd588660e9d6d17ef70c95c241cb69ef2b320a6e4aad20fcdd9d99d13647e1a75f1ebb51b16a25368a9e57585a6bed24'
+        '6424e30c6d354abbbea8a807822ae61589413189e9c4ba7aa51c307179287506b9072626e9745861fe83753c0015b50d179f9b4f298fe9abf74bee13936639af'
         '0f78a8ab5a420297f666b3b8156d499a9141ec25c049d4d2bb2ba594dc585abe211a149b83c605cce4f5530207231a065d5f3a87a0c969781de8c6381afa2527'
         'a8b68fcb8613f0d30e5ff7b862b37408472162585ca71cdff328e3299ff50476fd265467bbd77b352b22bb88c590969044f74d91c5468475504568fd269fa69e'
         'be5e3c8ea81ce4b6f2e2c1b2f22e1172434c435f096fa7dade060578c506cff0310e3e2ef0627e26ce2be44f740652eb9a8e1b63578c18f430f7925820f04e66'
         '1801d84a0ca38410a78f23e7d44f37e6d53346753c853df2e7380d259ce1ae7f0c712825b95a5753ad0bc6360cfffe1888b9e7bc30da8b84549e0f1198248f61'
-        '6d647177380c619529fb875374ec46f1fff6273be1550f056c18cb96e0dea8055272b47664bb18cdc964496a3e9007fda435e67c4f1cee6375a80c048ae83dd0'
-        '7e15afcc0cc7f529e6c491c985968bc53be413424b890e4eab2ce8e3d0f21b08347698e660e0f4f0cc50c5279f052be7a2d84d5351509d34193066d797a44130')
+        '6d647177380c619529fb875374ec46f1fff6273be1550f056c18cb96e0dea8055272b47664bb18cdc964496a3e9007fda435e67c4f1cee6375a80c048ae83dd0')
 
 pkgver() {
   cd "$_gitname"
@@ -117,9 +115,6 @@ prepare() {
 
   [[ "$_sse_workaround" -eq 1 ]] && patch -p1 -i "$srcdir/cheat-sse-build.patch"
 
-  # fix for new binutils, credit to kevku for pointing this out
-  patch -p1 -i ../0001-ffmpeg-fix-build-with-binutils-update.patch
-
   if [[ -n "$_clangbuild" ]]; then
     msg "Building with clang"
     export CC=clang CXX=clang++