disable jxl jni

This commit is contained in:
2026-03-27 14:36:40 -05:00
parent 9338ec4039
commit fc61040607
2 changed files with 3 additions and 4 deletions
Vendored
+2 -2
View File
@@ -41,7 +41,7 @@ pipeline {
axes { axes {
axis { axis {
name 'COMP_OPTS'; name 'COMP_OPTS';
values 'OPT=0 LTO=OFF STATIC=OFF', 'OPT=2 LTO=OFF', 'PGO=ON' values 'OPT=0 LTO=OFF STATIC=OFF', 'OPT=2 LTO=OFF', 'PGO=ON PACKAGE=ON'
} }
} }
stages { stages {
@@ -62,7 +62,7 @@ pipeline {
axis { name 'DISTRO'; values 'ubuntu', 'fedora', 'debian', 'archlinux' } axis { name 'DISTRO'; values 'ubuntu', 'fedora', 'debian', 'archlinux' }
axis { axis {
name 'COMP_OPTS'; name 'COMP_OPTS';
values 'OPT=0 LTO=OFF STATIC=OFF', 'OPT=2 LTO=OFF', 'PGO=ON' values 'OPT=0 LTO=OFF STATIC=OFF', 'OPT=2 LTO=OFF', 'PGO=ON PACKAGE=ON'
} }
} }
stages { stages {
+1 -2
View File
@@ -1079,6 +1079,7 @@ build_libjxl() {
recreate_dir "${INCDIR}/jxl" || return 1 recreate_dir "${INCDIR}/jxl" || return 1
meta_cmake_build \ meta_cmake_build \
-DJPEGXL_ENABLE_JNI=OFF \
-DJPEGXL_FORCE_SYSTEM_BROTLI=ON \ -DJPEGXL_FORCE_SYSTEM_BROTLI=ON \
-DJPEGXL_BUNDLE_LIBPNG=OFF || return 1 -DJPEGXL_BUNDLE_LIBPNG=OFF || return 1
@@ -1089,8 +1090,6 @@ build_libjxl() {
) )
if [[ ${STATIC} == ON ]]; then if [[ ${STATIC} == ON ]]; then
libs+=(libjxl_extras_codec) libs+=(libjxl_extras_codec)
else
is_darwin || libs+=(libjxl_jni)
fi fi
sanitize_sysroot_libs "${libs[@]}" || return 1 sanitize_sysroot_libs "${libs[@]}" || return 1
} }