@@ -34,6 +34,27 @@ config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_RBPI
depends on BR2_PACKAGE_RPI_USERLAND
select BR2_PACKAGE_KODI_PLATFORM_SUPPORTS
+config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_WAYLAND_GL
+ bool
+ default y
+ depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND # waylandpp
+ depends on BR2_HOST_GCC_AT_LEAST_4_9 # waylandpp
+ depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # waylandpp
+ depends on BR2_PACKAGE_WAYLAND # waylandpp
+ select BR2_PACKAGE_WAYLANDPP
+ select BR2_PACKAGE_KODI_PLATFORM_SUPPORTS
+
+config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_WAYLAND_GLES
+ bool
+ default y
+ depends on BR2_PACKAGE_HAS_LIBGLES
+ depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND # waylandpp
+ depends on BR2_HOST_GCC_AT_LEAST_4_9 # waylandpp
+ depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # waylandpp
+ depends on BR2_PACKAGE_WAYLAND # waylandpp
+ select BR2_PACKAGE_WAYLANDPP
+ select BR2_PACKAGE_KODI_PLATFORM_SUPPORTS
+
config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_X11_OPENGL
bool
default y
@@ -207,6 +228,17 @@ config BR2_PACKAGE_KODI_PLATFORM_RBPI
bool "Raspberry Pi"
depends on BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_RBPI
+config BR2_PACKAGE_KODI_PLATFORM_WAYLAND_GL
+ bool "Wayland/OpenGL"
+ depends on BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_WAYLAND_GL
+ select BR2_PACKAGE_LIBGLU
+ select BR2_PACKAGE_LIBXKBCOMMON
+
+config BR2_PACKAGE_KODI_PLATFORM_WAYLAND_GLES
+ bool "Wayland/GLES"
+ depends on BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_WAYLAND_GLES
+ select BR2_PACKAGE_LIBXKBCOMMON
+
config BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL
bool "X11/OpenGL"
depends on BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_X11_OPENGL
@@ -260,13 +292,19 @@ config BR2_PACKAGE_KODI_LIBUSB
config BR2_PACKAGE_KODI_LIBVA
bool "va"
- depends on BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL
+ depends on \
+ BR2_PACKAGE_KODI_PLATFORM_WAYLAND_GL || \
+ BR2_PACKAGE_KODI_PLATFORM_WAYLAND_GLES || \
+ BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL
select BR2_PACKAGE_LIBVA
help
Enable libva support.
-comment "libva support needs platform 'X11/OpenGL'"
- depends on !BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL
+comment "libva support needs platform 'Wayland' or 'X11/OpenGL'"
+ depends on \
+ !BR2_PACKAGE_KODI_PLATFORM_WAYLAND_GL && \
+ !BR2_PACKAGE_KODI_PLATFORM_WAYLAND_GLES && \
+ !BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL
config BR2_PACKAGE_KODI_LIBVDPAU
bool "vdpau"
@@ -185,6 +185,22 @@ KODI_CONF_OPTS += -DCORE_PLATFORM_NAME=rbpi
KODI_DEPENDENCIES += rpi-userland
endif
+ifeq ($(BR2_PACKAGE_KODI_PLATFORM_WAYLAND_GL),y)
+KODI_CONF_OPTS += \
+ -DCORE_PLATFORM_NAME=wayland \
+ -DWAYLAND_RENDER_SYSTEM=gl
+KODI_DEPENDENCIES += libegl libgl libglu libxkbcommon waylandpp
+endif
+
+ifeq ($(BR2_PACKAGE_KODI_PLATFORM_WAYLAND_GLES),y)
+KODI_CONF_OPTS += \
+ -DCORE_PLATFORM_NAME=wayland \
+ -DWAYLAND_RENDER_SYSTEM=gles
+KODI_C_FLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags egl`
+KODI_CXX_FLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags egl`
+KODI_DEPENDENCIES += libegl libgles libxkbcommon waylandpp
+endif
+
ifeq ($(BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL),y)
KODI_CONF_OPTS += -DCORE_PLATFORM_NAME=x11
KODI_DEPENDENCIES += libegl libglu libgl xlib_libX11 xlib_libXext \
For details see upstream PR 12664. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> --- package/kodi/Config.in | 44 +++++++++++++++++++++++++++++++++++++++--- package/kodi/kodi.mk | 16 +++++++++++++++ 2 files changed, 57 insertions(+), 3 deletions(-)