package/kodi: depend on host-openjdk-bin instead of selecting BR2_NEEDS_HOST_JAVA

This patch removes the dependency on java being installed on the host,
instead we make use of our host-openjdk-bin package.

Build-tested using this defconfig

BR2_x86_64=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
BR2_PACKAGE_KODI=y
BR2_PACKAGE_MESA3D=y
BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SOFTPIPE=y
BR2_PACKAGE_MESA3D_OPENGL_EGL=y
BR2_PACKAGE_MESA3D_OPENGL_ES=y
BR2_PACKAGE_PYTHON3=y
BR2_PACKAGE_PYTHON3_PY_ONLY=y

by running 'utils/docker-run make kodi'.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Arnout Vandecappelle <arnout@rnout.be>
This commit is contained in:
Bernd Kuhls
2026-04-09 20:40:47 +02:00
committed by Arnout Vandecappelle
parent 8d6c49f8d8
commit b6a2f49429
2 changed files with 3 additions and 1 deletions

View File

@@ -1,6 +1,7 @@
config BR2_PACKAGE_KODI_ARCH_SUPPORTS
bool
default y if BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
default y if BR2_PACKAGE_HOST_OPENJDK_BIN_ARCH_SUPPORTS
# i386: needs sse (see upstream PR 10351)
depends on !(BR2_i386 && !BR2_X86_CPU_HAS_SSE)
depends on BR2_USE_MMU # libcdio, and others
@@ -66,7 +67,6 @@ menuconfig BR2_PACKAGE_KODI
depends on BR2_PACKAGE_KODI_PLATFORM_SUPPORTS
depends on BR2_PACKAGE_PYTHON3
depends on !BR2_PACKAGE_PYTHON3_PYC_ONLY
select BR2_NEEDS_HOST_JAVA
select BR2_HOST_CMAKE_AT_LEAST_3_24
select BR2_PACKAGE_FFMPEG
select BR2_PACKAGE_FFMPEG_GPL

View File

@@ -33,6 +33,7 @@ KODI_DEPENDENCIES = \
host-kodi-jsonschemabuilder \
host-kodi-texturepacker \
host-nasm \
host-openjdk-bin \
host-swig \
host-xmlstarlet \
jpeg \
@@ -100,6 +101,7 @@ KODI_CONF_OPTS += \
-DDEPENDS_PATH=$(STAGING_DIR)/usr \
-DENABLE_TESTING=OFF \
-DENABLE_DEBUGFISSION=OFF \
-DJAVA_HOME=$(HOST_OPENJDK_BIN_ROOT_DIR) \
-DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python \
-DPYTHON_INCLUDE_DIRS=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \
-DPYTHON_PATH=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR) \