Skip to content

[opencv4, opencv3, opencv2] Add feature dc1394 #24595

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ras0219-msft merged 9 commits into from
Jun 10, 2022
Merged

[opencv4, opencv3, opencv2] Add feature dc1394 #24595

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ccf06a6
[opencv4, opencv3] Add feature dc1394
May 7, 2022
1b53fd1
version
May 7, 2022
7c27f88
opencv2 add feature
May 7, 2022
efba743
version
May 7, 2022
c6c3a12
update opencv
May 9, 2022
c107b08
x-add-version
May 9, 2022
6877b6f
update version
May 9, 2022
33eb5c9
update test ports
May 11, 2022
0de243c
Merge branch 'master' of https://github.com/Microsoft/vcpkg into dev/…
Jun 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ports/opencv3/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 7 additions & 1 deletion ports/opencv3/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -56,6 +56,12 @@
}
]
},
"dc1394": {
"description": "Dc1394 support for opencv",
"dependencies": [
"libdc1394"
]
},
"default-features": {
"description": "Platform-dependent default features",
"dependencies": [
Expand Down
1 change: 1 addition & 0 deletions ports/opencv4/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 7 additions & 1 deletion ports/opencv4/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -69,6 +69,12 @@
}
]
},
"dc1394": {
"description": "Dc1394 support for opencv",
"dependencies": [
"libdc1394"
]
},
"default-features": {
"description": "Platform-dependent default features",
"dependencies": [
Expand Down
3 changes: 2 additions & 1 deletion scripts/test_ports/vcpkg-ci-opencv/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
"png",
"quirc",
"tiff",
"webp"
"webp",
"dc1394"
]
},
{
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5102,11 +5102,11 @@
},
"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",
Expand Down
5 changes: 5 additions & 0 deletions versions/o-/opencv3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8d02d89d9531e2243b81f37f97a9be943fd6b0a0",
"version": "3.4.16",
"port-version": 9
},
{
"git-tree": "d8a8b60a98ada175921aadcd09ed66509c9be2a4",
"version": "3.4.16",
Expand Down
5 changes: 5 additions & 0 deletions versions/o-/opencv4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "26f2ba4a582c93442e82167dece932c3833a2124",
"version": "4.5.5",
"port-version": 5
},
{
"git-tree": "86073388865f7730e42d02768f8963156f2be82f",
"version": "4.5.5",
Expand Down