From 28ab11ae3998c5a783a3cd4d8ce42d4e4e032cbb Mon Sep 17 00:00:00 2001 From: Samuel Audet Date: Sun, 18 Aug 2024 08:14:22 +0900 Subject: [PATCH] Fix builds for ARPACK-NG and Leptonica --- arpack-ng/platform/pom.xml | 2 +- leptonica/cppbuild.sh | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/arpack-ng/platform/pom.xml b/arpack-ng/platform/pom.xml index c996cdcf9db..bbf26239ac0 100644 --- a/arpack-ng/platform/pom.xml +++ b/arpack-ng/platform/pom.xml @@ -60,7 +60,7 @@ - + ${project.groupId} ${javacpp.moduleId} diff --git a/leptonica/cppbuild.sh b/leptonica/cppbuild.sh index 258339f64f4..c888de249c6 100755 --- a/leptonica/cppbuild.sh +++ b/leptonica/cppbuild.sh @@ -108,7 +108,7 @@ case $PLATFORM in make -j $MAKEJ make install cd ../$LIBTIFF - $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . + $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Dlibdeflate=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . make -j $MAKEJ make install cd ../openjpeg-$OPENJPEG_VERSION @@ -153,7 +153,7 @@ case $PLATFORM in make -j $MAKEJ make install cd ../$LIBTIFF - $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . + $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Dlibdeflate=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . make -j $MAKEJ make install cd ../openjpeg-$OPENJPEG_VERSION @@ -197,7 +197,7 @@ case $PLATFORM in make -j $MAKEJ make install cd ../$LIBTIFF - $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . + $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Dlibdeflate=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . make -j $MAKEJ make install cd ../openjpeg-$OPENJPEG_VERSION @@ -241,7 +241,7 @@ case $PLATFORM in make -j $MAKEJ make install cd ../$LIBTIFF - $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . + $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Dlibdeflate=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . make -j $MAKEJ make install cd ../openjpeg-$OPENJPEG_VERSION @@ -282,7 +282,7 @@ case $PLATFORM in make -j $MAKEJ make install cd ../$LIBTIFF - $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . + $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Dlibdeflate=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . make -j $MAKEJ make install cd ../openjpeg-$OPENJPEG_VERSION @@ -323,7 +323,7 @@ case $PLATFORM in make -j $MAKEJ make install cd ../$LIBTIFF - $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . + $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Dlibdeflate=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . make -j $MAKEJ make install cd ../openjpeg-$OPENJPEG_VERSION @@ -368,7 +368,7 @@ case $PLATFORM in make -j $MAKEJ make install cd ../$LIBTIFF - $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . + $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Dlibdeflate=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . make -j $MAKEJ make install cd ../openjpeg-$OPENJPEG_VERSION @@ -410,7 +410,7 @@ case $PLATFORM in make -j $MAKEJ make install cd ../$LIBTIFF - $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . + $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Dlibdeflate=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . make -j $MAKEJ make install cd ../openjpeg-$OPENJPEG_VERSION @@ -452,7 +452,7 @@ case $PLATFORM in make -j $MAKEJ make install cd ../$LIBTIFF - $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . + $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Dlibdeflate=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . make -j $MAKEJ make install cd ../openjpeg-$OPENJPEG_VERSION @@ -493,7 +493,7 @@ case $PLATFORM in make -j $MAKEJ make install cd ../$LIBTIFF - $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . + $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Dlibdeflate=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . make -j $MAKEJ make install cd ../openjpeg-$OPENJPEG_VERSION @@ -533,7 +533,7 @@ case $PLATFORM in make -j $MAKEJ make install cd ../$LIBTIFF - $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . + $CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Dlibdeflate=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . make -j $MAKEJ make install cd ../openjpeg-$OPENJPEG_VERSION @@ -573,7 +573,7 @@ case $PLATFORM in make -j $MAKEJ make install cd ../$LIBTIFF - $CMAKE -G "MSYS Makefiles" $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . + $CMAKE -G "MSYS Makefiles" $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Dlibdeflate=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . make -j $MAKEJ make install cd ../openjpeg-$OPENJPEG_VERSION @@ -613,7 +613,7 @@ case $PLATFORM in make -j $MAKEJ make install cd ../$LIBTIFF - $CMAKE -G "MSYS Makefiles" $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . + $CMAKE -G "MSYS Makefiles" $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Dlibdeflate=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF . make -j $MAKEJ make install cd ../openjpeg-$OPENJPEG_VERSION