Skip to content

Commit

Permalink
Fix builds for Tesseract and OpenCV
Browse files Browse the repository at this point in the history
  • Loading branch information
saudet committed Oct 14, 2023
1 parent 6693a42 commit d5253f4
Show file tree
Hide file tree
Showing 52 changed files with 65 additions and 65 deletions.
2 changes: 1 addition & 1 deletion opencv/src/main/java/org/bytedeco/opencv/opencv_java.java
Expand Up @@ -54,7 +54,7 @@
value = {
@Platform(preload = {"opencv_cuda@.408", "opencv_cudaarithm@.408", "opencv_cudafilters@.408", "opencv_cudaimgproc@.408", "opencv_java"}),
@Platform(value = "ios", preload = "libopencv_java"),
@Platform(value = "windows", preload = {"opencv_cuda480", "opencv_cudaarithm480", "opencv_cudafilters480", "opencv_cudaimgproc480", "opencv_java"}),
@Platform(value = "windows", preload = {"opencv_cuda481", "opencv_cudaarithm481", "opencv_cudafilters481", "opencv_cudaimgproc481", "opencv_java"}),
}
)
public class opencv_java {
Expand Down
6 changes: 3 additions & 3 deletions opencv/src/main/java/org/bytedeco/opencv/opencv_python3.java
Expand Up @@ -68,9 +68,9 @@
@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_cuda480", "opencv_cudaarithm480", "opencv_cudafilters480", "opencv_cudaimgproc480",
"opencv_cudacodec480", "opencv_cudaobjdetect480", "opencv_cudabgsegm480", "opencv_cudastereo480",
"opencv_cudaoptflow480", "opencv_cudawarping480", "opencv_cudalegacy480"}),
@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"}),
}
)
public class opencv_python3 {
Expand Down
Expand Up @@ -36,7 +36,7 @@
link = "opencv_aruco@.408"
),
@Platform(value = "ios", preload = "libopencv_aruco"),
@Platform(value = "windows", link = "opencv_aruco480")
@Platform(value = "windows", link = "opencv_aruco481")
},
target = "org.bytedeco.opencv.opencv_aruco",
global = "org.bytedeco.opencv.global.opencv_aruco"
Expand Down
Expand Up @@ -33,7 +33,7 @@
// value = {
// @Platform(include = "<opencv2/barcode.hpp>", link = "opencv_barcode@.408"),
// @Platform(value = "ios", preload = "libopencv_barcode"),
// @Platform(value = "windows", link = "opencv_barcode480")
// @Platform(value = "windows", link = "opencv_barcode481")
// },
// target = "org.bytedeco.opencv.opencv_barcode",
// global = "org.bytedeco.opencv.global.opencv_barcode"
Expand Down
Expand Up @@ -36,7 +36,7 @@
link = "opencv_bgsegm@.408"
),
@Platform(value = "ios", preload = "libopencv_bgsegm"),
@Platform(value = "windows", link = "opencv_bgsegm480")
@Platform(value = "windows", link = "opencv_bgsegm481")
},
target = "org.bytedeco.opencv.opencv_bgsegm",
global = "org.bytedeco.opencv.global.opencv_bgsegm"
Expand Down
Expand Up @@ -37,7 +37,7 @@
@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"),
@Platform(value = "ios", preload = "libopencv_bioinspired"),
@Platform(value = "windows", link = "opencv_bioinspired480")
@Platform(value = "windows", link = "opencv_bioinspired481")
},
target = "org.bytedeco.opencv.opencv_bioinspired",
global = "org.bytedeco.opencv.global.opencv_bioinspired"
Expand Down
Expand Up @@ -37,7 +37,7 @@
value = {
@Platform(include = {"<opencv2/calib3d/calib3d_c.h>", "<opencv2/calib3d.hpp>"}, link = "opencv_calib3d@.408"),
@Platform(value = "ios", preload = "libopencv_calib3d"),
@Platform(value = "windows", link = "opencv_calib3d480")
@Platform(value = "windows", link = "opencv_calib3d481")
},
target = "org.bytedeco.opencv.opencv_calib3d",
global = "org.bytedeco.opencv.global.opencv_calib3d"
Expand Down
Expand Up @@ -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_core480", "opencv_imgproc480"}, preload = {"opencv_cudev480"}),
@Platform(value = "windows", define = {"SHARED_PTR_NAMESPACE std", "_WIN32_WINNT 0x0502"}, link = {"opencv_core481", "opencv_imgproc481"}, preload = {"opencv_cudev481"}),
@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",
Expand Down
Expand Up @@ -38,7 +38,7 @@
),
@Platform(
value = "windows",
link = "opencv_cudaarithm480",
link = "opencv_cudaarithm481",
extension = "-gpu"
)
},
Expand Down
Expand Up @@ -38,7 +38,7 @@
),
@Platform(
value = "windows",
link = "opencv_cudabgsegm480",
link = "opencv_cudabgsegm481",
extension = "-gpu"
)
},
Expand Down
Expand Up @@ -39,7 +39,7 @@
),
@Platform(
value = "windows",
link = "opencv_cudacodec480",
link = "opencv_cudacodec481",
extension = "-gpu"
)
},
Expand Down
Expand Up @@ -42,7 +42,7 @@
),
@Platform(
value = "windows",
link = "opencv_cudafeatures2d480",
link = "opencv_cudafeatures2d481",
extension = "-gpu"
)
},
Expand Down
Expand Up @@ -41,7 +41,7 @@
),
@Platform(
value = "windows",
link = "opencv_cudafilters480",
link = "opencv_cudafilters481",
extension = "-gpu"
)
},
Expand Down
Expand Up @@ -38,7 +38,7 @@
),
@Platform(
value = "windows",
link = "opencv_cudaimgproc480",
link = "opencv_cudaimgproc481",
extension = "-gpu"
)
},
Expand Down
Expand Up @@ -46,8 +46,8 @@
),
@Platform(
value = "windows",
link = "opencv_cudaobjdetect480",
preload = "opencv_cudalegacy480",
link = "opencv_cudaobjdetect481",
preload = "opencv_cudalegacy481",
extension = "-gpu"
)
},
Expand Down
Expand Up @@ -46,8 +46,8 @@
),
@Platform(
value = "windows",
link = "opencv_cudaoptflow480",
preload = "opencv_cudalegacy480",
link = "opencv_cudaoptflow481",
preload = "opencv_cudalegacy481",
extension = "-gpu"
)
},
Expand Down
Expand Up @@ -38,7 +38,7 @@
),
@Platform(
value = "windows",
link = "opencv_cudastereo480",
link = "opencv_cudastereo481",
extension = "-gpu"
)
},
Expand Down
Expand Up @@ -38,7 +38,7 @@
),
@Platform(
value = "windows",
link = "opencv_cudawarping480",
link = "opencv_cudawarping481",
extension = "-gpu"
)
},
Expand Down
Expand Up @@ -39,7 +39,7 @@
"<opencv2/dnn/dnn.hpp>", "<opencv2/dnn/layer.hpp>", "<opencv2/dnn/shape_utils.hpp>"},
link = "opencv_dnn@.408"),
@Platform(value = "ios", preload = "libopencv_dnn"),
@Platform(value = "windows", link = "opencv_dnn480")},
@Platform(value = "windows", link = "opencv_dnn481")},
target = "org.bytedeco.opencv.opencv_dnn",
global = "org.bytedeco.opencv.global.opencv_dnn"
)
Expand Down
Expand Up @@ -37,7 +37,7 @@
value = {
@Platform(include = "<opencv2/dnn_superres.hpp>", link = "opencv_dnn_superres@.408"),
@Platform(value = "ios", preload = "libopencv_dnn_superres"),
@Platform(value = "windows", link = "opencv_dnn_superres480")},
@Platform(value = "windows", link = "opencv_dnn_superres481")},
target = "org.bytedeco.opencv.opencv_dnn_superres",
global = "org.bytedeco.opencv.global.opencv_dnn_superres"
)
Expand Down
Expand Up @@ -40,7 +40,7 @@
"<opencv2/face/facemarkAAM.hpp>", "<opencv2/face/face_alignment.hpp>"},
link = "opencv_face@.408"),
@Platform(value = "ios", preload = "libopencv_face"),
@Platform(value = "windows", link = "opencv_face480")},
@Platform(value = "windows", link = "opencv_face481")},
target = "org.bytedeco.opencv.opencv_face",
global = "org.bytedeco.opencv.global.opencv_face"
)
Expand Down
Expand Up @@ -37,7 +37,7 @@
value = {
@Platform(include = "<opencv2/features2d.hpp>", link = "opencv_features2d@.408"),
@Platform(value = "ios", preload = "libopencv_features2d"),
@Platform(value = "windows", link = "opencv_features2d480")},
@Platform(value = "windows", link = "opencv_features2d481")},
target = "org.bytedeco.opencv.opencv_features2d",
global = "org.bytedeco.opencv.global.opencv_features2d"
)
Expand Down
Expand Up @@ -37,7 +37,7 @@
value = {
@Platform(include = {"<opencv2/flann/defines.h>", "<opencv2/flann/miniflann.hpp>"}, link = "opencv_flann@.408"),
@Platform(value = "ios", preload = "libopencv_flann"),
@Platform(value = "windows", link = "opencv_flann480")},
@Platform(value = "windows", link = "opencv_flann481")},
target = "org.bytedeco.opencv.opencv_flann",
global = "org.bytedeco.opencv.global.opencv_flann"
)
Expand Down
Expand Up @@ -37,7 +37,7 @@
value = {
@Platform(include = {"<opencv2/highgui/highgui_c.h>", "<opencv2/highgui.hpp>"}, link = "opencv_highgui@.408"),
@Platform(value = "ios", preload = "libopencv_highgui"),
@Platform(value = "windows", link = "opencv_highgui480")},
@Platform(value = "windows", link = "opencv_highgui481")},
target = "org.bytedeco.opencv.opencv_highgui",
global = "org.bytedeco.opencv.global.opencv_highgui"
)
Expand Down
Expand Up @@ -45,7 +45,7 @@
link = "opencv_img_hash@.408"
),
@Platform(value = "ios", preload = "libopencv_img_hash"),
@Platform(value = "windows", link = "opencv_img_hash480")
@Platform(value = "windows", link = "opencv_img_hash481")
},
target = "org.bytedeco.opencv.opencv_img_hash",
global = "org.bytedeco.opencv.global.opencv_img_hash"
Expand Down
Expand Up @@ -37,7 +37,7 @@
value = {
@Platform(include = {/*"<opencv2/imgcodecs/imgcodecs_c.h>",*/ "<opencv2/imgcodecs.hpp>"}, link = "opencv_imgcodecs@.408"),
@Platform(value = "ios", preload = "libopencv_imgcodecs"),
@Platform(value = "windows", link = "opencv_imgcodecs480")},
@Platform(value = "windows", link = "opencv_imgcodecs481")},
global = "org.bytedeco.opencv.global.opencv_imgcodecs",
helper = "org.bytedeco.opencv.helper.opencv_imgcodecs"
)
Expand Down
Expand Up @@ -38,7 +38,7 @@
@Platform(include = {"<opencv2/imgproc/types_c.h>", "<opencv2/imgproc/imgproc_c.h>", "<opencv2/imgproc.hpp>",
"<opencv2/imgproc/detail/gcgraph.hpp>"}, link = "opencv_imgproc@.408"),
@Platform(value = "ios", preload = "libopencv_imgproc"),
@Platform(value = "windows", link = "opencv_imgproc480")},
@Platform(value = "windows", link = "opencv_imgproc481")},
target = "org.bytedeco.opencv.opencv_imgproc",
global = "org.bytedeco.opencv.global.opencv_imgproc",
helper = "org.bytedeco.opencv.helper.opencv_imgproc"
Expand Down
Expand Up @@ -33,7 +33,7 @@
value = {
@Platform(include = "<opencv2/intensity_transform.hpp>", link = "opencv_intensity_transform@.408"),
@Platform(value = "ios", preload = "libopencv_intensity_transform"),
@Platform(value = "windows", link = "opencv_intensity_transform480")
@Platform(value = "windows", link = "opencv_intensity_transform481")
},
global = "org.bytedeco.opencv.global.opencv_intensity_transform"
)
Expand Down
Expand Up @@ -37,7 +37,7 @@
"<opencv2/mcc/checker_detector.hpp>",
"<opencv2/mcc/ccm.hpp>"}, link = "opencv_mcc@.408"),
@Platform(value = "ios", preload = "libopencv_mcc"),
@Platform(value = "windows", link = "opencv_mcc480")
@Platform(value = "windows", link = "opencv_mcc481")
},
target = "org.bytedeco.opencv.opencv_mcc",
global = "org.bytedeco.opencv.global.opencv_mcc"
Expand Down
Expand Up @@ -36,7 +36,7 @@
value = {
@Platform(include = "<opencv2/ml.hpp>", link = "opencv_ml@.408"),
@Platform(value = "ios", preload = "libopencv_ml"),
@Platform(value = "windows", link = "opencv_ml480")},
@Platform(value = "windows", link = "opencv_ml481")},
target = "org.bytedeco.opencv.opencv_ml",
global = "org.bytedeco.opencv.global.opencv_ml"
)
Expand Down
Expand Up @@ -41,7 +41,7 @@
"<opencv2/objdetect/aruco_board.hpp>", "<opencv2/objdetect/aruco_dictionary.hpp>",
"<opencv2/objdetect/aruco_detector.hpp>", "<opencv2/objdetect/charuco_detector.hpp>"}, link = "opencv_objdetect@.408"),
@Platform(value = "ios", preload = "libopencv_objdetect"),
@Platform(value = "windows", link = "opencv_objdetect480")},
@Platform(value = "windows", link = "opencv_objdetect481")},
target = "org.bytedeco.opencv.opencv_objdetect",
global = "org.bytedeco.opencv.global.opencv_objdetect"
)
Expand Down
Expand Up @@ -36,7 +36,7 @@
value = {
@Platform(include = {"<opencv2/optflow.hpp>", "<opencv2/optflow/motempl.hpp>"}, link = "opencv_optflow@.408"),
@Platform(value = "ios", preload = "libopencv_optflow"),
@Platform(value = "windows", link = "opencv_optflow480")},
@Platform(value = "windows", link = "opencv_optflow481")},
target = "org.bytedeco.opencv.opencv_optflow",
global = "org.bytedeco.opencv.global.opencv_optflow"
)
Expand Down
Expand Up @@ -40,7 +40,7 @@
link = "opencv_phase_unwrapping@.408"
),
@Platform(value = "ios", preload = "libopencv_phase_unwrapping"),
@Platform(value = "windows", link = "opencv_phase_unwrapping480")
@Platform(value = "windows", link = "opencv_phase_unwrapping481")
},
target = "org.bytedeco.opencv.opencv_phase_unwrapping",
global = "org.bytedeco.opencv.global.opencv_phase_unwrapping"
Expand Down
Expand Up @@ -38,8 +38,8 @@
link = "opencv_photo@.408",
preload = {"opencv_cuda@.408", "opencv_cudaarithm@.408", "opencv_cudafilters@.408", "opencv_cudaimgproc@.408"}),
@Platform(value = "ios", preload = "libopencv_photo"),
@Platform(value = "windows", link = "opencv_photo480",
preload = {"opencv_cuda480", "opencv_cudaarithm480", "opencv_cudafilters480", "opencv_cudaimgproc480"})},
@Platform(value = "windows", link = "opencv_photo481",
preload = {"opencv_cuda481", "opencv_cudaarithm481", "opencv_cudafilters481", "opencv_cudaimgproc481"})},
target = "org.bytedeco.opencv.opencv_photo",
global = "org.bytedeco.opencv.global.opencv_photo"
)
Expand Down
Expand Up @@ -36,7 +36,7 @@
link = "opencv_plot@.408"
),
@Platform(value = "ios", preload = "libopencv_plot"),
@Platform(value = "windows", link = "opencv_plot480")
@Platform(value = "windows", link = "opencv_plot481")
},
target = "org.bytedeco.opencv.opencv_plot",
global = "org.bytedeco.opencv.global.opencv_plot"
Expand Down
Expand Up @@ -45,7 +45,7 @@
link = "opencv_quality@.408"
),
@Platform(value = "ios", preload = "libopencv_quality"),
@Platform(value = "windows", link = "opencv_quality480")
@Platform(value = "windows", link = "opencv_quality481")
},
target = "org.bytedeco.opencv.opencv_quality",
global = "org.bytedeco.opencv.global.opencv_quality"
Expand Down
Expand Up @@ -33,7 +33,7 @@
value = {
@Platform(include = "<opencv2/rapid.hpp>", link = "opencv_rapid@.408"),
@Platform(value = "ios", preload = "libopencv_rapid"),
@Platform(value = "windows", link = "opencv_rapid480")
@Platform(value = "windows", link = "opencv_rapid481")
},
target = "org.bytedeco.opencv.opencv_rapid",
global = "org.bytedeco.opencv.global.opencv_rapid"
Expand Down
Expand Up @@ -40,7 +40,7 @@
link = "opencv_saliency@.408"
),
@Platform(value = "ios", preload = "libopencv_saliency"),
@Platform(value = "windows", link = "opencv_saliency480")
@Platform(value = "windows", link = "opencv_saliency481")
},
target = "org.bytedeco.opencv.opencv_saliency",
global = "org.bytedeco.opencv.global.opencv_saliency"
Expand Down
Expand Up @@ -39,7 +39,7 @@
"<opencv2/shape.hpp>", "<opencv2/shape/emdL1.hpp>", "<opencv2/shape/shape_transformer.hpp>",
"<opencv2/shape/hist_cost.hpp>", "<opencv2/shape/shape_distance.hpp>"}, link = "opencv_shape@.408"),
@Platform(value = "ios", preload = "libopencv_shape"),
@Platform(value = "windows", link = "opencv_shape480")},
@Platform(value = "windows", link = "opencv_shape481")},
target = "org.bytedeco.opencv.opencv_shape",
global = "org.bytedeco.opencv.global.opencv_shape"
)
Expand Down
Expand Up @@ -43,8 +43,8 @@
link = "opencv_stitching@.408", preload = {"opencv_cuda@.408", "opencv_cudaarithm@.408", "opencv_cudafilters@.408",
"opencv_cudaimgproc@.408", "opencv_cudawarping@.408", "opencv_cudafeatures2d@.408", "opencv_cudalegacy@.408"}),
@Platform(value = "ios", preload = "libopencv_stitching"),
@Platform(value = "windows", link = "opencv_stitching480", preload = {"opencv_cuda480", "opencv_cudaarithm480", "opencv_cudafilters480",
"opencv_cudaimgproc480", "opencv_cudawarping480", "opencv_cudafeatures2d480", "opencv_cudalegacy480"})},
@Platform(value = "windows", link = "opencv_stitching481", preload = {"opencv_cuda481", "opencv_cudaarithm481", "opencv_cudafilters481",
"opencv_cudaimgproc481", "opencv_cudawarping481", "opencv_cudafeatures2d481", "opencv_cudalegacy481"})},
target = "org.bytedeco.opencv.opencv_stitching",
global = "org.bytedeco.opencv.global.opencv_stitching"
)
Expand Down
Expand Up @@ -41,7 +41,7 @@
link = "opencv_structured_light@.408"
),
@Platform(value = "ios", preload = "libopencv_structured_light"),
@Platform(value = "windows", link = "opencv_structured_light480")
@Platform(value = "windows", link = "opencv_structured_light481")
},
target = "org.bytedeco.opencv.opencv_structured_light",
global = "org.bytedeco.opencv.global.opencv_structured_light"
Expand Down
Expand Up @@ -39,10 +39,10 @@
preload = {"opencv_cuda@.408", "opencv_cudacodec@.408", "opencv_cudaarithm@.408", "opencv_cudafilters@.408",
"opencv_cudaimgproc@.408", "opencv_cudafeatures2d@.408", "opencv_cudalegacy@.408",
"opencv_cudaoptflow@.408", "opencv_cudawarping@.408"}),
@Platform(value = "windows", link = "opencv_superres480",
preload = {"opencv_cuda480", "opencv_cudacodec480", "opencv_cudaarithm480", "opencv_cudafilters480",
"opencv_cudaimgproc480", "opencv_cudafeatures2d480", "opencv_cudalegacy480",
"opencv_cudaoptflow480", "opencv_cudawarping480"})},
@Platform(value = "windows", link = "opencv_superres481",
preload = {"opencv_cuda481", "opencv_cudacodec481", "opencv_cudaarithm481", "opencv_cudafilters481",
"opencv_cudaimgproc481", "opencv_cudafeatures2d481", "opencv_cudalegacy481",
"opencv_cudaoptflow481", "opencv_cudawarping481"})},
target = "org.bytedeco.opencv.opencv_superres",
global = "org.bytedeco.opencv.global.opencv_superres"
)
Expand Down

0 comments on commit d5253f4

Please sign in to comment.