Fix builds for OpenCV and Leptonica

bytedeco · Dec 31, 2023 · 7d5bced · 7d5bced
1 parent 40671a3
commit 7d5bced
Show file tree

Hide file tree

Showing 52 changed files with 136 additions and 129 deletions.
diff --git a/leptonica/cppbuild.sh b/leptonica/cppbuild.sh
@@ -44,10 +44,15 @@ tar --totals -xzf ../leptonica-$LEPTONICA_VERSION.tar.gz
 # https://sourceforge.net/p/giflib/feature-requests/6/
 patch -Np1 -d $GIFLIB < ../../giflib.patch || true
 
+sedinplace '/cmake_policy(SET CMP0054 NEW)/a\
+cmake_policy(SET CMP0057 NEW)\
+' leptonica-$LEPTONICA_VERSION/CMakeLists.txt
+
 sedinplace 's/add_library(zlib SHARED/add_library(zlib STATIC/g' $ZLIB/CMakeLists.txt
 sedinplace 's/add_library(giflib SHARED/add_library(giflib STATIC/g' $GIFLIB/CMakeLists.txt
 sedinplace 's/if(WIN32)/if(FALSE)/g' $GIFLIB/CMakeLists.txt
 sedinplace 's/include(OpenGLChecks)/set(HAVE_OPENGL FALSE)/g' $LIBTIFF/CMakeLists.txt
+sedinplace 's/-${PROJECT_VERSION}/-6/g' leptonica-$LEPTONICA_VERSION/src/CMakeLists.txt
 sedinplace 's/SOVERSION 6..../SOVERSION 6/g' leptonica-$LEPTONICA_VERSION/src/CMakeLists.txt
 sedinplace 's/VERSION   ${VERSION_PLAIN}/VERSION   6/g' leptonica-$LEPTONICA_VERSION/src/CMakeLists.txt
 sedinplace 's/leptonica-${VERSION_PLAIN}/leptonica-6/g' leptonica-$LEPTONICA_VERSION/src/CMakeLists.txt

diff --git a/opencv/cppbuild.sh b/opencv/cppbuild.sh
@@ -82,6 +82,8 @@ patch -Np1 < ../../../opencv-linux-ppc64le.patch
 #sedinplace '/include_directories/d' platforms/android/android.toolchain.cmake
 #sedinplace "s/<LINK_LIBRARIES>/<LINK_LIBRARIES> ${ANDROID_LIBS:-}/g" platforms/android/android.toolchain.cmake
 
+sedinplace 's/if(NOT MSVC)/if(FALSE)/g' cmake/OpenCVCompilerOptimizations.cmake
+
 # https://github.com/opencv/opencv/issues/19846
 sedinplace 's/dgeev_/OCV_LAPACK_FUNC(dgeev)/g' modules/calib3d/src/usac/dls_solver.cpp modules/calib3d/src/usac/essential_solver.cpp
 
@@ -265,7 +267,7 @@ case $PLATFORM in
         sedinplace 's:/sdk/native/libs/x86_64/libopencv_:/lib/libopencv_:g' ../sdk/native/jni/abi-x86_64/OpenCVModules-release.cmake
         ;;
     ios-arm64)
-        $CMAKE -GXcode -DCMAKE_TOOLCHAIN_FILE=platforms/ios/cmake/Toolchains/Toolchain-iPhoneOS_Xcode.cmake -DIPHONEOS_DEPLOYMENT_TARGET=8.0 -DIOS_ARCH=arm64 -DAPPLE_FRAMEWORK=ON -DCMAKE_MACOSX_BUNDLE=ON -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=NO -DCMAKE_XCODE_ATTRIBUTE_BITCODE_GENERATION_MODE=NO -DBUILD_opencv_world=OFF -DBUILD_SHARED_LIBS=OFF $BUILD_X -DENABLE_PRECOMPILED_HEADERS=OFF $WITH_X -DWITH_OPENCL=OFF $GPU_FLAGS $BUILD_CONTRIB_X -DCMAKE_CXX_FLAGS="-I/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers/ -I$(/usr/libexec/java_home)/include -I$(/usr/libexec/java_home)/include/darwin" .
+        IPHONEOS_DEPLOYMENT_TARGET=8.0 $CMAKE -GXcode -DCMAKE_TOOLCHAIN_FILE=platforms/ios/cmake/Toolchains/Toolchain-iPhoneOS_Xcode.cmake -DIPHONEOS_DEPLOYMENT_TARGET=8.0 -DIOS_ARCH=arm64 -DAPPLE_FRAMEWORK=ON -DCMAKE_MACOSX_BUNDLE=ON -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=NO -DCMAKE_XCODE_ATTRIBUTE_BITCODE_GENERATION_MODE=NO -DBUILD_opencv_world=OFF -DBUILD_SHARED_LIBS=OFF $BUILD_X -DENABLE_PRECOMPILED_HEADERS=OFF $WITH_X -DWITH_OPENCL=OFF $GPU_FLAGS $BUILD_CONTRIB_X -DCMAKE_CXX_FLAGS="-I/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers/ -I$(/usr/libexec/java_home)/include -I$(/usr/libexec/java_home)/include/darwin" .
         # download files CMake failed to download
         if [[ -f download_with_curl.sh ]]; then
             bash download_with_curl.sh
@@ -276,7 +278,7 @@ case $PLATFORM in
         cp ../share/java/opencv4/libopencv_java.a ../lib
         ;;
     ios-x86_64)
-        $CMAKE -GXcode -DCMAKE_TOOLCHAIN_FILE=platforms/ios/cmake/Toolchains/Toolchain-iPhoneSimulator_Xcode.cmake -DIPHONEOS_DEPLOYMENT_TARGET=8.0 -DIOS_ARCH=x86_64 -DAPPLE_FRAMEWORK=ON -DCMAKE_MACOSX_BUNDLE=ON -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=NO -DCMAKE_XCODE_ATTRIBUTE_BITCODE_GENERATION_MODE=NO -DBUILD_opencv_world=OFF -DBUILD_SHARED_LIBS=OFF $BUILD_X -DENABLE_PRECOMPILED_HEADERS=OFF $WITH_X -DWITH_OPENCL=OFF $GPU_FLAGS $BUILD_CONTRIB_X -DCMAKE_CXX_FLAGS="-I/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers/ -I$(/usr/libexec/java_home)/include -I$(/usr/libexec/java_home)/include/darwin" .
+        IPHONEOS_DEPLOYMENT_TARGET=8.0 $CMAKE -GXcode -DCMAKE_TOOLCHAIN_FILE=platforms/ios/cmake/Toolchains/Toolchain-iPhoneSimulator_Xcode.cmake -DIPHONEOS_DEPLOYMENT_TARGET=8.0 -DIOS_ARCH=x86_64 -DAPPLE_FRAMEWORK=ON -DCMAKE_MACOSX_BUNDLE=ON -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=NO -DCMAKE_XCODE_ATTRIBUTE_BITCODE_GENERATION_MODE=NO -DBUILD_opencv_world=OFF -DBUILD_SHARED_LIBS=OFF $BUILD_X -DENABLE_PRECOMPILED_HEADERS=OFF $WITH_X -DWITH_OPENCL=OFF $GPU_FLAGS $BUILD_CONTRIB_X -DCMAKE_CXX_FLAGS="-I/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers/ -I$(/usr/libexec/java_home)/include -I$(/usr/libexec/java_home)/include/darwin" .
         # download files CMake failed to download
         if [[ -f download_with_curl.sh ]]; then
             bash download_with_curl.sh

diff --git a/opencv/src/main/java/org/bytedeco/opencv/opencv_java.java b/opencv/src/main/java/org/bytedeco/opencv/opencv_java.java
@@ -52,9 +52,9 @@
         opencv_wechat_qrcode.class,
     },
     value = {
-        @Platform(preload = {"opencv_cuda@.408", "opencv_cudaarithm@.408", "opencv_cudafilters@.408", "opencv_cudaimgproc@.408", "opencv_java"}),
+        @Platform(preload = {"opencv_cuda@.409", "opencv_cudaarithm@.409", "opencv_cudafilters@.409", "opencv_cudaimgproc@.409", "opencv_java"}),
         @Platform(value = "ios", preload = "libopencv_java"),
-        @Platform(value = "windows", preload = {"opencv_cuda481", "opencv_cudaarithm481", "opencv_cudafilters481", "opencv_cudaimgproc481", "opencv_java"}),
+        @Platform(value = "windows", preload = {"opencv_cuda490", "opencv_cudaarithm490", "opencv_cudafilters490", "opencv_cudaimgproc490", "opencv_java"}),
     }
 )
 public class opencv_java {

diff --git a/opencv/src/main/java/org/bytedeco/opencv/opencv_python3.java b/opencv/src/main/java/org/bytedeco/opencv/opencv_python3.java
@@ -65,12 +65,12 @@
         opencv_wechat_qrcode.class,
     },
     value = {
-        @Platform(preload = {"opencv_cuda@.408", "opencv_cudaarithm@.408", "opencv_cudafilters@.408", "opencv_cudaimgproc@.408",
-                             "opencv_cudacodec@.408", "opencv_cudaobjdetect@.408", "opencv_cudabgsegm@.408", "opencv_cudastereo@.408",
-                             "opencv_cudaoptflow@.408", "opencv_cudawarping@.408", "opencv_cudalegacy@.408"}),
-        @Platform(value = "windows", preload = {"opencv_cuda481", "opencv_cudaarithm481", "opencv_cudafilters481", "opencv_cudaimgproc481",
-                             "opencv_cudacodec481", "opencv_cudaobjdetect481", "opencv_cudabgsegm481", "opencv_cudastereo481",
-                             "opencv_cudaoptflow481", "opencv_cudawarping481", "opencv_cudalegacy481"}),
+        @Platform(preload = {"opencv_cuda@.409", "opencv_cudaarithm@.409", "opencv_cudafilters@.409", "opencv_cudaimgproc@.409",
+                             "opencv_cudacodec@.409", "opencv_cudaobjdetect@.409", "opencv_cudabgsegm@.409", "opencv_cudastereo@.409",
+                             "opencv_cudaoptflow@.409", "opencv_cudawarping@.409", "opencv_cudalegacy@.409"}),
+        @Platform(value = "windows", preload = {"opencv_cuda490", "opencv_cudaarithm490", "opencv_cudafilters490", "opencv_cudaimgproc490",
+                             "opencv_cudacodec490", "opencv_cudaobjdetect490", "opencv_cudabgsegm490", "opencv_cudastereo490",
+                             "opencv_cudaoptflow490", "opencv_cudawarping490", "opencv_cudalegacy490"}),
     }
 )
 public class opencv_python3 {

diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_aruco.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_aruco.java
@@ -33,10 +33,10 @@
     value = {
         @Platform(
             include = {/*"<opencv2/aruco/dictionary.hpp>",*/ "<opencv2/aruco.hpp>", "<opencv2/aruco/aruco_calib.hpp>", "<opencv2/aruco/charuco.hpp>"},
-            link = "opencv_aruco@.408"
+            link = "opencv_aruco@.409"
         ),
         @Platform(value = "ios", preload = "libopencv_aruco"),
-        @Platform(value = "windows", link = "opencv_aruco481")
+        @Platform(value = "windows", link = "opencv_aruco490")
     },
     target = "org.bytedeco.opencv.opencv_aruco",
     global = "org.bytedeco.opencv.global.opencv_aruco"

diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_bgsegm.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_bgsegm.java
@@ -33,10 +33,10 @@
     value = {
         @Platform(
             include = "<opencv2/bgsegm.hpp>",
-            link = "opencv_bgsegm@.408"
+            link = "opencv_bgsegm@.409"
         ),
         @Platform(value = "ios", preload = "libopencv_bgsegm"),
-        @Platform(value = "windows", link = "opencv_bgsegm481")
+        @Platform(value = "windows", link = "opencv_bgsegm490")
     },
     target = "org.bytedeco.opencv.opencv_bgsegm",
     global = "org.bytedeco.opencv.global.opencv_bgsegm"

diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_bioinspired.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_bioinspired.java
@@ -35,9 +35,9 @@
     inherit = opencv_highgui.class,
     value = {
         @Platform(include = {"<opencv2/bioinspired.hpp>", "opencv2/bioinspired/bioinspired.hpp", "opencv2/bioinspired/retina.hpp",
-            "opencv2/bioinspired/retinafasttonemapping.hpp", "opencv2/bioinspired/transientareassegmentationmodule.hpp"}, link = "opencv_bioinspired@.408"),
+            "opencv2/bioinspired/retinafasttonemapping.hpp", "opencv2/bioinspired/transientareassegmentationmodule.hpp"}, link = "opencv_bioinspired@.409"),
         @Platform(value = "ios", preload = "libopencv_bioinspired"),
-        @Platform(value = "windows", link = "opencv_bioinspired481")
+        @Platform(value = "windows", link = "opencv_bioinspired490")
     },
     target = "org.bytedeco.opencv.opencv_bioinspired",
     global = "org.bytedeco.opencv.global.opencv_bioinspired"

diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_calib3d.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_calib3d.java
@@ -35,9 +35,9 @@
 @Properties(
     inherit = opencv_features2d.class,
     value = {
-        @Platform(include = {"<opencv2/calib3d/calib3d_c.h>", "<opencv2/calib3d.hpp>"}, link = "opencv_calib3d@.408"),
+        @Platform(include = {"<opencv2/calib3d/calib3d_c.h>", "<opencv2/calib3d.hpp>"}, link = "opencv_calib3d@.409"),
         @Platform(value = "ios", preload = "libopencv_calib3d"),
-        @Platform(value = "windows", link = "opencv_calib3d481")
+        @Platform(value = "windows", link = "opencv_calib3d490")
     },
     target = "org.bytedeco.opencv.opencv_calib3d",
     global = "org.bytedeco.opencv.global.opencv_calib3d"

diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_core.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_core.java
@@ -57,9 +57,9 @@
             "<opencv2/core/utility.hpp>", "<opencv2/core/utils/instrumentation.hpp>", "<opencv2/core/utils/tls.hpp>",
             "<opencv2/core/types_c.h>", "<opencv2/core/core_c.h>", "<opencv2/core/types.hpp>", "<opencv2/core.hpp>",
             "<opencv2/core/cuda.hpp>", "<opencv2/core/ocl.hpp>", "<opencv2/core/operations.hpp>", "<opencv2/core/bufferpool.hpp>", "<opencv2/core/mat.hpp>",
-            "<opencv2/core/persistence.hpp>", "<opencv2/core/optim.hpp>", "<opencv2/core/async.hpp>", "opencv_adapters.h"}, link = {"opencv_core@.408", "opencv_imgproc@.408"},
+            "<opencv2/core/persistence.hpp>", "<opencv2/core/optim.hpp>", "<opencv2/core/async.hpp>", "opencv_adapters.h"}, link = {"opencv_core@.409", "opencv_imgproc@.409"},
             resource = {"include", "lib", "sdk", "share", "x86", "x64", "OpenCVConfig.cmake", "OpenCVConfig-version.cmake", "python"}, linkresource = "lib",
-            preload = {"opencv_cudev@.408"}, compiler = "cpp11", define = "SHARED_PTR_NAMESPACE std"),
+            preload = {"opencv_cudev@.409"}, compiler = "cpp11", define = "SHARED_PTR_NAMESPACE std"),
         @Platform(value = "android", preload = ""),
         @Platform(value = "ios", preload = {"liblibjpeg", "liblibpng", "liblibprotobuf", "liblibwebp", "libzlib", "libopencv_core"}),
         @Platform(value = "linux",        preloadpath = {"/usr/lib/", "/usr/lib32/", "/usr/lib64/"}),
@@ -68,7 +68,7 @@
         @Platform(value = "linux-x86",    preloadpath = {"/usr/lib32/", "/usr/lib/"}),
         @Platform(value = "linux-x86_64", preloadpath = {"/usr/lib64/", "/usr/lib/"}),
         @Platform(value = "linux-ppc64",  preloadpath = {"/usr/lib/powerpc64-linux-gnu/", "/usr/lib/powerpc64le-linux-gnu/"}),
-        @Platform(value = "windows", define = {"SHARED_PTR_NAMESPACE std", "_WIN32_WINNT 0x0502"}, link =  {"opencv_core481", "opencv_imgproc481"}, preload = {"opencv_cudev481"}),
+        @Platform(value = "windows", define = {"SHARED_PTR_NAMESPACE std", "_WIN32_WINNT 0x0502"}, link =  {"opencv_core490", "opencv_imgproc490"}, preload = {"opencv_cudev490"}),
         @Platform(value = {"linux-arm64", "linux-ppc64le", "linux-x86_64", "macosx-x86_64", "windows-x86_64"}, extension = "-gpu")},
     target = "org.bytedeco.opencv.opencv_core",
     global = "org.bytedeco.opencv.global.opencv_core",

diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudaarithm.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudaarithm.java
@@ -33,12 +33,12 @@
     value = {
         @Platform(
             include = "<opencv2/cudaarithm.hpp>",
-            link = "opencv_cudaarithm@.408",
+            link = "opencv_cudaarithm@.409",
             extension = "-gpu"
         ),
         @Platform(
             value = "windows",
-            link = "opencv_cudaarithm481",
+            link = "opencv_cudaarithm490",
             extension = "-gpu"
         )
     },

diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudabgsegm.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudabgsegm.java
@@ -33,12 +33,12 @@
     value = {
         @Platform(
             include = "<opencv2/cudabgsegm.hpp>",
-            link = "opencv_cudabgsegm@.408",
+            link = "opencv_cudabgsegm@.409",
             extension = "-gpu"
         ),
         @Platform(
             value = "windows",
-            link = "opencv_cudabgsegm481",
+            link = "opencv_cudabgsegm490",
             extension = "-gpu"
         )
     },

diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudacodec.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudacodec.java
@@ -34,12 +34,12 @@
         @Platform(
             not = "macosx",
             include = "<opencv2/cudacodec.hpp>",
-            link = "opencv_cudacodec@.408",
+            link = "opencv_cudacodec@.409",
             extension = "-gpu"
         ),
         @Platform(
             value = "windows",
-            link = "opencv_cudacodec481",
+            link = "opencv_cudacodec490",
             extension = "-gpu"
         )
     },

diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudafeatures2d.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudafeatures2d.java
@@ -37,12 +37,12 @@
     value = {
         @Platform(
             include = "<opencv2/cudafeatures2d.hpp>",
-            link = "opencv_cudafeatures2d@.408",
+            link = "opencv_cudafeatures2d@.409",
             extension = "-gpu"
         ),
         @Platform(
             value = "windows",
-            link = "opencv_cudafeatures2d481",
+            link = "opencv_cudafeatures2d490",
             extension = "-gpu"
         )
     },

diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudafilters.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudafilters.java
@@ -36,12 +36,12 @@
     value = {
         @Platform(
             include = "<opencv2/cudafilters.hpp>",
-            link = "opencv_cudafilters@.408",
+            link = "opencv_cudafilters@.409",
             extension = "-gpu"
         ),
         @Platform(
             value = "windows",
-            link = "opencv_cudafilters481",
+            link = "opencv_cudafilters490",
             extension = "-gpu"
         )
     },

diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudaimgproc.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudaimgproc.java
@@ -33,12 +33,12 @@
     value = {
         @Platform(
             include = "<opencv2/cudaimgproc.hpp>",
-            link = "opencv_cudaimgproc@.408",
+            link = "opencv_cudaimgproc@.409",
             extension = "-gpu"
         ),
         @Platform(
             value = "windows",
-            link = "opencv_cudaimgproc481",
+            link = "opencv_cudaimgproc490",
             extension = "-gpu"
         )
     },

diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudaobjdetect.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudaobjdetect.java
@@ -40,14 +40,14 @@
     value = {
         @Platform(
             include = "<opencv2/cudaobjdetect.hpp>",
-            link = "opencv_cudaobjdetect@.408",
-            preload = "opencv_cudalegacy@.408",
+            link = "opencv_cudaobjdetect@.409",
+            preload = "opencv_cudalegacy@.409",
             extension = "-gpu"
         ),
         @Platform(
             value = "windows",
-            link = "opencv_cudaobjdetect481",
-            preload = "opencv_cudalegacy481",
+            link = "opencv_cudaobjdetect490",
+            preload = "opencv_cudalegacy490",
             extension = "-gpu"
         )
     },

diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudaoptflow.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudaoptflow.java
@@ -40,14 +40,14 @@
     value = {
         @Platform(
             include = "<opencv2/cudaoptflow.hpp>",
-            link = "opencv_cudaoptflow@.408",
-            preload = "opencv_cudalegacy@.408",
+            link = "opencv_cudaoptflow@.409",
+            preload = "opencv_cudalegacy@.409",
             extension = "-gpu"
         ),
         @Platform(
             value = "windows",
-            link = "opencv_cudaoptflow481",
-            preload = "opencv_cudalegacy481",
+            link = "opencv_cudaoptflow490",
+            preload = "opencv_cudalegacy490",
             extension = "-gpu"
         )
     },

diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudastereo.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudastereo.java
@@ -33,12 +33,12 @@
     value = {
         @Platform(
             include = "<opencv2/cudastereo.hpp>",
-            link = "opencv_cudastereo@.408",
+            link = "opencv_cudastereo@.409",
             extension = "-gpu"
         ),
         @Platform(
             value = "windows",
-            link = "opencv_cudastereo481",
+            link = "opencv_cudastereo490",
             extension = "-gpu"
         )
     },

diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudawarping.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudawarping.java
@@ -33,12 +33,12 @@
     value = {
         @Platform(
             include = "<opencv2/cudawarping.hpp>",
-            link = "opencv_cudawarping@.408",
+            link = "opencv_cudawarping@.409",
             extension = "-gpu"
         ),
         @Platform(
             value = "windows",
-            link = "opencv_cudawarping481",
+            link = "opencv_cudawarping490",
             extension = "-gpu"
         )
     },

diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_dnn.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_dnn.java
@@ -37,9 +37,9 @@
     value = {
         @Platform(include = {"<opencv2/dnn.hpp>", "<opencv2/dnn/version.hpp>", "<opencv2/dnn/dict.hpp>","<opencv2/dnn/all_layers.hpp>",
             "<opencv2/dnn/dnn.hpp>", "<opencv2/dnn/layer.hpp>", "<opencv2/dnn/shape_utils.hpp>"},
-            link = "opencv_dnn@.408"),
+            link = "opencv_dnn@.409"),
         @Platform(value = "ios", preload = "libopencv_dnn"),
-        @Platform(value = "windows", link = "opencv_dnn481")},
+        @Platform(value = "windows", link = "opencv_dnn490")},
     target = "org.bytedeco.opencv.opencv_dnn",
     global = "org.bytedeco.opencv.global.opencv_dnn"
 )

diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_dnn_superres.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_dnn_superres.java
@@ -35,9 +35,9 @@
 @Properties(
     inherit = {opencv_dnn.class, opencv_quality.class},
     value = {
-        @Platform(include = "<opencv2/dnn_superres.hpp>", link = "opencv_dnn_superres@.408"),
+        @Platform(include = "<opencv2/dnn_superres.hpp>", link = "opencv_dnn_superres@.409"),
         @Platform(value = "ios", preload = "libopencv_dnn_superres"),
-        @Platform(value = "windows", link = "opencv_dnn_superres481")},
+        @Platform(value = "windows", link = "opencv_dnn_superres490")},
     target = "org.bytedeco.opencv.opencv_dnn_superres",
     global = "org.bytedeco.opencv.global.opencv_dnn_superres"
 )

diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_face.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_face.java
@@ -38,9 +38,9 @@
         @Platform(include = {"<opencv2/face/predict_collector.hpp>", "<opencv2/face.hpp>", "<opencv2/face/facerec.hpp>",
             "<opencv2/face/facemark.hpp>", "<opencv2/face/facemark_train.hpp>", "<opencv2/face/facemarkLBF.hpp>",
             "<opencv2/face/facemarkAAM.hpp>", "<opencv2/face/face_alignment.hpp>"},
-            link = "opencv_face@.408"),
+            link = "opencv_face@.409"),
         @Platform(value = "ios", preload = "libopencv_face"),
-        @Platform(value = "windows", link = "opencv_face481")},
+        @Platform(value = "windows", link = "opencv_face490")},
     target = "org.bytedeco.opencv.opencv_face",
     global = "org.bytedeco.opencv.global.opencv_face"
 )

diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_features2d.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_features2d.java
@@ -35,9 +35,9 @@
 @Properties(
     inherit = {opencv_highgui.class, opencv_flann.class},
     value = {
-        @Platform(include = "<opencv2/features2d.hpp>", link = "opencv_features2d@.408"),
+        @Platform(include = "<opencv2/features2d.hpp>", link = "opencv_features2d@.409"),
         @Platform(value = "ios", preload = "libopencv_features2d"),
-        @Platform(value = "windows", link = "opencv_features2d481")},
+        @Platform(value = "windows", link = "opencv_features2d490")},
     target = "org.bytedeco.opencv.opencv_features2d",
     global = "org.bytedeco.opencv.global.opencv_features2d"
 )

diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_flann.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_flann.java
@@ -35,9 +35,9 @@
 @Properties(
     inherit = opencv_core.class,
     value = {
-        @Platform(include = {"<opencv2/flann/defines.h>", "<opencv2/flann/miniflann.hpp>"}, link = "opencv_flann@.408"),
+        @Platform(include = {"<opencv2/flann/defines.h>", "<opencv2/flann/miniflann.hpp>"}, link = "opencv_flann@.409"),
         @Platform(value = "ios", preload = "libopencv_flann"),
-        @Platform(value = "windows", link = "opencv_flann481")},
+        @Platform(value = "windows", link = "opencv_flann490")},
     target = "org.bytedeco.opencv.opencv_flann",
     global = "org.bytedeco.opencv.global.opencv_flann"
 )