Fix opencv4 baseline (#46476)

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
This commit is contained in:
autoantwort 2025-07-23 11:58:14 +02:00 committed by GitHub
parent 7bc2cb97d8
commit f5800a22ac
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 54 additions and 8 deletions

View File

@ -0,0 +1,13 @@
diff --git a/modules/core/src/utils/filesystem.cpp b/modules/core/src/utils/filesystem.cpp
index 0a44d48..2d609fd 100644
--- a/modules/core/src/utils/filesystem.cpp
+++ b/modules/core/src/utils/filesystem.cpp
@@ -439,7 +439,7 @@ cv::String getCacheDirectory(const char* sub_directory_name, const char* configu
cv::String default_cache_path;
#ifdef _WIN32
char tmp_path_buf[MAX_PATH+1] = {0};
- DWORD res = GetTempPath(MAX_PATH, tmp_path_buf);
+ DWORD res = GetTempPathA(MAX_PATH, tmp_path_buf);
if (res > 0 && res <= MAX_PATH)
{
default_cache_path = tmp_path_buf;

View File

@ -22,6 +22,7 @@ vcpkg_from_github(
0015-fix-freetype.patch
0017-fix-flatbuffers.patch
0019-opencl-kernel.patch
0020-fix-narrow-filesystem.diff
)
vcpkg_find_acquire_program(PKGCONFIG)

View File

@ -1,7 +1,7 @@
{
"name": "opencv4",
"version": "4.11.0",
"port-version": 1,
"port-version": 2,
"description": "computer vision library",
"homepage": "https://github.com/opencv/opencv",
"license": "Apache-2.0",

View File

@ -362,6 +362,19 @@ opencl:arm-uwp=fail
opencl:x64-uwp=fail
opencsg:arm-uwp=fail
opencsg:x64-uwp=fail
opencv4[core,cuda,world](windows)=options
opencv4[dnn]:arm64-osx=feature-fails
opencv4[dnn](arm & windows & !uwp) = feature-fails
opencv4[dshow](!windows | uwp)=feature-fails
opencv4[halide](!android & !(windows & staticcrt) & !uwp & !(arm & windows))=feature-fails # error C2039: 'attachHalide': is not a member of 'cv::dnn::GeluFunctor'
opencv4[halide](android | (windows & staticcrt) | uwp | (arm & windows))=cascade
opencv4[opengl]:x64-linux=feature-fails
opencv4[opengl](android)=feature-fails
opencv4[opengl](windows&!uwp)=feature-fails # Option WITH_OPENGL is enabled but corresponding dependency have not been found: "HAVE_OPENGL" is FALSE
opencv4[openvino]:arm64-osx=feature-fails
opencv4[ovis](android)=feature-fails
opencv4[vulkan]:arm64-osx=feature-fails
opencv4[vulkan](arm & windows & !uwp) = feature-fails
opendnp3:arm-uwp=fail
opendnp3:x64-uwp=fail
openmama:x64-windows-static-md=fail
@ -1524,15 +1537,29 @@ opencv3[cuda,dc1394,gdcm,gtk,halide,qt,vtk]:arm64-windows = cascade
opencv3[dc1394,cuda]:x64-windows = cascade
opencv3[dc1394,cuda,gtk]:x64-windows-static-md = cascade
opencv3[dc1394,halide,cuda,gtk]:x64-windows-static = cascade
opencv4[aravis](uwp | xbox) = cascade
opencv4[cuda](!((windows & x64 & !uwp & !xbox) | (linux & x64) | (linux & arm64))) = cascade
opencv4[cuda,cudnn](osx) = cascade
opencv4[cuda,cudnn,dc1394,dnn-cuda]:x86-windows = cascade
opencv4[cuda,cudnn,dc1394,dnn-cuda,freetype,gdcm,gstreamer,halide,openexr,opengl,ovis,python,qt,sfm,tbb,vtk]:arm64-uwp = cascade
opencv4[cuda,cudnn,dc1394,dnn-cuda,freetype,gdcm,gstreamer,halide,openexr,opengl,ovis,python,qt,sfm,tbb,vtk]:x64-uwp = cascade
opencv4[cuda,cudnn,dc1394,dnn-cuda,gdcm,halide,vtk]:arm64-windows = cascade
opencv4[dc1394,cudnn,dnn-cuda]:x64-windows = cascade
opencv4[dc1394,cudnn,dnn-cuda]:x64-windows-static-md = cascade
opencv4[dc1394,halide,cudnn,dnn-cuda]:x64-windows-static = cascade
opencv4[cuda,cudnn,dc1394,dnn-cuda,freetype,gdcm,gstreamer,openexr,opengl,ovis,python,qt,sfm,tbb,vtk]:arm64-uwp = cascade
opencv4[cuda,cudnn,dc1394,dnn-cuda,freetype,gdcm,gstreamer,openexr,ovis,python,qt,sfm,tbb,vtk]:x64-uwp = cascade
opencv4[cuda,cudnn,dc1394,dnn-cuda,vtk]:arm64-windows = cascade
opencv4[cudnn](!((windows & x64 & !uwp & !xbox) | (linux & x64) | (linux & arm64)) | !((windows & x64 & !uwp) | (linux & x64) | (linux & arm64))) = cascade
opencv4[dc1394](windows) = cascade
opencv4[dnn-cuda](!((windows & x64 & !uwp & !xbox) | (linux & x64) | (linux & arm64)) | !((windows & x64 & !uwp) | (linux & x64) | (linux & arm64))) = cascade
opencv4[dnn-cuda](osx) = cascade
opencv4[freetype](uwp) = cascade
opencv4[gdcm](uwp) = cascade
opencv4[gstreamer](uwp | xbox) = cascade
opencv4[opencl](uwp) = cascade
opencv4[openexr](uwp) = cascade
opencv4[opengl](uwp | xbox) = cascade
opencv4[openvino](windows & arm) = cascade
opencv4[qt](uwp | ios | xbox) = cascade
opencv4[sfm](uwp) = cascade
opencv4[tbb](uwp) = cascade
opencv4[vtk]:arm64-windows-static-md = cascade
opencv4[vtk](uwp | xbox) = cascade
openimageio:arm64-uwp = cascade
openimageio:x64-uwp = cascade
openimageio[pybind11]:arm64-windows = cascade

View File

@ -6990,7 +6990,7 @@
},
"opencv4": {
"baseline": "4.11.0",
"port-version": 1
"port-version": 2
},
"opendnp3": {
"baseline": "3.1.1",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5046c8873031518509958aa1b583deed99ac1355",
"version": "4.11.0",
"port-version": 2
},
{
"git-tree": "b688846a47f3610083dfd9aa65ca7f85b5b5b8e1",
"version": "4.11.0",