Skip to content

Commit

Permalink
internal cms library in jxl are busted, build manually
Browse files Browse the repository at this point in the history
  • Loading branch information
BtbN committed Dec 19, 2023
1 parent 7fac68e commit d635cef
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 1 deletion.
36 changes: 36 additions & 0 deletions scripts.d/50-libjxl/45-lcms2.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
#!/bin/bash

SCRIPT_REPO="https://github.com/mm2/Little-CMS.git"
SCRIPT_COMMIT="f1060e7989a68f62dd3876aa7d755d974ffd9a3a"

ffbuild_enabled() {
return 0
}

ffbuild_dockerbuild() {
cd "$FFBUILD_DLDIR/$SELF"

mkdir build && cd build

local myconf=(
--prefix="$FFBUILD_PREFIX"
-Ddefault_library=static
-Dutils=false
-Dsamples=false
-Dfastfloat=true
-Dthreaded=true
)

if [[ $TARGET == win* || $TARGET == linux* ]]; then
myconf+=(
--cross-file=/cross.meson
)
else
echo "Unknown target"
return -1
fi

meson "${myconf[@]}" ..
ninja -j$(nproc)
ninja install
}
5 changes: 4 additions & 1 deletion scripts.d/50-libjxl/50-libjxl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ ffbuild_enabled() {

ffbuild_dockerdl() {
default_dl "$SELF"
to_df "RUN git -C \"$SELF\" submodule update --init --recursive --depth 1 --recommend-shallow third_party/highway third_party/skcms"
to_df "RUN git -C \"$SELF\" submodule update --init --recursive --depth 1 --recommend-shallow third_party/highway"
}

ffbuild_dockerbuild() {
Expand All @@ -31,6 +31,7 @@ ffbuild_dockerbuild() {
fi

cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
-DJPEGXL_ENABLE_SKCMS=OFF -DJPEGXL_FORCE_SYSTEM_LCMS2=ON \
-DBUILD_SHARED_LIBS=OFF -DJPEGXL_STATIC=OFF -DBUILD_SHARED_LIBS=OFF -DJPEGXL_ENABLE_TOOLS=OFF -DJPEGXL_ENABLE_VIEWERS=OFF -DJPEGXL_EMSCRIPTEN=OFF -DJPEGXL_ENABLE_DOXYGEN=OFF \
-DJPEGXL_ENABLE_JPEGLI=OFF -DBUILD_TESTING=OFF -DJPEGXL_ENABLE_EXAMPLES=OFF -DJPEGXL_ENABLE_MANPAGES=OFF -DJPEGXL_ENABLE_JNI=OFF -DJPEGXL_ENABLE_PLUGINS=OFF \
-DJPEGXL_ENABLE_DEVTOOLS=OFF -DJPEGXL_ENABLE_BENCHMARK=OFF -DJPEGXL_BUNDLE_LIBPNG=OFF -DJPEGXL_ENABLE_SJPEG=OFF -DJPEGXL_FORCE_SYSTEM_BROTLI=ON ..
Expand All @@ -47,6 +48,8 @@ ffbuild_dockerbuild() {
echo "Libs.private: -ladvapi32" >> "${FFBUILD_PREFIX}"/lib/pkgconfig/libjxl.pc
echo "Libs.private: -ladvapi32" >> "${FFBUILD_PREFIX}"/lib/pkgconfig/libjxl_threads.pc
fi

echo "Requires.private: lcms2" >> "${FFBUILD_PREFIX}"/lib/pkgconfig/libjxl_cms.pc
}

ffbuild_configure() {
Expand Down

0 comments on commit d635cef

Please sign in to comment.