Bump version

2 files changed, 51 insertions, 55 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fda19ddb2172..a49fb162d0bc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = kodi-rockpro64-git
-	pkgver = 20.x.61791.c19adeae47
+	pkgver = 21.x.62264.55669b9bb0
 	pkgrel = 1
 	url = https://github.com/xbmc/xbmc
 	arch = armv7h
@@ -15,7 +15,7 @@ pkgbase = kodi-rockpro64-git
 	makedepends = glew
 	makedepends = gperf
 	makedepends = hicolor-icon-theme
-	makedepends = java-runtime
+	makedepends = fmt
 	makedepends = libaacs
 	makedepends = libass
 	makedepends = libbluray
@@ -35,12 +35,15 @@ pkgbase = kodi-rockpro64-git
 	makedepends = lzo
 	makedepends = mesa
 	makedepends = nasm
+	makedepends = pipewire
 	makedepends = python-pycryptodomex
 	makedepends = python-pillow
 	makedepends = python-pybluez
 	makedepends = python-simplejson
 	makedepends = shairplay
 	makedepends = smbclient
+	makedepends = sndio
+	makedepends = spdlog
 	makedepends = taglib
 	makedepends = tinyxml
 	makedepends = swig
@@ -53,73 +56,61 @@ pkgbase = kodi-rockpro64-git
 	makedepends = graphviz
 	makedepends = libinput
 	makedepends = libxkbcommon
-	makedepends = flatbuffers
-	makedepends = pipewire
 	makedepends = pcre
 	makedepends = patchutils
 	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 = fmt-9.1.0.tar.gz
-	noextract = spdlog-1.10.0.tar.gz
 	noextract = crossguid-ca1bf4b810e2d188d04cb6286f957008ee1b7681.tar.gz
 	noextract = fstrcmp-0.7.D001.tar.gz
-	noextract = flatbuffers-2.0.0.tar.gz
+	noextract = flatbuffers-23.3.3.tar.gz
 	noextract = libudfread-1.1.2.tar.gz
 	backup = boot/kodi.config.txt
 	backup = etc/conf.d/kodi-standalone
-	source = xbmc-20.x.61791.c19adeae47.tar.gz::https://github.com/xbmc/xbmc/archive/c19adeae47e70143265395f7ddb56cfbffd14647.tar.gz
+	source = xbmc-21.x.62264.55669b9bb0.tar.gz::https://github.com/xbmc/xbmc/archive/55669b9bb0f8d99f885f4371c923a98d10ab91ec.tar.gz
 	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 = ffmpeg-4.4.1-Nexus-Alpha1.tar.gz::https://github.com/xbmc/FFmpeg/archive/4.4.1-Nexus-Alpha1.tar.gz
-	source = http://mirrors.kodi.tv/build-deps/sources/fmt-9.1.0.tar.gz
-	source = http://mirrors.kodi.tv/build-deps/sources/crossguid-ca1bf4b810e2d188d04cb6286f957008ee1b7681.tar.gz
-	source = http://mirrors.kodi.tv/build-deps/sources/fstrcmp-0.7.D001.tar.gz
-	source = http://mirrors.kodi.tv/build-deps/sources/spdlog-1.10.0.tar.gz
-	source = http://mirrors.kodi.tv/build-deps/sources/libudfread-1.1.2.tar.gz
-	source = http://mirrors.kodi.tv/build-deps/sources/flatbuffers-2.0.0.tar.gz
+	source = https://ffmpeg.org/releases/ffmpeg-6.0.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 = ArchARM-kodi-init-v1.136.tar.gz::https://github.com/graysky2/kodi-standalone-service/archive/v1.136.tar.gz
 	source = kodi.config.txt
-	source = https://github.com/LibreELEC/LibreELEC.tv/raw/9f64444be3dc4e9d50e0a40928787aa079ef0432/packages/multimedia/ffmpeg/patches/v4l2-drmprime/ffmpeg-001-v4l2-drmprime.patch
-	source = https://github.com/LibreELEC/LibreELEC.tv/raw/9f64444be3dc4e9d50e0a40928787aa079ef0432/packages/multimedia/ffmpeg/patches/v4l2-request/ffmpeg-001-v4l2-request.patch
-	source = https://github.com/LibreELEC/LibreELEC.tv/raw/9f64444be3dc4e9d50e0a40928787aa079ef0432/projects/Rockchip/patches/ffmpeg/ffmpeg-0002-WIP-deint-filter.patch
-	source = https://github.com/LibreELEC/LibreELEC.tv/raw/9f64444be3dc4e9d50e0a40928787aa079ef0432/projects/Rockchip/patches/ffmpeg/ffmpeg-0003-libavfilter-v4l2deinterlace-dequeue-both-destination.patch
-	source = https://github.com/LibreELEC/LibreELEC.tv/raw/9f64444be3dc4e9d50e0a40928787aa079ef0432/projects/Rockchip/patches/ffmpeg/ffmpeg-0006-deint_v4l2m2m-increase-input-and-output-buffers.patch
-	source = https://github.com/LibreELEC/LibreELEC.tv/raw/9f64444be3dc4e9d50e0a40928787aa079ef0432/projects/Rockchip/patches/ffmpeg/ffmpeg-0006-libavfilter-v4l2deinterlace-support-more-formats-aut.patch
-	source = https://github.com/LibreELEC/LibreELEC.tv/raw/9f64444be3dc4e9d50e0a40928787aa079ef0432/packages/mediacenter/kodi/patches/drmprime-filter/0001-WIP-DVDVideoCodecDRMPRIME-add-support-for-filters.patch
-	source = https://github.com/LibreELEC/LibreELEC.tv/raw/9f64444be3dc4e9d50e0a40928787aa079ef0432/packages/mediacenter/kodi/patches/drmprime-filter/0002-WIP-DRMPRIME-deinterlace-filter.patch
-	source = https://github.com/LibreELEC/LibreELEC.tv/raw/9f64444be3dc4e9d50e0a40928787aa079ef0432/packages/mediacenter/kodi/patches/drmprime-filter/0003-DVDVideoCodecDRMPRIME-Avoid-exception-with-AV_PIX_FM.patch
-	source = https://github.com/LibreELEC/LibreELEC.tv/raw/9f64444be3dc4e9d50e0a40928787aa079ef0432/packages/mediacenter/kodi/patches/drmprime-filter/0004-DVDVideoCodecDRMPRIME-Leave-deinterlace-filter-activ.patch
-	source = https://github.com/LibreELEC/LibreELEC.tv/raw/9f64444be3dc4e9d50e0a40928787aa079ef0432/packages/mediacenter/kodi/patches/drmprime-filter/0005-SetVideoInterlaced-Set-and-unset-deinterlace-method-.patch
-	source = https://github.com/LibreELEC/LibreELEC.tv/raw/9f64444be3dc4e9d50e0a40928787aa079ef0432/packages/mediacenter/kodi/patches/drmprime-filter/0006-DVDVideoCodecDRMPRIME-Close-deinterlace-filter-on-er.patch
-	source = 0001-fix-mesa-22.3.0-build.patch::https://github.com/LibreELEC/LibreELEC.tv/raw/9f64444be3dc4e9d50e0a40928787aa079ef0432/packages/mediacenter/kodi/patches/kodi-100.01.fix-mesa-22.3.0-build.patch
-	sha256sums = a8092bfde254c6dc6ff61da1c89cc49ed52cca8fa836dcc48edfbd01ae826929
+	source = https://github.com/LibreELEC/LibreELEC.tv/raw/31e954652755be1a0ccaaa5ecf601e98b6a97741/packages/multimedia/ffmpeg/patches/v4l2-drmprime/ffmpeg-001-v4l2-drmprime.patch
+	source = https://github.com/LibreELEC/LibreELEC.tv/raw/31e954652755be1a0ccaaa5ecf601e98b6a97741/packages/multimedia/ffmpeg/patches/v4l2-request/ffmpeg-001-v4l2-request.patch
+	source = https://github.com/LibreELEC/LibreELEC.tv/raw/31e954652755be1a0ccaaa5ecf601e98b6a97741/packages/multimedia/ffmpeg/patches/vf-deinterlace-v4l2m2m/ffmpeg-001-vf-deinterlace-v4l2m2m.patch
+	source = https://github.com/LibreELEC/LibreELEC.tv/raw/31e954652755be1a0ccaaa5ecf601e98b6a97741/packages/mediacenter/kodi/patches/drmprime-filter/0001-WIP-DVDVideoCodecDRMPRIME-add-support-for-filters.patch
+	source = https://github.com/LibreELEC/LibreELEC.tv/raw/31e954652755be1a0ccaaa5ecf601e98b6a97741/packages/mediacenter/kodi/patches/drmprime-filter/0002-WIP-DRMPRIME-deinterlace-filter.patch
+	source = https://github.com/LibreELEC/LibreELEC.tv/raw/31e954652755be1a0ccaaa5ecf601e98b6a97741/packages/mediacenter/kodi/patches/drmprime-filter/0003-DVDVideoCodecDRMPRIME-Avoid-exception-with-AV_PIX_FM.patch
+	source = https://github.com/LibreELEC/LibreELEC.tv/raw/31e954652755be1a0ccaaa5ecf601e98b6a97741/packages/mediacenter/kodi/patches/drmprime-filter/0004-DVDVideoCodecDRMPRIME-Leave-deinterlace-filter-activ.patch
+	source = https://github.com/LibreELEC/LibreELEC.tv/raw/31e954652755be1a0ccaaa5ecf601e98b6a97741/packages/mediacenter/kodi/patches/drmprime-filter/0005-SetVideoInterlaced-Set-and-unset-deinterlace-method-.patch
+	source = https://github.com/LibreELEC/LibreELEC.tv/raw/31e954652755be1a0ccaaa5ecf601e98b6a97741/packages/mediacenter/kodi/patches/drmprime-filter/0006-DVDVideoCodecDRMPRIME-Close-deinterlace-filter-on-er.patch
+	source = https://github.com/LibreELEC/LibreELEC.tv/raw/31e954652755be1a0ccaaa5ecf601e98b6a97741/packages/mediacenter/kodi/patches/drmprime-filter/0007-DVDVideoCodecDRMPRIME-Fix-missing-flush-after-eof.patch
+	sha256sums = 8b8cb827944a92fb935b1fa5d7834626f9ae1c3f6543456cd378826ab8c2eaf5
 	sha256sums = f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e
 	sha256sums = 584f62a3896794408d46368e2ecf2c6217ab9c676ce85921b2d68b8961f49dfc
 	sha256sums = 719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62
-	sha256sums = abbce62231baffe237e412689c71ffe01bfc83135afd375f1e538caae87729ed
-	sha256sums = 5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2
+	sha256sums = f4ccf961403752c93961927715f524576d1f4dd02cd76d8c76aed3bbe6686656
 	sha256sums = 6be27e0b3a4907f0cd3cfadec255ee1b925569e1bd06e67a4d2f4267299b69c4
 	sha256sums = e4018e850f80700acee8da296e56e15b1eef711ab15157e542e7d7e1237c3476
-	sha256sums = 697f91700237dbae2326b90469be32b876b2b44888302afbc7aceb68bcfe8224
+	sha256sums = 8aff985da30aaab37edf8e5b02fda33ed4cbdd962699a8e2af98fdef306f4e4d
 	sha256sums = 2bf16726ac98d093156195bb049a663e07d3323e079c26912546f4e05c77bac5
-	sha256sums = 9ddb9031798f4f8754d00fca2f1a68ecf9d0f83dfac7239af1311e4fd9a565c4
 	sha256sums = b94c70baa45e30346224ceecfab031dd183e09303b1f97d6522f9941da9b0067
 	sha256sums = 92d063169017bf9e1770d8a7cce77c0c55d197692d10820a7e4aecad9e58178c
-	sha256sums = 050db02dabea05e4b651df1f2107fe062c197391e9e9eac519a3eac9c3c5fc5b
-	sha256sums = b9304095fa7e8fa2585dd353c975f0fdaee00914cb55934d8bf82b91dff1795a
-	sha256sums = 2a218cce1b7514931c458a1ae886d27531b9d4be8253eefb16f8083450cbfc93
-	sha256sums = a5dbfd115caae0c4d53bd8f3aa65ea36db8b7e2891a33c72cd03ceaaa459d9b1
-	sha256sums = b88708f4eb3ff2fe01c01b5d14ad7c4b58e2c2951ac1362292f3db9437bf9c68
-	sha256sums = 2d320a49b5f11a8543c54e891c82978e199ea5bbe235ea56b3aec8df9ff804b5
-	sha256sums = 38cc2f33ab5ee09bd9eea5b661268f20ecf132d3e7f9789286a0e30d83f811fd
-	sha256sums = a8523e228fabf7869ce31195c2b88f0de50773fa005086a64e6d1dc2f5b808a4
-	sha256sums = 2fbda3ecd0065373c608d15f7cf94052879c9d39ddd4df78db46c287871c9f56
-	sha256sums = 3e441417b30d9f398b9f041d28a6404d5b52903b98eff78539f5927f2179471b
-	sha256sums = 63066f9a1cc5a5eda418165f0e338553c9d86a23cf4b92a29bb725e3c3f15c72
-	sha256sums = 0349babb16dd6572dc51fade9eda53dc19e4528839651ac518a6f7ca80e1d902
-	sha256sums = 4ef526800e59f733ad7185d1487b3ac4dd6da4b0d9753be98a9347f13cf979f1
+	sha256sums = 049893899d51cf185e5c56621eaadc33dac17995b59ec282cafc5709afb8d7e7
+	sha256sums = c940e45211fe0c466e612cc7d42e8b5d4a26ec72db7077d94d0fd18cf62a90f5
+	sha256sums = 6154319c8b4cb8b9cb06b8f95361dcd738203f36ea763b9c485b5a07a5ccca6c
+	sha256sums = a8961e574c9f04f5f30bee25674754e87ef9840188794fd807082d617da9b203
+	sha256sums = 552d5863c8bb0c2254351e24de95e5786d93de477282a7a10e229966c01f4abe
+	sha256sums = 12134d1964b05625351f88a51d4656029d35f6e153b638d8992922e24c23a974
+	sha256sums = 61c3eecb06ddf9b4d66d73125366bc497671c99cd9552dc47b55bc8223b9e2d1
+	sha256sums = 3d8e60f5281e0dab50e84cfa6666e0fa3519c4d6d0219f6e41d66d9e4552b18d
+	sha256sums = 11ad37e1d540cec0fe07810b81a02b699abef65139c031b59b10d45c1736be1c
+	sha256sums = bb59e5ed6ebf9915289f1ed8371601e91d11b18b2bebb629659078949e6a961c
+	makedepends_armv7h = jdk17-openjdk
+	makedepends_aarch64 = java-environment<21
 
 pkgname = kodi-rockpro64-git
 	pkgdesc = Media player and entertainment hub with hw accel for PINE64's ROCKPro64
@@ -129,6 +120,7 @@ pkgname = kodi-rockpro64-git
 	depends = dav1d
 	depends = desktop-file-utils
 	depends = hicolor-icon-theme
+	depends = fmt
 	depends = lcms2
 	depends = libass
 	depends = libbluray
@@ -142,30 +134,34 @@ pkgname = kodi-rockpro64-git
 	depends = lirc
 	depends = mariadb-libs
 	depends = mesa
+	depends = libpipewire
 	depends = python-pillow
 	depends = python-pycryptodomex
 	depends = python-simplejson
 	depends = shairplay
 	depends = smbclient
+	depends = sndio
+	depends = spdlog
 	depends = sqlite
 	depends = taglib
 	depends = tinyxml
-	depends = libinput
 	depends = libxkbcommon
 	depends = polkit
 	depends = linux>=5.4.35
 	depends = lzo
-	depends = flatbuffers
-	depends = pipewire
+	depends = libinput
 	depends = pcre
+	depends = libdisplay-info
+	depends = tinyxml2
 	optdepends = afpfs-ng: Apple shares support
 	optdepends = bluez: Blutooth support
 	optdepends = linux-rpi: HW accelerated decoding
 	optdepends = python-pybluez: Bluetooth support
 	optdepends = pulseaudio: PulseAudio support
+	optdepends = pipewire: PipeWire support
 	provides = xbmc
-	provides = kodi=20.x.61791.c19adeae47
-	provides = kodi-common=20.x.61791.c19adeae47
+	provides = kodi=21.x.62264.55669b9bb0
+	provides = kodi-common=21.x.62264.55669b9bb0
 	conflicts = xbmc
 	conflicts = kodi
 	conflicts = arm-mem-git
@@ -181,7 +177,7 @@ pkgname = kodi-rockpro64-git-eventclients
 	pkgdesc = Kodi Event Clients
 	optdepends = kodi: local machine eventclient use
 	optdepends = python: most eventclients are implemented in python
-	provides = kodi-eventclients=20.x.61791.c19adeae47
+	provides = kodi-eventclients=21.x.62264.55669b9bb0
 	conflicts = kodi-eventclients
 	conflicts = kodi-eventclients-rbp4-git
 	conflicts = kodi-rpi-eventclients
@@ -205,7 +201,7 @@ pkgname = kodi-rockpro64-git-tools-texturepacker
 pkgname = kodi-rockpro64-git-dev
 	pkgdesc = Kodi dev files
 	depends = kodi
-	provides = kodi-dev=20.x.61791.c19adeae47
+	provides = kodi-dev=21.x.62264.55669b9bb0
 	conflicts = kodi-dev-rbp4-git
 	conflicts = kodi-rpi-dev
 	conflicts = kodi-rpi-legacy-dev
diff --git a/PKGBUILD b/PKGBUILD
index cb2bf9096a77..76cd7816ad49 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -161,8 +161,8 @@ build() {
     CFLAGS="-mcpu=cortex-a53"
   fi
 
-  export CFLAGS+=" -O2 -pipe -fstack-protector-strong -fno-plt -fexceptions -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -fstack-clash-protection"
-  export CXXFLAGS+="${CFLAGS} -Wp,-D_GLIBCXX_ASSERTIONS"
+  CFLAGS+=" -O2 -pipe -fstack-protector-strong -fno-plt -fexceptions -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -fstack-clash-protection"
+  CXXFLAGS+="${CFLAGS} -Wp,-D_GLIBCXX_ASSERTIONS"
 
   if [[ -n "$_clangbuild" ]]; then
     export CC=clang CXX=clang++