OpenCV 4.5.3 support
MODIFY
.github/workflows/opencv-rust.yml
.github/workflows/opencv-rust.yml
@@ -22,13 +22,13 @@ jobs:
- stable
- beta
version:
- - opencv: 3.4.14
- - opencv: 4.5.2
+ - opencv: 3.4.15
+ - opencv: 4.5.3
exclude:
- os:
family: osx
version:
- opencv: 3.4.14
+ opencv: 3.4.15
runs-on: ${{ matrix.os.image }}
env:
OS_FAMILY: ${{ matrix.os.family }}
@@ -129,29 +129,32 @@ jobs:
- stable
- beta
version:
- - opencv: 3.2.0
- brew: "@2"
- - opencv: 3.4.14
+ - branch: 3.2
+ opencv: 3.2.0
+ brew: "excluded"
+ - branch: 3.4
+ opencv: 3.4.14
brew: "@3"
- - opencv: 4.5.2
+ - branch: 4
+ opencv: 4.5.2
brew: "@4"
exclude:
- os:
family: osx
version:
- brew: "@2"
+ branch: 3.2
- os:
family: windows
version:
- opencv: 3.2.0
+ branch: 3.2
- os:
family: linux
version:
- opencv: 3.4.14
+ branch: 3.4
- os:
family: linux
version:
- opencv: 4.5.2
+ branch: 4
runs-on: ${{ matrix.os.image }}
env:
OS_FAMILY: ${{ matrix.os.family }}

MODIFY
binding-generator/src/settings.rs
binding-generator/src/settings.rs
@@ -956,6 +956,7 @@ pub static NO_SKIP_NAMESPACE_IN_LOCALNAME: Lazy<HashMap<&str, HashMap<&str, &str
"dynafu" => "Dynafu",
"fisheye" => "Fisheye",
"kinfu" => "Kinfu",
+ "colored_kinfu" => "ColoredKinfu",
"linemod" => "Linemod",
"superres" => "Superres",
},

MODIFY
ci/install-bionic-vcpkg.sh
ci/install-bionic-vcpkg.sh
@@ -11,7 +11,8 @@ if [ ! -e "$VCPKG_ROOT" ]; then
fi
pushd "$VCPKG_ROOT"
git fetch --all --prune --tags
-git checkout 2020.11-1
+git checkout .
+git checkout 2021.05.12
./bootstrap-vcpkg.sh -disableMetrics
#./vcpkg integrate install
echo "set(VCPKG_BUILD_TYPE release)" >> triplets/x64-linux.cmake
@@ -20,6 +21,6 @@ export VCPKG_DEFAULT_TRIPLET=x64-linux
sudo apt-get install -y clang
# workaround to make clang_sys crate detect installed libclang
sudo ln -s libclang.so.1 /usr/lib/llvm-6.0/lib/libclang.so
-./vcpkg install "opencv${VCPKG_OPENCV_VERSION}[contrib,nonfree]"
./vcpkg upgrade --no-dry-run
+./vcpkg install --recurse "opencv${VCPKG_OPENCV_VERSION}[contrib,nonfree]"
popd

MODIFY
ci/install-windows-chocolatey.sh
ci/install-windows-chocolatey.sh
set -vex
-choco install -y llvm --version 11.1.0
+choco install -y llvm --version 12.0.0
choco install -y opencv --version "$CHOCO_OPENCV_VERSION"

MODIFY
ci/install-windows-vcpkg.sh
ci/install-windows-vcpkg.sh
@@ -12,7 +12,7 @@ fi
pushd "$VCPKG_ROOT"
git fetch --all --prune --tags
git checkout .
-git checkout 2020.11-1
+git checkout 2021.05.12
cmd "/C bootstrap-vcpkg.bat -disableMetrics"
#./vcpkg integrate install
echo "set(VCPKG_BUILD_TYPE release)" >> triplets/x64-windows.cmake
@@ -20,7 +20,7 @@ echo "set(VCPKG_BUILD_TYPE release)" >> triplets/x64-windows-static.cmake
echo "set(VCPKG_BUILD_TYPE release)" >> triplets/x86-windows.cmake
export VCPKG_DEFAULT_TRIPLET=x64-windows
#./vcpkg install llvm # takes very long time
-choco install -y llvm --version 11.0.0
-./vcpkg install "opencv${VCPKG_OPENCV_VERSION}[contrib,nonfree]"
+choco install -y llvm --version 12.0.0
./vcpkg upgrade --no-dry-run
+./vcpkg install --recurse "opencv${VCPKG_OPENCV_VERSION}[contrib,nonfree]"
popd

MODIFY
ci/script.sh
ci/script.sh
@@ -39,6 +39,8 @@ elif [[ "$OS_FAMILY" == "linux" ]]; then
export VCPKG_ROOT="$HOME/build/vcpkg"
echo "=== Installed vcpkg packages:"
"$VCPKG_ROOT/vcpkg" list
+ # link order is often broken when vcpkg detection on Linux is used
+ export OPENCV_LINK_LIBS="+,opencv_imgcodecs,opencv_imgproc,opencv_core,png,tiff,jpeg,webp,lzma,z"
fi
fi

MODIFY
tools/generate-bindings.sh
tools/generate-bindings.sh
@@ -17,6 +17,7 @@ fi
all_modules="alphamat
aruco
+ barcode
bgsegm
bioinspired
calib3d

OpenCV 4.5.3 support