-
Notifications
You must be signed in to change notification settings - Fork 6.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[ffmpeg/opencv4] Update opencv4 feature dependency and remove ffmpeg …
…feature 'postproc' from default feature (#19358) * [ffmpeg/opencv4] Update opencv4 feature dependency and remove ffmpeg feature 'postproc' from default feature * Update the baseline version * [opencv3] Update the feature dependency * Update the baseline * [opencv2] Update the feature dependency * Update the baseline version * Fix uwp build failures * Update the baseline version * Fix opencv2 version * update the baseline version * update the baseline version * Un-edit git-tree. * Update cuda feature * Update the baseline Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
- Loading branch information
1 parent
7bdf2f8
commit eb9cb29
Showing
15 changed files
with
240 additions
and
104 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| { | ||
| "name": "opencv2", | ||
| "version": "2.4.13.7", | ||
| "port-version": 6, | ||
| "description": "computer vision library", | ||
| "homepage": "https://github.com/opencv/opencv", | ||
| "dependencies": [ | ||
| { | ||
| "name": "vcpkg-cmake", | ||
| "host": true | ||
| }, | ||
| { | ||
| "name": "vcpkg-cmake-config", | ||
| "host": true | ||
| }, | ||
| "zlib" | ||
| ], | ||
| "default-features": [ | ||
| "eigen", | ||
| "jpeg", | ||
| "png", | ||
| "tiff" | ||
| ], | ||
| "features": { | ||
| "cuda": { | ||
| "description": "CUDA support for opencv", | ||
| "dependencies": [ | ||
| "cuda" | ||
| ] | ||
| }, | ||
| "eigen": { | ||
| "description": "Eigen support for opencv", | ||
| "dependencies": [ | ||
| "eigen3" | ||
| ] | ||
| }, | ||
| "ffmpeg": { | ||
| "description": "ffmpeg support for opencv", | ||
| "dependencies": [ | ||
| { | ||
| "name": "ffmpeg", | ||
| "default-features": false, | ||
| "features": [ | ||
| "avcodec", | ||
| "avformat", | ||
| "swresample", | ||
| "swscale" | ||
| ] | ||
| } | ||
| ] | ||
| }, | ||
| "jasper": { | ||
| "description": "JPEG 2000 support for opencv", | ||
| "dependencies": [ | ||
| "jasper" | ||
| ] | ||
| }, | ||
| "jpeg": { | ||
| "description": "JPEG support for opencv", | ||
| "dependencies": [ | ||
| "libjpeg-turbo" | ||
| ] | ||
| }, | ||
| "openexr": { | ||
| "description": "OpenEXR support for opencv", | ||
| "dependencies": [ | ||
| "openexr" | ||
| ] | ||
| }, | ||
| "opengl": { | ||
| "description": "opengl support for opencv", | ||
| "dependencies": [ | ||
| "opengl" | ||
| ] | ||
| }, | ||
| "png": { | ||
| "description": "PNG support for opencv", | ||
| "dependencies": [ | ||
| "libpng" | ||
| ] | ||
| }, | ||
| "qt": { | ||
| "description": "Qt GUI support for opencv", | ||
| "dependencies": [ | ||
| { | ||
| "name": "qt5-base", | ||
| "default-features": false | ||
| } | ||
| ] | ||
| }, | ||
| "tiff": { | ||
| "description": "TIFF support for opencv", | ||
| "dependencies": [ | ||
| "tiff" | ||
| ] | ||
| }, | ||
| "world": { | ||
| "description": "Compile to a single package support for opencv" | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| 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) | ||
|
|
||
| ocv_clear_vars(GRFMT_LIBS) | ||
|
|
||
| +if(MSVC) | ||
| + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4996") | ||
| +endif() | ||
| + | ||
| if(HAVE_WINRT_CX AND NOT WINRT) | ||
| set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /ZW") | ||
| endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| 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) | ||
|
|
||
| ocv_clear_vars(GRFMT_LIBS) | ||
|
|
||
| +if(MSVC) | ||
| + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4996") | ||
| +endif() | ||
| + | ||
| if(HAVE_WINRT_CX AND NOT WINRT) | ||
| set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /ZW") | ||
| endif() |
Oops, something went wrong.