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

* [opencv4, opencv3] Add feature dc1394

* version

* opencv2 add feature

* version

* update opencv

* x-add-version

* update version

* update test ports

Co-authored-by: Lily Wang <v-lilywang@microsoft.com>
This commit is contained in:
LilyWangLL 2022-06-10 11:11:05 +08:00 committed by GitHub
parent 58196ee519
commit bde216bf73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 64 additions and 9 deletions

View File

@ -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": [

View File

@ -39,6 +39,7 @@ FEATURES
"qt" WITH_QT
"tiff" WITH_TIFF
"world" BUILD_opencv_world
"dc1394" WITH_1394
)
set(WITH_MSMF ON)

View File

@ -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": [

View File

@ -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"

View File

@ -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": [

View File

@ -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"

View File

@ -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": [

View File

@ -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"
},

View File

@ -5130,19 +5130,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",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "1ed18903421ae513e731348b2e5afb13c8c38d24",
"version": "4.5.5",
"port-version": 1
},
{
"git-tree": "afe6b1b5c7be14be0656724754f95e537416c763",
"version": "4.5.5",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5dad4c606f120b7d208ec193036596bd82074e81",
"version": "2.4.13.7",
"port-version": 13
},
{
"git-tree": "65f3aff976c42b2759e70867fa006287ff1be835",
"version": "2.4.13.7",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8d02d89d9531e2243b81f37f97a9be943fd6b0a0",
"version": "3.4.16",
"port-version": 9
},
{
"git-tree": "d8a8b60a98ada175921aadcd09ed66509c9be2a4",
"version": "3.4.16",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "26f2ba4a582c93442e82167dece932c3833a2124",
"version": "4.5.5",
"port-version": 5
},
{
"git-tree": "86073388865f7730e42d02768f8963156f2be82f",
"version": "4.5.5",