diff -urN kodi.orig/Makefile kodi/Makefile
--- kodi.orig/Makefile	2020-05-20 07:01:57.000000000 +0000
+++ kodi/Makefile	2020-06-01 19:41:12.896546000 +0000
@@ -36,11 +36,12 @@
 		libswresample.so:multimedia/ffmpeg \
 		libswscale.so:multimedia/ffmpeg \
 		libtag.so:audio/taglib \
-		libtinyxml.so:textproc/tinyxml
+		libtinyxml.so:textproc/tinyxml \
+		libuuid.so:misc/e2fsprogs-libuuid
 RUN_DEPENDS=	${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu
 
-USES=		autoreconf:build cmake:noninja compiler:c++14-lang gettext gmake \
-		gnome iconv jpeg libtool pkgconfig python:2.7 ssl sqlite
+USES=		autoreconf:build cmake:noninja compiler:c++14-lang gettext gl gmake \
+		gnome iconv jpeg libtool pkgconfig python:2.7 ssl sqlite xorg
 
 KODI_ARCH_amd64=x86_64
 KODI_ARCH_i386=	x86
@@ -59,6 +60,7 @@
 		-Dlibdvdread_URL="${DISTDIR}/xbmc-libdvdread-6.0.0-Leia-Alpha-3_GH0.tar.gz"
 CMAKE_OFF=	ENABLE_INTERNAL_CROSSGUID \
 		ENABLE_INTERNAL_FFMPEG
+CONFIGURE_ENV=	_CPU_FEATURE="${CPU_FEATURE}"
 
 KODI_CODENAME=		Leia
 LIBDVDCSS_VERSION=	1.4.2-${KODI_CODENAME}-Beta-5
@@ -89,7 +91,7 @@
 OPTIONS_GROUP=		SOUND FEATURE
 # Broken: ALSA
 OPTIONS_GROUP_SOUND=	PULSEAUDIO SNDIO
-OPTIONS_GROUP_FEATURE=	SSE SSE2 SSE3 SSSE3 SSE4.1 SSE4.2 AVX AVX2
+OPTIONS_GROUP_FEATURE=	SSE SSE2 SSE3 SSSE3 SSE4_1 SSE4_2 AVX AVX2
 OPTIONS_EXCLUDE_amd64=	RPI
 OPTIONS_EXCLUDE_i386=	RPI
 OPTIONS_EXCLUDE_armv7=	FEATURE
@@ -112,8 +114,8 @@
 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
+SSE4_1_DESC=	Use SSE4.1 optimized routines
+SSE4_2_DESC=	Use SSE4.2 optimized routines
 UDEV_DESC=	Use libudev-devd
 XSLT_DESC=	Use libxslt
 
@@ -188,18 +190,18 @@
 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
+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_USE=		GL=egl,gbm,glu
 GBM_CFLAGS=		-I${LOCALBASE}/include/libepoll-shim
-GBM_LDFLAGS=		-lepoll-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 \
@@ -223,7 +225,7 @@
 WAYLAND_CMAKE_ON=	-DCORE_PLATFORM_NAME:STRING="wayland" \
 			-DWAYLAND_RENDER_SYSTEM:STRING="gl"
 
-X11_USE=		XORG=x11,xext,xrandr GL=egl,gl
+X11_USE=		XORG=x11,xext,xrandr GL=egl,gl,glu
 X11_LIB_DEPENDS=	libdrm.so:graphics/libdrm
 X11_CMAKE_ON=		-DCORE_PLATFORM_NAME:STRING="x11"
 
diff -urN kodi.orig/pkg-plist kodi/pkg-plist
--- kodi.orig/pkg-plist	2020-05-19 15:44:45.000000000 +0000
+++ kodi/pkg-plist	2020-06-01 19:37:48.123378000 +0000
@@ -65,8 +65,12 @@
 include/kodi/xbmc_epg_types.h
 include/kodi/xbmc_pvr_dll.h
 include/kodi/xbmc_pvr_types.h
-lib/kodi/kodi-x11
-lib/kodi/kodi-xrandr
+%%GBM%%lib/kodi/kodi-gbm
+%%RPI%%lib/kodi/kodi-rbpi
+%%WAYLAND%%lib/kodi/kodi-wayland
+%%X11%%lib/kodi/kodi-x11
+%%X11%%lib/kodi/kodi-xrandr
+%%SSE4_1%%lib/kodi/system/libsse4-%%ARCH%%-freebsd.so
 lib/kodi/system/players/VideoPlayer/libdvdnav-%%ARCH%%-freebsd.so
 man/man1/kodi.1.gz
 man/man1/kodi.bin.1.gz