From 869a41c4684086733ad7e0130be12eed9c5e2c8e Mon Sep 17 00:00:00 2001 From: Ladislav Zitka Date: Tue, 2 Jan 2024 18:22:25 +0100 Subject: [PATCH 1/2] Fixed zlib url. --- arrow/cppbuild.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arrow/cppbuild.sh b/arrow/cppbuild.sh index e1e61846524..99c357b9e7b 100755 --- a/arrow/cppbuild.sh +++ b/arrow/cppbuild.sh @@ -20,7 +20,7 @@ ARROW_VERSION=6.0.1 download https://github.com/llvm/llvm-project/releases/download/llvmorg-$LLVM_VERSION/llvm-project-$LLVM_VERSION.src.tar.xz llvm-project-$LLVM_VERSION.src.tar.xz download https://github.com/python/cpython-bin-deps/archive/openssl-bin.zip cpython-bin-deps-openssl-bin.zip download https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz openssl-$OPENSSL_VERSION.tar.gz -download http://zlib.net/zlib-$ZLIB_VERSION.tar.gz zlib-$ZLIB_VERSION.tar.gz +download http://zlib.net/fossils/zlib-$ZLIB_VERSION.tar.gz zlib-$ZLIB_VERSION.tar.gz download https://github.com/google/protobuf/releases/download/v$PROTO_VERSION/protobuf-cpp-$PROTO_VERSION.tar.gz protobuf-$PROTO_VERSION.tar.gz download https://archive.apache.org/dist/arrow/arrow-$ARROW_VERSION/apache-arrow-$ARROW_VERSION.tar.gz apache-arrow-$ARROW_VERSION.tar.gz From 6c4770dea48de702116dfe1599f7da08dba2de1a Mon Sep 17 00:00:00 2001 From: Samuel Audet Date: Wed, 3 Jan 2024 11:09:10 +0900 Subject: [PATCH 2/2] Fix builds for OpenCV and FFmpeg too --- ffmpeg/platform/gpl/pom.xml | 2 +- opencv/src/main/java/org/bytedeco/opencv/opencv_java.java | 3 ++- opencv/src/main/java/org/bytedeco/opencv/opencv_python3.java | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ffmpeg/platform/gpl/pom.xml b/ffmpeg/platform/gpl/pom.xml index b9da2a451b3..f8b2d7a9264 100644 --- a/ffmpeg/platform/gpl/pom.xml +++ b/ffmpeg/platform/gpl/pom.xml @@ -12,7 +12,7 @@ org.bytedeco ffmpeg-platform-gpl - 6.0-${project.parent.version} + 6.1-${project.parent.version} JavaCPP Presets Platform for FFmpeg (GPL enabled) diff --git a/opencv/src/main/java/org/bytedeco/opencv/opencv_java.java b/opencv/src/main/java/org/bytedeco/opencv/opencv_java.java index 6ce4c94ccc4..03a78f67b88 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/opencv_java.java +++ b/opencv/src/main/java/org/bytedeco/opencv/opencv_java.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2022 Samuel Audet + * Copyright (C) 2018-2024 Samuel Audet * * Licensed either under the Apache License, Version 2.0, or (at your option) * under the terms of the GNU General Public License as published by @@ -50,6 +50,7 @@ opencv_xphoto.class, opencv_barcode.class, opencv_wechat_qrcode.class, + opencv_dnn_superres.class, }, value = { @Platform(preload = {"opencv_cuda@.409", "opencv_cudaarithm@.409", "opencv_cudafilters@.409", "opencv_cudaimgproc@.409", "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 index 65603803f72..119f2062419 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/opencv_python3.java +++ b/opencv/src/main/java/org/bytedeco/opencv/opencv_python3.java @@ -67,10 +67,10 @@ value = { @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"}), + "opencv_cudafeatures2d@.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"}), + "opencv_cudafeatures2d490", "opencv_cudaoptflow490", "opencv_cudawarping490", "opencv_cudalegacy490"}), } ) public class opencv_python3 {