3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-15 03:37:58 +08:00
Code Issues Projects Releases Wiki Activity

[opencv] Add Patch to Skip ZLIB Hacks (#23132)

Browse Source
This commit is contained in:
Bobby Reynolds 2022-02-16 21:54:38 -08:00 committed by GitHub
parent 6647a76be8
commit f54a7b0013
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 44 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ports/opencv3/0012-fix-zlib.patch Normal file
View File

@ -0,0 +1,14 @@
diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake
index 6dbeca9..08e2f4a 100644
--- a/cmake/OpenCVFindLibsGrfmt.cmake
+++ b/cmake/OpenCVFindLibsGrfmt.cmake
@@ -5,6 +5,9 @@
# --- zlib (required) ---
if(BUILD_ZLIB)
ocv_clear_vars(ZLIB_FOUND)
+elseif(1)
+ ocv_clear_internal_cache_vars(ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
+ find_package(ZLIB "${MIN_VER_ZLIB}" REQUIRED)
else()
ocv_clear_internal_cache_vars(ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
if(ANDROID)

1
ports/opencv3/portfile.cmake
View File

@ -26,6 +26,7 @@ vcpkg_from_github(
0009-fix-protobuf.patch 0009-fix-protobuf.patch
0010-fix-uwp-tiff-imgcodecs.patch 0010-fix-uwp-tiff-imgcodecs.patch
0011-remove-python2.patch 0011-remove-python2.patch
0012-fix-zlib.patch
) )
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")

2
ports/opencv3/vcpkg.json
View File

@ -1,7 +1,7 @@
{ {
"name": "opencv3", "name": "opencv3",
"version": "3.4.16", "version": "3.4.16",
"port-version": 2, "port-version": 3,
"description": "computer vision library", "description": "computer vision library",
"homepage": "https://github.com/opencv/opencv", "homepage": "https://github.com/opencv/opencv",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",

14
ports/opencv4/0012-fix-zlib.patch Normal file
View File

@ -0,0 +1,14 @@
diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake
index 8ea5497..7ed3f6b 100644
--- a/cmake/OpenCVFindLibsGrfmt.cmake
+++ b/cmake/OpenCVFindLibsGrfmt.cmake
@@ -5,6 +5,9 @@
# --- zlib (required) ---
if(BUILD_ZLIB)
ocv_clear_vars(ZLIB_FOUND)
+elseif(1)
+ ocv_clear_internal_cache_vars(ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
+ find_package(ZLIB "${MIN_VER_ZLIB}" REQUIRED)
else()
ocv_clear_internal_cache_vars(ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
if(ANDROID)

1
ports/opencv4/portfile.cmake
View File

@ -26,6 +26,7 @@ vcpkg_from_github(
0009-fix-protobuf.patch 0009-fix-protobuf.patch
0010-fix-uwp-tiff-imgcodecs.patch 0010-fix-uwp-tiff-imgcodecs.patch
0011-remove-python2.patch 0011-remove-python2.patch
0012-fix-zlib.patch
) )
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")

2
ports/opencv4/vcpkg.json
View File

@ -1,7 +1,7 @@
{ {
"name": "opencv4", "name": "opencv4",
"version": "4.5.4", "version": "4.5.4",
"port-version": 3, "port-version": 4,
"description": "computer vision library", "description": "computer vision library",
"homepage": "https://github.com/opencv/opencv", "homepage": "https://github.com/opencv/opencv",
"dependencies": [ "dependencies": [

4
versions/baseline.json
View File

@ -5002,11 +5002,11 @@
}, },
"opencv3": { "opencv3": {
"baseline": "3.4.16", "baseline": "3.4.16",
"port-version": 2 "port-version": 3
}, },
"opencv4": { "opencv4": {
"baseline": "4.5.4", "baseline": "4.5.4",
"port-version": 3 "port-version": 4
}, },
"opendnp3": { "opendnp3": {
"baseline": "3.1.1", "baseline": "3.1.1",

5
versions/o-/opencv3.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "76d605b750c5535590489574dc24fa30ffe249f8",
"version": "3.4.16",
"port-version": 3
},
{ {
"git-tree": "a11dd583ecb7212732fedb0ab3e3308ea84f10d9", "git-tree": "a11dd583ecb7212732fedb0ab3e3308ea84f10d9",
"version": "3.4.16", "version": "3.4.16",

5
versions/o-/opencv4.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "ce474a40e6572ced8dd1229f22f6cbed9cc74212",
"version": "4.5.4",
"port-version": 4
},
{ {
"git-tree": "b170a087d34521462cd247a24f230627a272975e", "git-tree": "b170a087d34521462cd247a24f230627a272975e",
"version": "4.5.4", "version": "4.5.4",