git: 76858d8e86c0 - main - multimedia/kodi: Update 22.0a3 => 22.0b1

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Thu, 02 Jul 2026 15:10:40 UTC
The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=76858d8e86c07a3bfc5f89e48f1b5f142b42e26d

commit 76858d8e86c07a3bfc5f89e48f1b5f142b42e26d
Author:     yzrh <yzrh@noema.org>
AuthorDate: 2026-07-02 15:08:56 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2026-07-02 15:08:56 +0000

    multimedia/kodi: Update 22.0a3 => 22.0b1
    
    Changelog:
    https://github.com/xbmc/xbmc/releases/tag/22.0b1-Piers
    
    - Unbundle nlohmann-json.
    
    PR:             296428
    Sponsored by:   UNIS Labs
---
 multimedia/kodi/Makefile  | 21 +++++++++------------
 multimedia/kodi/distinfo  | 20 +++++++++-----------
 multimedia/kodi/pkg-plist |  7 +++++++
 3 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/multimedia/kodi/Makefile b/multimedia/kodi/Makefile
index cb6cfb72ec92..5073d27b5a2d 100644
--- a/multimedia/kodi/Makefile
+++ b/multimedia/kodi/Makefile
@@ -1,11 +1,10 @@
 PORTNAME=	kodi
-DISTVERSION=	22.0a3
+DISTVERSION=	22.0b1
 CATEGORIES=	multimedia java
 MASTER_SITES=	https://mirrors.kodi.tv/build-deps/sources/
 DISTFILES=	apache-groovy-binary-${GROOVY_VERSION}.zip \
 		commons-lang3-${COMMONS_LANG_VERSION}-bin.tar.gz \
-		commons-text-${COMMONS_TEXT_VERSION}-bin.tar.gz \
-		json-${NLOHMANN_JSON_VERSION}.tar.xz
+		commons-text-${COMMONS_TEXT_VERSION}-bin.tar.gz
 DIST_SUBDIR=	${PORTNAME}
 # do not forget to fix devel/kodi-platform when updating kodi
 
@@ -18,6 +17,7 @@ LICENSE=	GPLv2+
 ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386 powerpc64 powerpc64le
 
 BUILD_DEPENDS=	flatbuffers>0:devel/flatbuffers \
+		nlohmann-json>0:devel/nlohmann-json \
 		swig>0:devel/swig
 LIB_DEPENDS=	libaacs.so:multimedia/libaacs \
 		libass.so:multimedia/libass \
@@ -58,11 +58,9 @@ KODI_CODENAME=		Piers
 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
-GROOVY_VERSION=		4.0.26
-COMMONS_LANG_VERSION=	3.17.0
-COMMONS_TEXT_VERSION=	1.13.0
-# TODO: make it a new port
-NLOHMANN_JSON_VERSION=	3.12.0
+GROOVY_VERSION=		4.0.30
+COMMONS_LANG_VERSION=	3.20.0
+COMMONS_TEXT_VERSION=	1.15.0
 
 USE_GITHUB=	yes
 GH_TUPLE=	xbmc:xbmc:${DISTVERSION}-${KODI_CODENAME} \
@@ -71,7 +69,7 @@ GH_TUPLE=	xbmc:xbmc:${DISTVERSION}-${KODI_CODENAME} \
 		xbmc:libdvdread:${LIBDVDREAD_VERSION}:libdvdread/tools/depends/target/libdvdread/native
 
 USE_GNOME=	libxml2
-JAVA_VERSION=	8 11
+JAVA_VERSION=	8 11 17 21
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	kodi
 
@@ -92,9 +90,8 @@ CMAKE_ARGS=	-Dapache-commons-lang_SOURCE_DIR="${WRKSRC}/tools/depends/share/java
 		-Dgroovy_SOURCE_DIR="${WRKSRC}/tools/depends/share/groovy" \
 		-DLIBDVDCSS_URL="${DISTDIR}/${PORTNAME}/xbmc-libdvdcss-${LIBDVDCSS_VERSION}_GH0.tar.gz" \
 		-DLIBDVDNAV_URL="${DISTDIR}/${PORTNAME}/xbmc-libdvdnav-${LIBDVDNAV_VERSION}_GH0.tar.gz" \
-		-DLIBDVDREAD_URL="${DISTDIR}/${PORTNAME}/xbmc-libdvdread-${LIBDVDREAD_VERSION}_GH0.tar.gz" \
-		-DNLOHMANN_JSON_URL="${DISTDIR}/${PORTNAME}/json-${NLOHMANN_JSON_VERSION}.tar.xz"
-CMAKE_ON=	ENABLE_INTERNAL_NLOHMANNJSON VERBOSE_FIND
+		-DLIBDVDREAD_URL="${DISTDIR}/${PORTNAME}/xbmc-libdvdread-${LIBDVDREAD_VERSION}_GH0.tar.gz"
+CMAKE_ON=	VERBOSE_FIND
 CMAKE_OFF=	ENABLE_INTERNAL_CROSSGUID
 CONFIGURE_ENV=	_CPU_FEATURE="${CPU_FEATURE}"
 
diff --git a/multimedia/kodi/distinfo b/multimedia/kodi/distinfo
index 532205eed2ce..75efcc19ef39 100644
--- a/multimedia/kodi/distinfo
+++ b/multimedia/kodi/distinfo
@@ -1,14 +1,12 @@
-TIMESTAMP = 1774026888
-SHA256 (kodi/apache-groovy-binary-4.0.26.zip) = 3be6880c6de70eada2f3f5c69e1e94953e0b0c4e33c4604c1040d05dddeaed92
-SIZE (kodi/apache-groovy-binary-4.0.26.zip) = 30108372
-SHA256 (kodi/commons-lang3-3.17.0-bin.tar.gz) = 08b93712bed7f48725d93c44d70c71e7e661af390f22f0f3e6ba61e3af3cea36
-SIZE (kodi/commons-lang3-3.17.0-bin.tar.gz) = 9772415
-SHA256 (kodi/commons-text-1.13.0-bin.tar.gz) = a690c1e868a373f2d0fa5e7e89f5359b24e544d1b5e310f5a709d95a03a95df5
-SIZE (kodi/commons-text-1.13.0-bin.tar.gz) = 3143054
-SHA256 (kodi/json-3.12.0.tar.xz) = 42f6e95cad6ec532fd372391373363b62a14af6d771056dbfc86160e6dfff7aa
-SIZE (kodi/json-3.12.0.tar.xz) = 114576
-SHA256 (kodi/xbmc-xbmc-22.0a3-22.0a3-Piers_GH0.tar.gz) = 92e3fa6b80581b27defabfa1417c0aae13bfa9e2579e920d52ffe86c06ed7edb
-SIZE (kodi/xbmc-xbmc-22.0a3-22.0a3-Piers_GH0.tar.gz) = 40268308
+TIMESTAMP = 1782907273
+SHA256 (kodi/apache-groovy-binary-4.0.30.zip) = 00ff6f78e8a042def489e6c018f2353895da99936b73c175ea645d536a9acb66
+SIZE (kodi/apache-groovy-binary-4.0.30.zip) = 30344694
+SHA256 (kodi/commons-lang3-3.20.0-bin.tar.gz) = a77875dbc8b7b687e49d914cf00cf7237a548f4163c2a64565b3da999d8b024f
+SIZE (kodi/commons-lang3-3.20.0-bin.tar.gz) = 18832112
+SHA256 (kodi/commons-text-1.15.0-bin.tar.gz) = af36d019def06a31b4d5accf60b13c4de817ec8569af1ffb410eb5ab16b39721
+SIZE (kodi/commons-text-1.15.0-bin.tar.gz) = 3193398
+SHA256 (kodi/xbmc-xbmc-22.0b1-22.0b1-Piers_GH0.tar.gz) = 05cb0d19c1716b1121e7e69d4ac7f9a2d0c7228b2122510a8cb3adc47e609c73
+SIZE (kodi/xbmc-xbmc-22.0b1-22.0b1-Piers_GH0.tar.gz) = 41091823
 SHA256 (kodi/xbmc-libdvdcss-1.4.3-Next-Nexus-Alpha2-2_GH0.tar.gz) = f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e
 SIZE (kodi/xbmc-libdvdcss-1.4.3-Next-Nexus-Alpha2-2_GH0.tar.gz) = 102124
 SHA256 (kodi/xbmc-libdvdnav-6.1.1-Next-Nexus-Alpha2-2_GH0.tar.gz) = 584f62a3896794408d46368e2ecf2c6217ab9c676ce85921b2d68b8961f49dfc
diff --git a/multimedia/kodi/pkg-plist b/multimedia/kodi/pkg-plist
index c5cffebb8d7e..e46d97af7e7f 100644
--- a/multimedia/kodi/pkg-plist
+++ b/multimedia/kodi/pkg-plist
@@ -1722,6 +1722,7 @@ share/icons/hicolor/scalable/apps/kodi.svg
 %%DATADIR%%/addons/skin.estuary/xml/Includes_DialogSelect.xml
 %%DATADIR%%/addons/skin.estuary/xml/Includes_Games.xml
 %%DATADIR%%/addons/skin.estuary/xml/Includes_Home.xml
+%%DATADIR%%/addons/skin.estuary/xml/Includes_InfoViewer.xml
 %%DATADIR%%/addons/skin.estuary/xml/Includes_MediaMenu.xml
 %%DATADIR%%/addons/skin.estuary/xml/Includes_MusicInfo.xml
 %%DATADIR%%/addons/skin.estuary/xml/Includes_PVR.xml
@@ -2186,6 +2187,8 @@ share/icons/hicolor/scalable/apps/kodi.svg
 %%DATADIR%%/system/shaders/GL/1.2/gl_yuv2rgb_vertex.glsl
 %%DATADIR%%/system/shaders/GL/1.5/gl_convolution-4x4.glsl
 %%DATADIR%%/system/shaders/GL/1.5/gl_convolution-6x6.glsl
+%%DATADIR%%/system/shaders/GL/1.5/gl_gui_composite.frag
+%%DATADIR%%/system/shaders/GL/1.5/gl_gui_composite.vert
 %%DATADIR%%/system/shaders/GL/1.5/gl_output.glsl
 %%DATADIR%%/system/shaders/GL/1.5/gl_shader_frag_default.glsl
 %%DATADIR%%/system/shaders/GL/1.5/gl_shader_frag_fonts.glsl
@@ -2207,6 +2210,10 @@ share/icons/hicolor/scalable/apps/kodi.svg
 %%DATADIR%%/system/shaders/GL/4.0/gl_yuv2rgb_filter4.glsl
 %%DATADIR%%/system/shaders/GLES/2.0/gles_convolution-4x4.frag
 %%DATADIR%%/system/shaders/GLES/2.0/gles_convolution-6x6.frag
+%%DATADIR%%/system/shaders/GLES/2.0/gles_dither_body.frag
+%%DATADIR%%/system/shaders/GLES/2.0/gles_dither_uniforms.frag
+%%DATADIR%%/system/shaders/GLES/2.0/gles_gui_composite.frag
+%%DATADIR%%/system/shaders/GLES/2.0/gles_gui_composite.vert
 %%DATADIR%%/system/shaders/GLES/2.0/gles_shader.vert
 %%DATADIR%%/system/shaders/GLES/2.0/gles_shader_clip.vert
 %%DATADIR%%/system/shaders/GLES/2.0/gles_shader_default.frag