Fix builds for OpenCV and Leptonica

leptonica/cppbuild.sh

@@ -44,16 +44,21 @@ 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
 sedinplace 's/FATAL_ERROR/WARNING/g' leptonica-$LEPTONICA_VERSION/CMakeLists.txt
 sedinplace 's/${WEBP_LIBRARY}/${WEBP_LIBRARY} ${CMAKE_INSTALL_PREFIX}\/lib\/libsharpyuv.a/g' leptonica-$LEPTONICA_VERSION/CMakeLists.txt
-sedinplace 's/${TIFF_LIBRARIES}/${TIFF_LIBRARIES} ${CMAKE_INSTALL_PREFIX}\/lib\/libsharpyuv.a ${CMAKE_INSTALL_PREFIX}\/lib\/libjpeg.a/g' leptonica-$LEPTONICA_VERSION/src/CMakeLists.txt
+sedinplace 's/${TIFF_LIBRARIES}/${CMAKE_INSTALL_PREFIX}\/lib\/libtiff.a ${CMAKE_INSTALL_PREFIX}\/lib\/libsharpyuv.a ${CMAKE_INSTALL_PREFIX}\/lib\/libjpeg.a/g' leptonica-$LEPTONICA_VERSION/src/CMakeLists.txt
 
 cd nasm-$NASM_VERSION
 # fix for build with GCC 8.x

opencv/cppbuild.sh

@@ -82,6 +82,10 @@ 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
 
+# disable broken NEON code
+sedinplace 's/if(NOT MSVC)/if(FALSE)/g' cmake/OpenCVCompilerOptimizations.cmake
+sedinplace 's/define CV_NEON 1/define CV_NEON 0/g' modules/core/include/opencv2/core/cv_cpu_dispatch.h
+
 # 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 +269,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 +280,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

opencv/opencv.patch

@@ -499,6 +499,198 @@ diff -ruN opencv-4.9.0/modules/video/src/tracking/detail/tracking_online_mil.hpp
  {
  public:
      float _mu0, _mu1, _sig0, _sig1;
+diff -ruN opencv-4.9.0/modules/videoio/src/cap_avfoundation.mm opencv-4.9.0-patch/modules/videoio/src/cap_avfoundation.mm
+--- opencv-4.9.0/modules/videoio/src/cap_avfoundation.mm	2023-12-28 01:46:55.000000000 +0900
++++ opencv-4.9.0-patch/modules/videoio/src/cap_avfoundation.mm	2023-09-27 19:18:31.000000000 +0900
+@@ -61,8 +61,6 @@
+
+ #define DISABLE_AUTO_RESTART 999
+
+-#if !TARGET_OS_VISION
+-
+ @interface CaptureDelegate : NSObject <AVCaptureVideoDataOutputSampleBufferDelegate>
+ {
+     int newFrame;
+@@ -127,7 +125,6 @@
+         int disableAutoRestart;
+ };
+
+-#endif
+
+ /*****************************************************************************
+  *
+@@ -163,7 +160,6 @@
+     uint32_t  mMode;
+     int       mFormat;
+
+-    void handleTracks(NSArray<AVAssetTrack *>* tracks, const char* filename);
+     bool setupReadingAt(CMTime position);
+     IplImage* retrieveFramePixelBuffer();
+     int getPreferredOrientationDegrees() const;
+@@ -221,8 +217,6 @@
+
+ }
+
+-#if !TARGET_OS_VISION
+-
+ cv::Ptr<cv::IVideoCapture> cv::create_AVFoundation_capture_cam(int index)
+ {
+     CvCaptureCAM* retval = new CvCaptureCAM(index);
+@@ -232,8 +226,6 @@
+     return 0;
+ }
+
+-#endif
+-
+ cv::Ptr<cv::IVideoWriter> cv::create_AVFoundation_writer(const std::string& filename, int fourcc,
+                                                          double fps, const cv::Size &frameSize,
+                                                          const cv::VideoWriterParameters& params)
+@@ -253,8 +245,6 @@
+  *
+  *****************************************************************************/
+
+-#if !TARGET_OS_VISION
+-
+ CvCaptureCAM::CvCaptureCAM(int cameraNum) {
+     mCaptureSession = nil;
+     mCaptureDeviceInput = nil;
+@@ -783,7 +773,6 @@
+
+ @end
+
+-#endif
+
+ /*****************************************************************************
+  *
+@@ -822,26 +811,24 @@
+         return;
+     }
+
+-// Available since iOS 15
+-#if TARGET_OS_VISION || (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000)
+-    if (@available(iOS 15, visionOS 1, *)) {
+-        [mAsset loadTracksWithMediaType:AVMediaTypeVideo completionHandler:^(NSArray<AVAssetTrack *>* tracks, NSError* err) {
+-            if (err != nil) {
+-                handleTracks(tracks, filename);
+-            }
+-            [localpool drain];
+-        }];
++    NSArray *tracks = [mAsset tracksWithMediaType:AVMediaTypeVideo];
++    if ([tracks count] == 0) {
++        fprintf(stderr, "OpenCV: Couldn't read video stream from file \"%s\"\n", filename);
++        [localpool drain];
++        started = 0;
+         return;
+-    } else {
+-#if !TARGET_OS_VISION
+-        NSArray *tracks = [mAsset tracksWithMediaType:AVMediaTypeVideo];
+-        handleTracks(tracks, filename);
+-#endif
+     }
+-#else
+-    NSArray *tracks = [mAsset tracksWithMediaType:AVMediaTypeVideo];
+-    handleTracks(tracks, filename);
+-#endif
++
++    mAssetTrack = [tracks[0] retain];
++
++    if ( ! setupReadingAt(kCMTimeZero) ) {
++        fprintf(stderr, "OpenCV: Couldn't read movie file \"%s\"\n", filename);
++        [localpool drain];
++        started = 0;
++        return;
++    }
++
++    started = 1;
+     [localpool drain];
+ }
+
+@@ -863,24 +850,6 @@
+     [localpool drain];
+ }
+
+-void CvCaptureFile::handleTracks(NSArray<AVAssetTrack *>* tracks, const char* filename) {
+-    if ([tracks count] == 0) {
+-        fprintf(stderr, "OpenCV: Couldn't read video stream from file \"%s\"\n", filename);
+-        started = 0;
+-        return;
+-    }
+-
+-    mAssetTrack = [tracks[0] retain];
+-
+-    if ( ! setupReadingAt(kCMTimeZero) ) {
+-        fprintf(stderr, "OpenCV: Couldn't read movie file \"%s\"\n", filename);
+-        started = 0;
+-        return;
+-    }
+-
+-    started = 1;
+-}
+-
+ bool CvCaptureFile::setupReadingAt(CMTime position) {
+     if (mAssetReader) {
+         if (mAssetReader.status == AVAssetReaderStatusReading) {
+@@ -1300,25 +1269,25 @@
+         //exception;
+     }
+
+-    // Three codec supported AVVideoCodecTypeH264 AVVideoCodecTypeJPEG AVVideoCodecTypeHEVC
++    // Three codec supported AVVideoCodecH264 AVVideoCodecJPEG AVVideoCodecTypeHEVC
+     // On iPhone 3G H264 is not supported.
+     if (fourcc == CV_FOURCC('J','P','E','G') || fourcc == CV_FOURCC('j','p','e','g') ||
+             fourcc == CV_FOURCC('M','J','P','G') || fourcc == CV_FOURCC('m','j','p','g')){
+-        codec = [AVVideoCodecTypeJPEG copy]; // Use JPEG codec if specified, otherwise H264
++        codec = [AVVideoCodecJPEG copy]; // Use JPEG codec if specified, otherwise H264
+     }else if(fourcc == CV_FOURCC('H','2','6','4') || fourcc == CV_FOURCC('a','v','c','1')){
+-            codec = [AVVideoCodecTypeH264 copy];
++            codec = [AVVideoCodecH264 copy];
+ // Available since iOS 11
+-#if TARGET_OS_VISION || (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
++#if defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
+     }else if(fourcc == CV_FOURCC('H','2','6','5') || fourcc == CV_FOURCC('h','v','c','1') ||
+             fourcc == CV_FOURCC('H','E','V','C') || fourcc == CV_FOURCC('h','e','v','c')){
+-        if (@available(iOS 11, visionOS 1, *)) {
++        if (@available(iOS 11, *)) {
+             codec = [AVVideoCodecTypeHEVC copy];
+         } else {
+-            codec = [AVVideoCodecTypeH264 copy];
++            codec = [AVVideoCodecH264 copy];
+         }
+ #endif
+     }else{
+-        codec = [AVVideoCodecTypeH264 copy]; // default canonical H264.
++        codec = [AVVideoCodecH264 copy]; // default canonical H264.
+     }
+
+     //NSLog(@"Path: %@", path);
+@@ -1380,17 +1349,17 @@
+     NSAutoreleasePool* localpool = [[NSAutoreleasePool alloc] init];
+
+     [mMovieWriterInput markAsFinished];
+-    [mMovieWriter finishWritingWithCompletionHandler:^() {
+-        [mMovieWriter release];
+-        [mMovieWriterInput release];
+-        [mMovieWriterAdaptor release];
+-        [path release];
+-        [codec release];
+-        [fileType release];
+-        cvReleaseImage(&argbimage);
++    [mMovieWriter finishWriting];
++    [mMovieWriter release];
++    [mMovieWriterInput release];
++    [mMovieWriterAdaptor release];
++    [path release];
++    [codec release];
++    [fileType release];
++    cvReleaseImage(&argbimage);
++
++    [localpool drain];
+
+-        [localpool drain];
+-    }];
+ }
+
+ bool CvVideoWriter_AVFoundation::writeFrame(const IplImage* iplimage) {
 diff -ruN opencv-4.9.0/modules/videoio/src/cap_v4l.cpp opencv-4.9.0-patch/modules/videoio/src/cap_v4l.cpp
 --- opencv-4.9.0/modules/videoio/src/cap_v4l.cpp	2023-12-28 01:46:55.000000000 +0900
 +++ opencv-4.9.0-patch/modules/videoio/src/cap_v4l.cpp	2023-12-31 10:47:15.707853349 +0900

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 {

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 {

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"

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"

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"

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"

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",

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"
         )
     },