Update to r64638.a1a54171625-1

2 files changed, 16 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fc509dc27647..3d947c955d81 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = kodi-git
-	pkgver = r64505.6818b390a6a
+	pkgver = r64638.a1a54171625
 	pkgrel = 1
 	url = https://kodi.tv
 	arch = x86_64
@@ -14,7 +14,7 @@ pkgbase = kodi-git
 	makedepends = glew
 	makedepends = gperf
 	makedepends = hicolor-icon-theme
-	makedepends = java-environment<21
+	makedepends = java-runtime
 	makedepends = fmt
 	makedepends = libaacs
 	makedepends = libass
@@ -82,6 +82,7 @@ pkgbase = kodi-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 = PR-24199.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/24199.patch
 	b2sums = SKIP
 	b2sums = 2f503d3ab767094958f7ec10b4ad11ffd02665deee571c8f3c739bef5fc7e2ff84babc5a3fdee638dc095f896b72fe3ce65e6b688674cb5f7b7b77190992688c
 	b2sums = db4d05836d8fbb3637ae50bdbfc0e4b612ee6b3be24addfea94ce772c3bf28d58b63a3f252d6f9f016f72f8cbb841cc1820b091226b136f4c4664385a32da73c
@@ -92,6 +93,7 @@ pkgbase = kodi-git
 	b2sums = be5e3c8ea81ce4b6f2e2c1b2f22e1172434c435f096fa7dade060578c506cff0310e3e2ef0627e26ce2be44f740652eb9a8e1b63578c18f430f7925820f04e66
 	b2sums = 1801d84a0ca38410a78f23e7d44f37e6d53346753c853df2e7380d259ce1ae7f0c712825b95a5753ad0bc6360cfffe1888b9e7bc30da8b84549e0f1198248f61
 	b2sums = 6d647177380c619529fb875374ec46f1fff6273be1550f056c18cb96e0dea8055272b47664bb18cdc964496a3e9007fda435e67c4f1cee6375a80c048ae83dd0
+	b2sums = d50467a9fa07d7c2e02b209ce9543b0f9974a880c807dcb09f42d46a9215dfa307a32f5c2216f75c03a92cf9ce398e74619196ff13e0bb4109f98f67f8808697
 
 pkgname = kodi-git
 	pkgdesc = A software media player and entertainment hub for digital media (master branch)
@@ -140,7 +142,7 @@ pkgname = kodi-git
 	optdepends = pulseaudio: PulseAudio support
 	optdepends = pipewire: PipeWire support
 	optdepends = upower: Display battery level
-	provides = kodi=r64505.6818b390a6a
+	provides = kodi=r64638.a1a54171625
 	provides = kodi-x11
 	provides = kodi-wayland
 	provides = kodi-gbm
@@ -153,7 +155,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=r64505.6818b390a6a
+	provides = kodi-eventclients=r64638.a1a54171625
 	conflicts = kodi-eventclients
 
 pkgname = kodi-git-tools-texturepacker
@@ -162,11 +164,11 @@ pkgname = kodi-git-tools-texturepacker
 	depends = giflib
 	depends = libjpeg-turbo
 	depends = lzo
-	provides = kodi-tools-texturepacker=r64505.6818b390a6a
+	provides = kodi-tools-texturepacker=r64638.a1a54171625
 	conflicts = kodi-tools-texturepacker
 
 pkgname = kodi-git-dev
 	pkgdesc = Kodi dev files (master branch)
 	depends = kodi-git
-	provides = kodi-dev=r64505.6818b390a6a
+	provides = kodi-dev=r64638.a1a54171625
 	conflicts = kodi-dev
diff --git a/PKGBUILD b/PKGBUILD
index 6273360dcde1..19aedf005d9e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,14 +22,14 @@ _clangbuild=
 
 pkgbase=kodi-git
 pkgname=("$pkgbase" "$pkgbase-eventclients" "$pkgbase-tools-texturepacker" "$pkgbase-dev")
-pkgver=r64505.6818b390a6a
+pkgver=r64638.a1a54171625
 pkgrel=1
 arch=('x86_64')
 url="https://kodi.tv"
 license=('GPL2')
 makedepends=(
   'afpfs-ng' 'bluez-libs' 'cmake' 'curl' 'dav1d' 'doxygen' 'git' 'glew'
-  'gperf' 'hicolor-icon-theme' 'java-environment<21' 'fmt' 'libaacs' 'libass'
+  'gperf' 'hicolor-icon-theme' 'java-runtime' 'fmt' 'libaacs' 'libass'
   'libbluray' 'libcdio' 'libcec' 'libgl' 'mariadb-libs' 'libmicrohttpd'
   'libmodplug' 'libmpeg2' 'libnfs' 'libplist' 'libpulse' 'libva'
   'libva-vdpau-driver' 'libxrandr' 'libxslt' 'lirc' 'lzo' 'mesa' 'nasm'
@@ -78,6 +78,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
+  PR-24199.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/24199.patch
 )
 noextract=(
   "libdvdcss-$_libdvdcss_version.tar.gz"
@@ -98,7 +99,8 @@ b2sums=('SKIP'
         'a8b68fcb8613f0d30e5ff7b862b37408472162585ca71cdff328e3299ff50476fd265467bbd77b352b22bb88c590969044f74d91c5468475504568fd269fa69e'
         'be5e3c8ea81ce4b6f2e2c1b2f22e1172434c435f096fa7dade060578c506cff0310e3e2ef0627e26ce2be44f740652eb9a8e1b63578c18f430f7925820f04e66'
         '1801d84a0ca38410a78f23e7d44f37e6d53346753c853df2e7380d259ce1ae7f0c712825b95a5753ad0bc6360cfffe1888b9e7bc30da8b84549e0f1198248f61'
-        '6d647177380c619529fb875374ec46f1fff6273be1550f056c18cb96e0dea8055272b47664bb18cdc964496a3e9007fda435e67c4f1cee6375a80c048ae83dd0')
+        '6d647177380c619529fb875374ec46f1fff6273be1550f056c18cb96e0dea8055272b47664bb18cdc964496a3e9007fda435e67c4f1cee6375a80c048ae83dd0'
+        'd50467a9fa07d7c2e02b209ce9543b0f9974a880c807dcb09f42d46a9215dfa307a32f5c2216f75c03a92cf9ce398e74619196ff13e0bb4109f98f67f8808697')
 
 pkgver() {
   cd "$_gitname"
@@ -119,6 +121,9 @@ prepare() {
     msg "Building with clang"
     export CC=clang CXX=clang++
   fi
+
+  # unmerged PR to fix java build issue
+  git apply -v ../PR-24199.patch
 }
 
 build() {