alarm/kodi-rpi-git to 20.x.61855.5429a64cc9-1

Use upstream recommended version of ffmpeg for Nexus

alarm/kodi-rpi-git/0001-FFMPEG-VERSION-use-checksum-for-4.4.3.patch

@@ -1,21 +0,0 @@
-Subject: [PATCH] FFMPEG-VERSION: use checksum for 4.4.2
-
----
- tools/depends/target/ffmpeg/FFMPEG-VERSION | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tools/depends/target/ffmpeg/FFMPEG-VERSION b/tools/depends/target/ffmpeg/FFMPEG-VERSION
-index 2c9eda8..a8b7be3 100644
---- a/tools/depends/target/ffmpeg/FFMPEG-VERSION
-+++ b/tools/depends/target/ffmpeg/FFMPEG-VERSION
-@@ -1,5 +1,5 @@
- LIBNAME=ffmpeg
- BASE_URL=https://github.com/xbmc/FFmpeg
--VERSION=4.4.1-Nexus-Alpha1
-+VERSION=4.4.3
- ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz
--SHA512=8beb04d577b5251e74b0d52f4d130997a8ba94bbd488c7c8309e6b45095c27807e150212888ce3a384b23dff52f8df1a7bde5407bae924ddc363f8125c0616c5
-+SHA512=1649eeddc47c66f5fd69c4739a102f5c540f78851654eadf63159405edf99ea03f971ee02422d57bb1d0cae13a1ae8e0662b1b293664bbdde12c000337b3bf34
--- 
-2.39.0
-

alarm/kodi-rpi-git/PKGBUILD

@@ -13,8 +13,8 @@ pkgname=(
   'kodi-rpi-git-eventclients' 'kodi-rpi-git-tools-texturepacker' 'kodi-rpi-git-dev'
 )
 
-_commitnumber=61847
-_commit=918b73a3e47cb958cf706d597ff15bf93b893def
+_commitnumber=61855
+_commit=5429a64cc97e0f09e38c4114e819981602c26807
 
 # set this to anything to build with clang
 # recommend manually setting -DUSE_LTO=OFF to -DUSE_LTO=$(nproc) in build()
@@ -43,8 +43,7 @@ _init_version=1.136
 _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="4.4.1-Nexus-Alpha1"
-_ffmpeg_version="4.4.3"
+_ffmpeg_version="4.4.1-Nexus-Alpha1"
 _fmt_version="9.1.0"
 _spdlog_version="1.10.0"
 _crossguid_version="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
@@ -56,8 +55,7 @@ source=(
   "libdvdcss-$_libdvdcss_version.tar.gz::https://github.com/xbmc/libdvdcss/archive/$_libdvdcss_version.tar.gz"
   "libdvdnav-$_libdvdnav_version.tar.gz::https://github.com/xbmc/libdvdnav/archive/$_libdvdnav_version.tar.gz"
   "libdvdread-$_libdvdread_version.tar.gz::https://github.com/xbmc/libdvdread/archive/$_libdvdread_version.tar.gz"
-  #"ffmpeg-$_ffmpeg_version.tar.gz::https://github.com/xbmc/FFmpeg/archive/$_ffmpeg_version.tar.gz"
-  "https://ffmpeg.org/releases/ffmpeg-$_ffmpeg_version.tar.gz"
+  "ffmpeg-$_ffmpeg_version.tar.gz::https://github.com/xbmc/FFmpeg/archive/$_ffmpeg_version.tar.gz"
   "https://mirrors.kodi.tv/build-deps/sources/fmt-$_fmt_version.tar.gz"
   "https://mirrors.kodi.tv/build-deps/sources/spdlog-$_spdlog_version.tar.gz"
   "https://mirrors.kodi.tv/build-deps/sources/crossguid-$_crossguid_version.tar.gz"
@@ -66,7 +64,6 @@ source=(
   "https://mirrors.kodi.tv/build-deps/sources/libudfread-$_libudfread_version.tar.gz"
   "ArchARM-kodi-init-v$_init_version.tar.gz::https://github.com/graysky2/kodi-standalone-service/archive/v$_init_version.tar.gz"
   kodi.config.txt
-  0001-FFMPEG-VERSION-use-checksum-for-4.4.3.patch
 )
 backup=(boot/kodi.config.txt etc/conf.d/kodi-standalone)
 noextract=(
@@ -81,11 +78,11 @@ noextract=(
   "flatbuffers-$_flatbuffers_version.tar.gz"
   "libudfread-$_libudfread_version.tar.gz"
 )
-sha256sums=('73b33aa5985caccc9008fc24269263f91f4ddb893ee20f4ea9d2c5287d019577'
+sha256sums=('8eac479b13801334fc725c00860d8b884b02db42969d19316d270638954317c8'
             'f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e'
             '584f62a3896794408d46368e2ecf2c6217ab9c676ce85921b2d68b8961f49dfc'
             '719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62'
-            'f7ec99140aca68fa5ad706b67f5cebfefd18d7bb91e2ee2a28b837b85991fe38'
+            'abbce62231baffe237e412689c71ffe01bfc83135afd375f1e538caae87729ed'
             '5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2'
             '697f91700237dbae2326b90469be32b876b2b44888302afbc7aceb68bcfe8224'
             '6be27e0b3a4907f0cd3cfadec255ee1b925569e1bd06e67a4d2f4267299b69c4'
@@ -93,15 +90,12 @@ sha256sums=('73b33aa5985caccc9008fc24269263f91f4ddb893ee20f4ea9d2c5287d019577'
             '9ddb9031798f4f8754d00fca2f1a68ecf9d0f83dfac7239af1311e4fd9a565c4'
             '2bf16726ac98d093156195bb049a663e07d3323e079c26912546f4e05c77bac5'
             'b94c70baa45e30346224ceecfab031dd183e09303b1f97d6522f9941da9b0067'
-            '9ce6051a2157e6b677090f201d98870a33db6c90c91dc0d480a87fb7ab84e3e5'
-            '4cc9e914fce89ab7acfe7f9bb179cb60cc35f10d382f5d0bc7a7ee5deb0b96a8')
+            '9ce6051a2157e6b677090f201d98870a33db6c90c91dc0d480a87fb7ab84e3e5')
 
 prepare() {
   [[ -d kodi-build ]] && rm -rf kodi-build
   mkdir "$srcdir/kodi-build"
   cd "xbmc-$_commit"
-
-  patch -p1 -i ../0001-FFMPEG-VERSION-use-checksum-for-4.4.3.patch
 }
 
 build() {