diff --git a/multimedia/kodi/Makefile b/multimedia/kodi/Makefile
index 4208141bf18d..ee7b763cb4ef 100644
--- a/multimedia/kodi/Makefile
+++ b/multimedia/kodi/Makefile
@@ -1,293 +1,291 @@
 PORTNAME=	kodi
 DISTVERSION=	19.4
-DISTVERSIONSUFFIX=	-${KODI_CODENAME}
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	multimedia java
 
 MAINTAINER=	yzrh@noema.org
 COMMENT=	Award winning media center application
 WWW=		https://kodi.tv/
 
 LICENSE=	GPLv2+
 
 ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386 powerpc64 powerpc64le
 
 BUILD_DEPENDS=	flatbuffers>0:devel/flatbuffers \
 		rapidjson>0:devel/rapidjson \
 		swig>0:devel/swig
 LIB_DEPENDS=	libass.so:multimedia/libass \
 		libavcodec.so:multimedia/ffmpeg \
 		libavfilter.so:multimedia/ffmpeg \
 		libavformat.so:multimedia/ffmpeg \
 		libavutil.so:multimedia/ffmpeg \
 		libcdio.so:sysutils/libcdio \
 		libcrossguid.so:devel/libcrossguid \
 		libcurl.so:ftp/curl \
 		libdav1d.so:multimedia/dav1d \
-		libdvdnav.so:multimedia/libdvdnav \
-		libdvdread.so:multimedia/libdvdread \
 		libexpat.so:textproc/expat2 \
 		libfmt.so:devel/libfmt \
 		libfreetype.so:print/freetype2 \
 		libfribidi.so:converters/fribidi \
 		libfstrcmp.so:devel/fstrcmp \
 		libgif.so:graphics/giflib \
 		liblzo2.so:archivers/lzo2 \
 		libpcre.so:devel/pcre \
 		libpng.so:graphics/png \
 		libpostproc.so:multimedia/ffmpeg \
 		libspdlog.so:devel/spdlog \
 		libswresample.so:multimedia/ffmpeg \
 		libswscale.so:multimedia/ffmpeg \
 		libtag.so:audio/taglib \
 		libtinyxml.so:textproc/tinyxml \
 		libuuid.so:misc/e2fsprogs-libuuid
 
-USES=		cpe cmake compiler:c++14-lang gettext \
-		gnome iconv jpeg pkgconfig python:3.5+ sqlite ssl
+USES=		autoreconf:build cpe cmake:noninja compiler:c++17-lang gettext \
+		gmake gnome iconv jpeg libtool pkgconfig python:3.7+ sqlite ssl
 
 KODI_CODENAME=	Matrix
+LIBDVDCSS_VERSION=	1.4.2-Leia-Beta-5
+LIBDVDNAV_VERSION=	6.0.0-Leia-Alpha-3
+LIBDVDREAD_VERSION=	6.0.0-Leia-Alpha-3
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	xbmc
-GH_PROJECT=	xbmc
+GH_TUPLE=	xbmc:xbmc:${DISTVERSION}-${KODI_CODENAME} \
+		xbmc:libdvdcss:${LIBDVDCSS_VERSION}:libdvdcss/tools/depends/target/libdvdcss/native \
+		xbmc:libdvdnav:${LIBDVDNAV_VERSION}:libdvdnav/tools/depends/target/libdvdnav/native \
+		xbmc:libdvdread:${LIBDVDREAD_VERSION}:libdvdread/tools/depends/target/libdvdread/native
 
 KODI_ARCH_aarch64=	aarch64
 KODI_ARCH_amd64=	x86_64
 KODI_ARCH_i386=		x86
 KODI_ARCH_armv7=	armv7
 KODI_ARCH_armv6=	armv6
 KODI_ARCH_powerpc64=	powerpc64
 KODI_ARCH_powerpc64le=	powerpc64le
 
 PLIST_SUB=	ARCH=${KODI_ARCH_${ARCH}}
 
 USE_LDCONFIG=	yes
 USE_JAVA=	yes
 JAVA_BUILD=	jre
 USE_GNOME=	libxml2
-CMAKE_ARGS=	-DGIT_VERSION="${GH_TAGNAME}" \
-		-DDVDNAV_LIBRARY="${LOCALBASE}/lib/libdvdnav.so" \
-		-DDVDREAD_LIBRARY="${LOCALBASE}/lib/libdvdread.so" \
-		-DLIBDVD_INCLUDE_DIRS="${LOCALBASE}/include"
+CMAKE_ARGS=	-DGIT_VERSION="${DISTVERSION}-${KODI_CODENAME}" \
+		-DLIBDVDCSS_URL="${DISTDIR}/xbmc-libdvdcss-${LIBDVDCSS_VERSION}_GH0.tar.gz" \
+		-DLIBDVDNAV_URL="${DISTDIR}/xbmc-libdvdnav-${LIBDVDNAV_VERSION}_GH0.tar.gz" \
+		-DLIBDVDREAD_URL="${DISTDIR}/xbmc-libdvdread-${LIBDVDREAD_VERSION}_GH0.tar.gz"
 CMAKE_OFF=	ENABLE_INTERNAL_CROSSGUID
 CONFIGURE_ENV=	_CPU_FEATURE="${CPU_FEATURE}"
 
 OPTIONS_SUB=		yes
 # Broken: BLUETOOTH
 OPTIONS_DEFINE=		AIRPLAY AVAHI LIBBLURAY CEC DBUS DVDCSS LCMS2 \
 			LIRC WEBSERVER NFS DVD SMB TEST UDEV UPNP \
 			VAAPI VDPAU XSLT DOCS
 OPTIONS_DEFAULT=	LIBBLURAY CEC LCMS2 WEBSERVER \
 			DVD UPNP VAAPI VDPAU XSLT WAYLAND X11 GL
 OPTIONS_DEFAULT_amd64=	SSE SSE2 SSE3 SSSE3 SSE4_1 SSE4_2
 OPTIONS_DEFAULT_i386=	SSE SSE2 SSE3
 OPTIONS_SINGLE=		RENDER
 OPTIONS_SINGLE_RENDER=	GL GLES
 OPTIONS_RADIO=		DATABASE
 OPTIONS_RADIO_DATABASE=	MARIADB MYSQL
 OPTIONS_GROUP=		SOUND FEATURE PLATFORM
 # Broken: ALSA
 OPTIONS_GROUP_SOUND=	PULSEAUDIO SNDIO
 OPTIONS_GROUP_FEATURE=	SSE SSE2 SSE3 SSSE3 SSE4_1 SSE4_2 AVX AVX2
 OPTIONS_GROUP_PLATFORM=GBM WAYLAND X11
 OPTIONS_EXCLUDE_aarch64=FEATURE
 OPTIONS_EXCLUDE_armv7=	FEATURE
 OPTIONS_EXCLUDE_armv6=	FEATURE
 
 PLATFORM_DESC=	Kodi platform
 DATABASE_DESC=	Database
 FEATURE_DESC=	X86 CPU feature
 
 AIRPLAY_DESC=	AirPlay support
 BLUETOOTH_DESC=	Bluetooth support
 CEC_DESC=	CEC adapter support
 DVD_DESC=	DVD support
 UDEV_DESC=	Use libudev-devd
 XSLT_DESC=	Use libxslt
 
 RENDER_DESC=	Render system
 GL_DESC=	OpenGL
 GLES_DESC=	OpenGL ES
 
 GBM_DESC=	GBM support
 MARIADB_DESC=	MariaDB database support
 
 SSE2_DESC=	Use SSE2 optimized routines
 SSE3_DESC=	Use SSE3 optimized routines
 SSSE3_DESC=	Use SSSE3 optimized routines
 SSE4_1_DESC=	Use SSE4.1 optimized routines
 SSE4_2_DESC=	Use SSE4.2 optimized routines
 AVX_DESC=	Use AVX optimized routines
 AVX2_DESC=	Use AVX2 optimized routines
 
 AIRPLAY_LIB_DEPENDS=	libplist-2.0.so:devel/libplist \
 			libshairplay.so:audio/shairplay
 AIRPLAY_CMAKE_BOOL=	ENABLE_PLIST \
 			ENABLE_AIRTUNES
 
 AVAHI_LIB_DEPENDS=	libavahi-client.so:net/avahi-app
 AVAHI_CMAKE_BOOL=	ENABLE_AVAHI
 
 BLUETOOTH_CMAKE_BOOL=	ENABLE_BLUETOOTH
 BLUETOOTH_CMAKE_ON=	-DBLUETOOTH_INCLUDE_DIR="${LOCALBASE}/include"
 
 LIBBLURAY_LIB_DEPENDS=	libbluray.so:multimedia/libbluray
 LIBBLURAY_CMAKE_BOOL=	ENABLE_BLURAY
 
 CEC_LIB_DEPENDS=	libcec.so:multimedia/libcec
 CEC_CMAKE_BOOL=		ENABLE_CEC
 
 DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DBUS_CMAKE_BOOL=	ENABLE_DBUS
 
-DVDCSS_LIB_DEPENDS=	libdvdcss.so:multimedia/libdvdcss
 DVDCSS_CMAKE_BOOL=	ENABLE_DVDCSS
-DVDCSS_CMAKE_ON=	-DDVDCSS_LIBRARY="${LOCALBASE}/lib/libdvdcss.so"
 
 LCMS2_LIB_DEPENDS=	liblcms2.so.2:graphics/lcms2
 LCMS2_CMAKE_BOOL=	ENABLE_LCMS2
 
 LIRC_LIB_DEPENDS=	liblirc_client.so:comms/lirc
 LIRC_CMAKE_BOOL=	ENABLE_LIRCCLIENT
 
 WEBSERVER_LIB_DEPENDS=	libmicrohttpd.so:www/libmicrohttpd
 WEBSERVER_CMAKE_BOOL=	ENABLE_MICROHTTPD
 
 NFS_LIB_DEPENDS=	libnfs.so:net/libnfs
 NFS_CMAKE_BOOL=		ENABLE_NFS
 
 DVD_CMAKE_BOOL=		ENABLE_OPTICAL
 
 SMB_USES=		samba:lib
 SMB_CMAKE_BOOL=		ENABLE_SMBCLIENT
 
 TEST_LIB_DEPENDS=	libgtest.so:devel/googletest
 TEST_CMAKE_BOOL=	ENABLE_TESTING
 
 UDEV_LIB_DEPENDS=	libudev.so:devel/libudev-devd
 UDEV_CMAKE_BOOL=	ENABLE_UDEV
 
 UPNP_CMAKE_BOOL=	ENABLE_UPNP
 
 VAAPI_LIB_DEPENDS=	libva.so:multimedia/libva
 VAAPI_CMAKE_BOOL=	ENABLE_VAAPI
 
 VDPAU_LIB_DEPENDS=	libvdpau.so:multimedia/libvdpau
 VDPAU_CMAKE_BOOL=	ENABLE_VDPAU
 
 XSLT_LIB_DEPENDS=	libxslt.so:textproc/libxslt
 XSLT_CMAKE_BOOL=	ENABLE_XSLT
 
 GL_CMAKE_ON=		-DAPP_RENDER_SYSTEM:STRING="gl"
 
 GLES_CMAKE_ON=		-DAPP_RENDER_SYSTEM:STRING="gles"
 
 MARIADB_USES=		mysql:105m
 MARIADB_CMAKE_BOOL=	ENABLE_MARIADBCLIENT
 MARIADB_CMAKE_ON=	-DMARIADBCLIENT_INCLUDE_DIR="${LOCALBASE}/include"
 
 MYSQL_USES=		mysql
 MYSQL_CMAKE_BOOL=	ENABLE_MYSQLCLIENT
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CMAKE_BOOL=	ENABLE_ALSA
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_BOOL=	ENABLE_PULSEAUDIO
 
 SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
 SNDIO_CMAKE_BOOL=	ENABLE_SNDIO
 
 SSE_VARS=		CPU_FEATURE+=SSE
 SSE2_VARS=		CPU_FEATURE+=SSE2
 SSE3_VARS=		CPU_FEATURE+=SSE3
 SSSE3_VARS=		CPU_FEATURE+=SSSE3
 SSE4_1_VARS=		CPU_FEATURE+=SSE4.1
 SSE4_2_VARS=		CPU_FEATURE+=SSE4.2
 AVX_VARS=		CPU_FEATURE+=AVX
 AVX2_VARS=		CPU_FEATURE+=AVX2
 
 GBM_IMPLIES=		UDEV
 GBM_USES=		gl
 GBM_USE=		GL=egl,gbm,glu
 GBM_CFLAGS=		-I${LOCALBASE}/include/libepoll-shim
 GBM_LDFLAGS=		-L${LOCALBASE}/lib -lepoll-shim
 GBM_BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto
 GBM_LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim \
 			libdrm.so:graphics/libdrm \
 			libxkbcommon.so:x11/libxkbcommon \
 			libinput.so:x11/libinput
 
 WAYLAND_USES=		gl
 WAYLAND_USE=		GL=egl,glu
 WAYLAND_BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 			wayland-protocols>0:graphics/wayland-protocols
 WAYLAND_LIB_DEPENDS=	libdrm.so:graphics/libdrm \
 			libxkbcommon.so:x11/libxkbcommon \
 			libinput.so:x11/libinput \
 			libwayland-client++.so:graphics/waylandpp
 
 X11_USES=		xorg gl
 X11_USE=		XORG=x11,xext,xrandr GL=egl,gbm,gl,glu
 X11_LIB_DEPENDS=	libdrm.so:graphics/libdrm
 
 .include <bsd.port.options.mk>
 
 .if !empty(PORT_OPTIONS:MGBM) && !empty(PORT_OPTIONS:MWAYLAND) && !empty(PORT_OPTIONS:MX11)
 CMAKE_ARGS+=	-DCORE_PLATFORM_NAME:STRING="gbm wayland x11"
 .elif empty(PORT_OPTIONS:MGBM) && !empty(PORT_OPTIONS:MWAYLAND) && !empty(PORT_OPTIONS:MX11)
 CMAKE_ARGS+=	-DCORE_PLATFORM_NAME:STRING="wayland x11"
 .elif !empty(PORT_OPTIONS:MGBM) && empty(PORT_OPTIONS:MWAYLAND) && !empty(PORT_OPTIONS:MX11)
 CMAKE_ARGS+=	-DCORE_PLATFORM_NAME:STRING="gbm x11"
 .elif !empty(PORT_OPTIONS:MGBM) && !empty(PORT_OPTIONS:MWAYLAND) && empty(PORT_OPTIONS:MX11)
 CMAKE_ARGS+=	-DCORE_PLATFORM_NAME:STRING="gbm wayland"
 .elif empty(PORT_OPTIONS:MGBM) && empty(PORT_OPTIONS:MWAYLAND) && !empty(PORT_OPTIONS:MX11)
 CMAKE_ARGS+=	-DCORE_PLATFORM_NAME:STRING="x11"
 .elif empty(PORT_OPTIONS:MGBM) && !empty(PORT_OPTIONS:MWAYLAND) && empty(PORT_OPTIONS:MX11)
 CMAKE_ARGS+=	-DCORE_PLATFORM_NAME:STRING="wayland"
 .elif !empty(PORT_OPTIONS:MGBM) && empty(PORT_OPTIONS:MWAYLAND) && empty(PORT_OPTIONS:MX11)
 CMAKE_ARGS+=	-DCORE_PLATFORM_NAME:STRING="gbm"
 .endif
 
 .if !empty(PORT_OPTIONS:MGBM) && !empty(PORT_OPTIONS:MWAYLAND) || !empty(PORT_OPTIONS:MGBM) && !empty(PORT_OPTIONS:MX11) || !empty(PORT_OPTIONS:MWAYLAND) && !empty(PORT_OPTIONS:MX11)
 PLIST_SUB+=	KODICOMBINED="" \
 		KODIGBM="@comment " \
 		KODIWAYLAND="@comment " \
 		KODIX11="@comment "
 .else
 PLIST_SUB+=	KODICOMBINED="@comment "
 
 .if !empty(PORT_OPTIONS:MGBM)
 PLIST_SUB+=	KODIGBM=""
 .else
 PLIST_SUB+=	KODIGBM="@comment "
 .endif
 
 .if !empty(PORT_OPTIONS:MWAYLAND)
 PLIST_SUB+=	KODIWAYLAND=""
 .else
 PLIST_SUB+=	KODIWAYLAND="@comment "
 .endif
 
 .if !empty(PORT_OPTIONS:MX11)
 PLIST_SUB+=	KODIX11=""
 .else
 PLIST_SUB+=	KODIX11="@comment "
 .endif
 .endif
 
 post-patch:
-	${REINPLACE_CMD} 's|KODI_DEPENDSBUILD|true|' \
-		${WRKSRC}/cmake/modules/FindLibDvd.cmake
 	${REINPLACE_CMD} 's|/usr/share|${LOCALBASE}/share|' \
 		${WRKSRC}/xbmc/platform/linux/input/LibInputSettings.cpp
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/docs/manpages/kodi.bin.1 ${STAGEDIR}${MAN1PREFIX}/share/man/man1
 	cd ${STAGEDIR}${MAN1PREFIX}/share/man/man1 && ${LN} -s kodi.bin.1.gz kodi.1.gz
 	cd ${STAGEDIR}${PREFIX}/bin && ${STRIP_CMD} TexturePacker JsonSchemaBuilder
 	${FIND} ${STAGEDIR}${PREFIX}/lib/kodi -type f -name '*.so' -print0 | ${XARGS} -0 ${STRIP_CMD}
 	${RM} -rf ${STAGEDIR}${PREFIX}/lib/firewalld
 
 .include <bsd.port.mk>
diff --git a/multimedia/kodi/distinfo b/multimedia/kodi/distinfo
index 6ad4c3f21f06..337c0bf2b2af 100644
--- a/multimedia/kodi/distinfo
+++ b/multimedia/kodi/distinfo
@@ -1,3 +1,9 @@
-TIMESTAMP = 1646484818
-SHA256 (xbmc-xbmc-19.4-Matrix_GH0.tar.gz) = cc026f59fd6e37ae90f3449df50810f1cefa37da9444e1188302d910518710da
-SIZE (xbmc-xbmc-19.4-Matrix_GH0.tar.gz) = 53487622
+TIMESTAMP = 1660871836
+SHA256 (xbmc-xbmc-19.4-19.4-Matrix_GH0.tar.gz) = cc026f59fd6e37ae90f3449df50810f1cefa37da9444e1188302d910518710da
+SIZE (xbmc-xbmc-19.4-19.4-Matrix_GH0.tar.gz) = 53487622
+SHA256 (xbmc-libdvdcss-1.4.2-Leia-Beta-5_GH0.tar.gz) = 38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d
+SIZE (xbmc-libdvdcss-1.4.2-Leia-Beta-5_GH0.tar.gz) = 101068
+SHA256 (xbmc-libdvdnav-6.0.0-Leia-Alpha-3_GH0.tar.gz) = 071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a
+SIZE (xbmc-libdvdnav-6.0.0-Leia-Alpha-3_GH0.tar.gz) = 137942
+SHA256 (xbmc-libdvdread-6.0.0-Leia-Alpha-3_GH0.tar.gz) = a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf
+SIZE (xbmc-libdvdread-6.0.0-Leia-Alpha-3_GH0.tar.gz) = 130649
diff --git a/multimedia/kodi/files/patch-xbmc_windowing_X11_GLContextEGL.h b/multimedia/kodi/files/patch-xbmc_windowing_X11_GLContextEGL.h
new file mode 100644
index 000000000000..ee0df4979024
--- /dev/null
+++ b/multimedia/kodi/files/patch-xbmc_windowing_X11_GLContextEGL.h
@@ -0,0 +1,11 @@
+--- xbmc/windowing/X11/GLContextEGL.h.orig	2022-03-02 18:38:51 UTC
++++ xbmc/windowing/X11/GLContextEGL.h
+@@ -13,7 +13,7 @@
+ #include "threads/CriticalSection.h"
+ 
+ #include <EGL/eglext.h>
+-#include <EGL/eglextchromium.h>
++#include <EGL/eglext_angle.h>
+ #include <X11/Xutil.h>
+ 
+ class CGLContextEGL : public CGLContext