diff --git a/ports/opencv/vcpkg.json b/ports/opencv/vcpkg.json index 6732038cd64853..5e24959bdd445a 100644 --- a/ports/opencv/vcpkg.json +++ b/ports/opencv/vcpkg.json @@ -1,6 +1,7 @@ { "name": "opencv", "version": "4.5.5", + "port-version": 1, "description": "Computer vision library", "homepage": "https://github.com/opencv/opencv", "dependencies": [ @@ -61,6 +62,18 @@ } ] }, + "dc1394": { + "description": "Dc1394 support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "dc1394" + ] + } + ] + }, "default-features": { "description": "Platform-dependent default features", "dependencies": [ diff --git a/ports/opencv2/portfile.cmake b/ports/opencv2/portfile.cmake index 7558f1268a8363..c45f4c7b2fbaa3 100644 --- a/ports/opencv2/portfile.cmake +++ b/ports/opencv2/portfile.cmake @@ -39,6 +39,7 @@ FEATURES "qt" WITH_QT "tiff" WITH_TIFF "world" BUILD_opencv_world + "dc1394" WITH_1394 ) set(WITH_MSMF ON) diff --git a/ports/opencv2/vcpkg.json b/ports/opencv2/vcpkg.json index 92e7087f7ea3ca..35f0e4bfa8c6f1 100644 --- a/ports/opencv2/vcpkg.json +++ b/ports/opencv2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv2", "version": "2.4.13.7", - "port-version": 12, + "port-version": 13, "description": "Open Source Computer Vision Library", "homepage": "https://github.com/opencv/opencv", "license": "BSD-3-Clause", @@ -31,6 +31,12 @@ "cuda" ] }, + "dc1394": { + "description": "Dc1394 support for opencv", + "dependencies": [ + "libdc1394" + ] + }, "default-features": { "description": "Platform-dependent default features", "dependencies": [ diff --git a/ports/opencv3/portfile.cmake b/ports/opencv3/portfile.cmake index d5cdf0bbdff226..1cf7c930cbabdf 100644 --- a/ports/opencv3/portfile.cmake +++ b/ports/opencv3/portfile.cmake @@ -70,6 +70,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "vtk" WITH_VTK "webp" WITH_WEBP "world" BUILD_opencv_world + "dc1394" WITH_1394 ) # Cannot use vcpkg_check_features() for "dnn", "gtk", "ipp", ovis", "python", "qt", "tbb" diff --git a/ports/opencv3/vcpkg.json b/ports/opencv3/vcpkg.json index 445ff3c4798c58..ee4b9427444552 100644 --- a/ports/opencv3/vcpkg.json +++ b/ports/opencv3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv3", "version": "3.4.16", - "port-version": 8, + "port-version": 9, "description": "Open Source Computer Vision Library", "homepage": "https://github.com/opencv/opencv", "license": "BSD-3-Clause", @@ -56,6 +56,12 @@ } ] }, + "dc1394": { + "description": "Dc1394 support for opencv", + "dependencies": [ + "libdc1394" + ] + }, "default-features": { "description": "Platform-dependent default features", "dependencies": [ diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index ee65afa66ef8cb..36b0ac55333838 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -76,6 +76,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "vtk" WITH_VTK "webp" WITH_WEBP "world" BUILD_opencv_world + "dc1394" WITH_1394 ) # Cannot use vcpkg_check_features() for "dnn", "gtk", ipp", "openmp", "ovis", "python", "qt, "tbb" diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index c055ed2c2e4dae..f22f6e99fb333a 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv4", "version": "4.5.5", - "port-version": 4, + "port-version": 5, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "license": "Apache-2.0", @@ -69,6 +69,12 @@ } ] }, + "dc1394": { + "description": "Dc1394 support for opencv", + "dependencies": [ + "libdc1394" + ] + }, "default-features": { "description": "Platform-dependent default features", "dependencies": [ diff --git a/scripts/test_ports/vcpkg-ci-opencv/vcpkg.json b/scripts/test_ports/vcpkg-ci-opencv/vcpkg.json index 7c404301038862..6250e5755e6c0d 100644 --- a/scripts/test_ports/vcpkg-ci-opencv/vcpkg.json +++ b/scripts/test_ports/vcpkg-ci-opencv/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vcpkg-ci-opencv", "version-string": "1", - "port-version": 4, + "port-version": 5, "description": "Port to force features of certain ports within CI", "homepage": "https://github.com/microsoft/vcpkg", "dependencies": [ @@ -26,7 +26,8 @@ "name": "opencv", "default-features": false, "features": [ - "gtk" + "gtk", + "dc1394" ], "platform": "linux" }, diff --git a/versions/baseline.json b/versions/baseline.json index ba25c0e43e45e0..190334582f686f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5126,19 +5126,19 @@ }, "opencv": { "baseline": "4.5.5", - "port-version": 0 + "port-version": 1 }, "opencv2": { "baseline": "2.4.13.7", - "port-version": 12 + "port-version": 13 }, "opencv3": { "baseline": "3.4.16", - "port-version": 8 + "port-version": 9 }, "opencv4": { "baseline": "4.5.5", - "port-version": 4 + "port-version": 5 }, "opendnp3": { "baseline": "3.1.1", diff --git a/versions/o-/opencv.json b/versions/o-/opencv.json index 60ab4980b25a04..80915b47c1eeec 100644 --- a/versions/o-/opencv.json +++ b/versions/o-/opencv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1ed18903421ae513e731348b2e5afb13c8c38d24", + "version": "4.5.5", + "port-version": 1 + }, { "git-tree": "afe6b1b5c7be14be0656724754f95e537416c763", "version": "4.5.5", diff --git a/versions/o-/opencv2.json b/versions/o-/opencv2.json index eca3f369840406..87764af3d72cf4 100644 --- a/versions/o-/opencv2.json +++ b/versions/o-/opencv2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5dad4c606f120b7d208ec193036596bd82074e81", + "version": "2.4.13.7", + "port-version": 13 + }, { "git-tree": "65f3aff976c42b2759e70867fa006287ff1be835", "version": "2.4.13.7", diff --git a/versions/o-/opencv3.json b/versions/o-/opencv3.json index 02d0949b182822..803ad151081ee7 100644 --- a/versions/o-/opencv3.json +++ b/versions/o-/opencv3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8d02d89d9531e2243b81f37f97a9be943fd6b0a0", + "version": "3.4.16", + "port-version": 9 + }, { "git-tree": "d8a8b60a98ada175921aadcd09ed66509c9be2a4", "version": "3.4.16", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index a3175691e237c5..f2e3e6fb081489 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "26f2ba4a582c93442e82167dece932c3833a2124", + "version": "4.5.5", + "port-version": 5 + }, { "git-tree": "86073388865f7730e42d02768f8963156f2be82f", "version": "4.5.5",