From b70391ca40b0b8d167ac6f0ca94139743a5cb558 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Wed, 27 Aug 2025 21:57:33 +0000 Subject: [PATCH] jre-libbluray: use meson config --- .../addon-depends/jre-depends/jre-libbluray/package.mk | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/addons/addon-depends/jre-depends/jre-libbluray/package.mk b/packages/addons/addon-depends/jre-depends/jre-libbluray/package.mk index 6f50638b0b..88be735d65 100644 --- a/packages/addons/addon-depends/jre-depends/jre-libbluray/package.mk +++ b/packages/addons/addon-depends/jre-depends/jre-libbluray/package.mk @@ -13,16 +13,14 @@ PKG_BUILD_FLAGS="-sysroot" unpack() { mkdir -p ${PKG_BUILD} - tar --strip-components=1 -xf ${SOURCES}/${PKG_NAME:4}/${PKG_NAME:4}-${PKG_VERSION}.tar.bz2 -C ${PKG_BUILD} + tar --strip-components=1 -xf ${SOURCES}/${PKG_NAME:4}/${PKG_NAME:4}-${PKG_VERSION}.tar.xz -C ${PKG_BUILD} } pre_configure_target() { export JAVA_HOME="$(get_build_dir jdk-${MACHINE_HARDWARE_NAME}-zulu)" + export PATH+=":$(get_build_dir jdk-${MACHINE_HARDWARE_NAME}-zulu)/bin" + PKG_MESON_OPTS_TARGET+=" -Djdk_home=$(get_build_dir jdk-${MACHINE_HARDWARE_NAME}-zulu)" # build also jar - PKG_CONFIGURE_OPTS_TARGET="${PKG_CONFIGURE_OPTS_TARGET/disable-bdjava-jar/enable-bdjava-jar}" -} - -make_target() { - make all-local + PKG_MESON_OPTS_TARGET="${PKG_MESON_OPTS_TARGET/bdj_jar=disabled/bdj_jar=enabled}" }