mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-27 22:11:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[OpenCV] fix protobuf references (#19770)

Browse Source 
* [OpenCV] fix protobuf targets

* [OpenCV] fix port versions

* [OpenCV] fix references
This commit is contained in:
Stefano Sinigardi 2021-09-04 07:25:12 +02:00 committed by GitHub
parent 698ffe5d25
commit 09019cbc9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 68 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/opencv3/0001-disable-downloading.patch
View File

@ -1,5 +1,3 @@
diff --git a/cmake/OpenCVDownload.cmake b/cmake/OpenCVDownload.cmake
index 63cf6d3..01e84a5 100644
--- a/cmake/OpenCVDownload.cmake
+++ b/cmake/OpenCVDownload.cmake
@@ -157,6 +157,9 @@ function(ocv_download)

6
ports/opencv3/0002-install-options.patch
View File

@ -1,5 +1,3 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f6a2da5..10aa531 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -607,7 +607,7 @@ endif()
@ -11,8 +9,6 @@ index f6a2da5..10aa531 100644
include(cmake/OpenCVDetectPython.cmake)
endif()
diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake
index 303d4f4..b727937 100644
--- a/cmake/OpenCVCompilerOptions.cmake
+++ b/cmake/OpenCVCompilerOptions.cmake
@@ -284,7 +284,6 @@ if(MSVC)
@ -23,8 +19,6 @@ index 303d4f4..b727937 100644
set(OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE} /debug")
set(OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE} /debug")
set(OPENCV_EXTRA_MODULE_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_MODULE_LINKER_FLAGS_RELEASE} /debug")
diff --git a/cmake/OpenCVGenConfig.cmake b/cmake/OpenCVGenConfig.cmake
index c7f9fc2..a1f657b 100644
--- a/cmake/OpenCVGenConfig.cmake
+++ b/cmake/OpenCVGenConfig.cmake
@@ -109,11 +109,11 @@ function(ocv_gen_config TMP_DIR NESTED_PATH ROOT_NAME)

2
ports/opencv3/0003-force-package-requirements.patch
View File

@ -1,5 +1,3 @@
diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake
index 2d28dff..6dbeca9 100644
--- a/cmake/OpenCVFindLibsGrfmt.cmake
+++ b/cmake/OpenCVFindLibsGrfmt.cmake
@@ -11,7 +11,7 @@ else()

2
ports/opencv3/0004-fix-eigen.patch
View File

@ -1,5 +1,3 @@
diff --git a/cmake/OpenCVFindLibsPerf.cmake b/cmake/OpenCVFindLibsPerf.cmake
index 3753084..0aeb31a 100644
--- a/cmake/OpenCVFindLibsPerf.cmake
+++ b/cmake/OpenCVFindLibsPerf.cmake
@@ -55,7 +55,7 @@ if(WITH_EIGEN AND NOT HAVE_EIGEN)

18
ports/opencv3/0005-fix-vtk9.patch
View File

@ -1,5 +1,3 @@
diff --git a/cmake/OpenCVDetectVTK.cmake b/cmake/OpenCVDetectVTK.cmake
index 1495688..e5c6049 100644
--- a/cmake/OpenCVDetectVTK.cmake
+++ b/cmake/OpenCVDetectVTK.cmake
@@ -1,12 +1,30 @@
@ -111,8 +109,6 @@ index 65571a1..e9a470c 100644
while (polygons->GetNextCell(nr_cell_points, cell_points))
{
*poly_ptr++ = nr_cell_points;
diff --git a/modules/viz/src/vizimpl.cpp b/modules/viz/src/vizimpl.cpp
index 23cba75..89f1249 100644
--- a/modules/viz/src/vizimpl.cpp
+++ b/modules/viz/src/vizimpl.cpp
@@ -55,8 +55,17 @@ cv::viz::Viz3d::VizImpl::VizImpl(const String &name) : spin_once_state_(false),
@ -135,8 +131,6 @@ index 23cba75..89f1249 100644
window_->AddRenderer(renderer_);
// Create the interactor style
diff --git a/modules/viz/src/vtk/vtkOBJWriter.cpp b/modules/viz/src/vtk/vtkOBJWriter.cpp
index 296b6eb..2e5764f 100644
--- a/modules/viz/src/vtk/vtkOBJWriter.cpp
+++ b/modules/viz/src/vtk/vtkOBJWriter.cpp
@@ -72,7 +72,7 @@ void cv::viz::vtkOBJWriter::WriteData()
@ -188,8 +182,6 @@ index 296b6eb..2e5764f 100644
vtkCellArray *cells = input->GetStrips();
for (cells->InitTraversal(); cells->GetNextCell(npts, index); )
{
diff --git a/modules/viz/src/vtk/vtkXYZReader.cpp b/modules/viz/src/vtk/vtkXYZReader.cpp
index 57726ea..3b9265f 100644
--- a/modules/viz/src/vtk/vtkXYZReader.cpp
+++ b/modules/viz/src/vtk/vtkXYZReader.cpp
@@ -77,7 +77,7 @@ int cv::viz::vtkXYZReader::RequestData(vtkInformation*, vtkInformationVector**,
@ -201,8 +193,6 @@ index 57726ea..3b9265f 100644
if(!fin)
{
vtkErrorMacro("Error opening file " << this->FileName);
diff --git a/modules/viz/src/vtk/vtkXYZWriter.cpp b/modules/viz/src/vtk/vtkXYZWriter.cpp
index cf95e3c..56a26b3 100644
--- a/modules/viz/src/vtk/vtkXYZWriter.cpp
+++ b/modules/viz/src/vtk/vtkXYZWriter.cpp
@@ -69,7 +69,7 @@ void cv::viz::vtkXYZWriter::WriteData()
@ -214,8 +204,6 @@ index cf95e3c..56a26b3 100644
if (outfilep->fail())
{
vtkErrorMacro(<< "Unable to open file: "<< this->FileName);
diff --git a/modules/viz/test/test_tutorial2.cpp b/modules/viz/test/test_tutorial2.cpp
index 6b2972f..a4b5b99 100644
--- a/modules/viz/test/test_tutorial2.cpp
+++ b/modules/viz/test/test_tutorial2.cpp
@@ -28,7 +28,7 @@ static void tutorial2()
@ -236,8 +224,6 @@ index 6b2972f..a4b5b99 100644
}
}
diff --git a/modules/viz/test/test_tutorial3.cpp b/modules/viz/test/test_tutorial3.cpp
index 232130f..32e33b1 100644
--- a/modules/viz/test/test_tutorial3.cpp
+++ b/modules/viz/test/test_tutorial3.cpp
@@ -48,7 +48,7 @@ static void tutorial3(bool camera_pov)
@ -249,8 +235,6 @@ index 232130f..32e33b1 100644
}
TEST(Viz, tutorial3_global_view)
diff --git a/modules/viz/test/test_viz3d.cpp b/modules/viz/test/test_viz3d.cpp
index cdf8a00..4ab05c3 100644
--- a/modules/viz/test/test_viz3d.cpp
+++ b/modules/viz/test/test_viz3d.cpp
@@ -59,7 +59,7 @@ TEST(Viz_viz3d, DISABLED_develop)
@ -262,8 +246,6 @@ index cdf8a00..4ab05c3 100644
}
}} // namespace
diff --git a/modules/viz/test/tests_simple.cpp b/modules/viz/test/tests_simple.cpp
index 12d696d..5584483 100644
--- a/modules/viz/test/tests_simple.cpp
+++ b/modules/viz/test/tests_simple.cpp
@@ -56,7 +56,7 @@ TEST(Viz, show_cloud_bluberry)

2
ports/opencv3/0006-fix-uwp.patch
View File

@ -1,5 +1,3 @@
diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake
index 5501b99..578b00e 100644
--- a/cmake/OpenCVModule.cmake
+++ b/cmake/OpenCVModule.cmake
@@ -1188,7 +1188,7 @@ function(ocv_add_perf_tests)

2
ports/opencv3/0007-fix-hdf5.patch
View File

@ -1,5 +1,3 @@
diff --git a/modules/hdf/CMakeLists.txt b/modules/hdf/CMakeLists.txt
index 2a1ae68..e40a192 100644
--- a/modules/hdf/CMakeLists.txt
+++ b/modules/hdf/CMakeLists.txt
@@ -1,25 +1,8 @@

4
ports/opencv3/0008-devendor-quirc.patch
View File

@ -1,5 +1,3 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 10aa531..74e5ca4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -778,7 +778,7 @@ if(WITH_OPENVX)
@ -11,8 +9,6 @@ index 10aa531..74e5ca4 100644
set(HAVE_QUIRC TRUE)
endif()
# ----------------------------------------------------------------------------
diff --git a/modules/objdetect/CMakeLists.txt b/modules/objdetect/CMakeLists.txt
index 414e578..4f26d75 100644
--- a/modules/objdetect/CMakeLists.txt
+++ b/modules/objdetect/CMakeLists.txt
@@ -2,7 +2,5 @@ set(the_description "Object Detection")

26
ports/opencv3/0009-fix-protobuf.patch Normal file
View File

@ -0,0 +1,26 @@
--- a/cmake/OpenCVFindProtobuf.cmake
+++ b/cmake/OpenCVFindProtobuf.cmake
@@ -31,7 +31,7 @@ if(BUILD_PROTOBUF)
set(HAVE_PROTOBUF TRUE)
else()
unset(Protobuf_VERSION CACHE)
- find_package(Protobuf QUIET)
+ find_package(Protobuf CONFIG REQUIRED)
# Backwards compatibility
# Define camel case versions of input variables
@@ -76,6 +76,7 @@ if(HAVE_PROTOBUF)
if(NOT BUILD_PROTOBUF)
if(TARGET "${Protobuf_LIBRARIES}")
get_target_property(__location "${Protobuf_LIBRARIES}" IMPORTED_LOCATION_RELEASE)
+ get_target_property(__location_debug "${Protobuf_LIBRARIES}" IMPORTED_LOCATION_DEBUG)
if(NOT __location)
get_target_property(__location "${Protobuf_LIBRARIES}" IMPORTED_LOCATION)
endif()
@@ -87,5 +88,5 @@ if(HAVE_PROTOBUF)
endif()
list(APPEND CUSTOM_STATUS_protobuf " Protobuf:"
BUILD_PROTOBUF THEN "build (${Protobuf_VERSION})"
- ELSE "${__location} (${Protobuf_VERSION})")
+ ELSE "optimized ${__location} debug ${__location_debug} ; version (${Protobuf_VERSION})")
endif()

2
ports/opencv3/0010-fix-uwp-tiff-imgcodecs.patch
View File

@ -1,5 +1,3 @@
diff --git a/modules/imgcodecs/CMakeLists.txt b/modules/imgcodecs/CMakeLists.txt
index 24f89e6..435deb6 100644
--- a/modules/imgcodecs/CMakeLists.txt
+++ b/modules/imgcodecs/CMakeLists.txt
@@ -9,6 +9,10 @@ ocv_add_module(imgcodecs opencv_imgproc WRAP java objc python)

1
ports/opencv3/portfile.cmake
View File

@ -22,6 +22,7 @@ vcpkg_from_github(
0005-fix-vtk9.patch
0006-fix-uwp.patch
0008-devendor-quirc.patch
0009-fix-protobuf.patch
0010-fix-uwp-tiff-imgcodecs.patch
)

1
ports/opencv3/vcpkg.json
View File

@ -1,6 +1,7 @@
{
"name": "opencv3",
"version": "3.4.15",
"port-version": 1,
"description": "computer vision library",
"homepage": "https://github.com/opencv/opencv",
"dependencies": [

2
ports/opencv4/0001-disable-downloading.patch
View File

@ -1,5 +1,3 @@
diff --git a/cmake/OpenCVDownload.cmake b/cmake/OpenCVDownload.cmake
index 63cf6d3..01e84a5 100644
--- a/cmake/OpenCVDownload.cmake
+++ b/cmake/OpenCVDownload.cmake
@@ -157,6 +157,9 @@ function(ocv_download)

8
ports/opencv4/0002-install-options.patch
View File

@ -1,5 +1,3 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 49abe01..b51bcde 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -616,7 +616,7 @@ endif()
@ -11,8 +9,6 @@ index 49abe01..b51bcde 100644
include(cmake/OpenCVDetectPython.cmake)
endif()
diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake
index 6e56a2e..11034db 100644
--- a/cmake/OpenCVCompilerOptions.cmake
+++ b/cmake/OpenCVCompilerOptions.cmake
@@ -286,7 +286,6 @@ if(MSVC)
@ -23,8 +19,6 @@ index 6e56a2e..11034db 100644
set(OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE} /debug")
set(OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE} /debug")
set(OPENCV_EXTRA_MODULE_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_MODULE_LINKER_FLAGS_RELEASE} /debug")
diff --git a/cmake/OpenCVGenConfig.cmake b/cmake/OpenCVGenConfig.cmake
index 838852c..04906b3 100644
--- a/cmake/OpenCVGenConfig.cmake
+++ b/cmake/OpenCVGenConfig.cmake
@@ -114,11 +114,11 @@ function(ocv_gen_config TMP_DIR NESTED_PATH ROOT_NAME)
@ -50,8 +44,6 @@ index 838852c..04906b3 100644
if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows AND NOT OPENCV_SKIP_CMAKE_ROOT_CONFIG)
ocv_gen_config("${CMAKE_BINARY_DIR}/win-install"
"${OPENCV_INSTALL_BINARIES_PREFIX}${OPENCV_INSTALL_BINARIES_SUFFIX}"
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 1f0d720..0bb1ff7 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -1,8 +1,6 @@

2
ports/opencv4/0003-force-package-requirements.patch
View File

@ -1,5 +1,3 @@
diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake
index 23a6ca6..8ea5497 100644
--- a/cmake/OpenCVFindLibsGrfmt.cmake
+++ b/cmake/OpenCVFindLibsGrfmt.cmake
@@ -11,7 +11,7 @@ else()

2
ports/opencv4/0004-fix-policy-CMP0057.patch
View File

@ -1,5 +1,3 @@
diff --git a/modules/videoio/CMakeLists.txt b/modules/videoio/CMakeLists.txt
index 534fcf0..a02460c 100644
--- a/modules/videoio/CMakeLists.txt
+++ b/modules/videoio/CMakeLists.txt
@@ -1,3 +1,4 @@

2
ports/opencv4/0005-fix-eigen.patch
View File

@ -1,5 +1,3 @@
diff --git a/cmake/OpenCVFindLibsPerf.cmake b/cmake/OpenCVFindLibsPerf.cmake
index 3753084..0aeb31a 100644
--- a/cmake/OpenCVFindLibsPerf.cmake
+++ b/cmake/OpenCVFindLibsPerf.cmake
@@ -55,7 +55,7 @@ if(WITH_EIGEN AND NOT HAVE_EIGEN)

2
ports/opencv4/0006-fix-uwp.patch
View File

@ -1,5 +1,3 @@
diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake
index 7c48aad..0d261b0 100644
--- a/cmake/OpenCVModule.cmake
+++ b/cmake/OpenCVModule.cmake
@@ -1205,7 +1205,7 @@ function(ocv_add_perf_tests)

2
ports/opencv4/0007-fix-hdf5.patch
View File

@ -1,5 +1,3 @@
diff --git a/modules/hdf/CMakeLists.txt b/modules/hdf/CMakeLists.txt
index 2a1ae68..e40a192 100644
--- a/modules/hdf/CMakeLists.txt
+++ b/modules/hdf/CMakeLists.txt
@@ -1,25 +1,8 @@

4
ports/opencv4/0008-devendor-quirc.patch
View File

@ -1,5 +1,3 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b51bcde..15edc92 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -803,7 +803,7 @@ if(WITH_OPENVX)
@ -11,8 +9,6 @@ index b51bcde..15edc92 100644
set(HAVE_QUIRC TRUE)
endif()
diff --git a/modules/objdetect/CMakeLists.txt b/modules/objdetect/CMakeLists.txt
index 3fa0c5d..f4c0ad6 100644
--- a/modules/objdetect/CMakeLists.txt
+++ b/modules/objdetect/CMakeLists.txt
@@ -2,7 +2,5 @@ set(the_description "Object Detection")

26
ports/opencv4/0009-fix-protobuf.patch Normal file
View File

@ -0,0 +1,26 @@
--- a/cmake/OpenCVFindProtobuf.cmake
+++ b/cmake/OpenCVFindProtobuf.cmake
@@ -31,7 +31,7 @@ if(BUILD_PROTOBUF)
set(HAVE_PROTOBUF TRUE)
else()
unset(Protobuf_VERSION CACHE)
- find_package(Protobuf QUIET)
+ find_package(Protobuf CONFIG REQUIRED)
# Backwards compatibility
# Define camel case versions of input variables
@@ -76,6 +76,7 @@ if(HAVE_PROTOBUF)
if(NOT BUILD_PROTOBUF)
if(TARGET "${Protobuf_LIBRARIES}")
get_target_property(__location "${Protobuf_LIBRARIES}" IMPORTED_LOCATION_RELEASE)
+ get_target_property(__location_debug "${Protobuf_LIBRARIES}" IMPORTED_LOCATION_DEBUG)
if(NOT __location)
get_target_property(__location "${Protobuf_LIBRARIES}" IMPORTED_LOCATION)
endif()
@@ -87,5 +88,5 @@ if(HAVE_PROTOBUF)
endif()
list(APPEND CUSTOM_STATUS_protobuf " Protobuf:"
BUILD_PROTOBUF THEN "build (${Protobuf_VERSION})"
- ELSE "${__location} (${Protobuf_VERSION})")
+ ELSE "optimized ${__location} debug ${__location_debug} ; version (${Protobuf_VERSION})")
endif()

2
ports/opencv4/0010-fix-uwp-tiff-imgcodecs.patch
View File

@ -1,5 +1,3 @@
diff --git a/modules/imgcodecs/CMakeLists.txt b/modules/imgcodecs/CMakeLists.txt
index 24f89e6..435deb6 100644
--- a/modules/imgcodecs/CMakeLists.txt
+++ b/modules/imgcodecs/CMakeLists.txt
@@ -9,6 +9,10 @@ ocv_add_module(imgcodecs opencv_imgproc WRAP java objc python)

1
ports/opencv4/portfile.cmake
View File

@ -22,6 +22,7 @@ vcpkg_from_github(
0005-fix-eigen.patch
0006-fix-uwp.patch
0008-devendor-quirc.patch
0009-fix-protobuf.patch
0010-fix-uwp-tiff-imgcodecs.patch
)

1
ports/opencv4/vcpkg.json
View File

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

4
versions/baseline.json
View File

@ -4674,11 +4674,11 @@
},
"opencv3": {
"baseline": "3.4.15",
"port-version": 0
"port-version": 1
},
"opencv4": {
"baseline": "4.5.3",
"port-version": 0
"port-version": 1
},
"opendnp3": {
"baseline": "3.1.0",

5
versions/o-/opencv3.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "47b6ae97aeb00ba20b231fdbb2fa043cdc5de2c5",
"version": "3.4.15",
"port-version": 1
},
{
"git-tree": "cb4ed9774da974697dde70c75cbf9639e9209673",
"version": "3.4.15",

5
versions/o-/opencv4.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9d18da7f0c17619f7912a5d53b0316c7a18d625a",
"version": "4.5.3",
"port-version": 1
},
{
"git-tree": "f7110f51e74414c1111a6403d1979f7786c5f2ad",
"version": "4.5.3",