Skip to content
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

[ffmpeg/opencv4] Update opencv4 feature dependency and remove ffmpeg feature 'postproc' from default feature #19358

Merged
merged 16 commits into from
Aug 13, 2021
Merged

[ffmpeg/opencv4] Update opencv4 feature dependency and remove ffmpeg feature 'postproc' from default feature #19358

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
d22b796
[ffmpeg/opencv4] Update opencv4 feature dependency and remove ffmpeg …
PhoebeHui Aug 4, 2021
681090f
Update the baseline version
PhoebeHui Aug 4, 2021
04a72fb
[opencv3] Update the feature dependency
PhoebeHui Aug 4, 2021
767047d
Update the baseline
PhoebeHui Aug 4, 2021
46f98d6
[opencv2] Update the feature dependency
PhoebeHui Aug 6, 2021
1b4e699
Update the baseline version
PhoebeHui Aug 6, 2021
ddc7608
Merge branch 'master' into dev/Phoebe/opencv
PhoebeHui Aug 10, 2021
7e64ee6
Fix uwp build failures
PhoebeHui Aug 11, 2021
7a75c1e
Update the baseline version
PhoebeHui Aug 11, 2021
f8d8ae0
Fix opencv2 version
PhoebeHui Aug 11, 2021
52a9f67
update the baseline version
PhoebeHui Aug 11, 2021
3f340a0
update the baseline version
PhoebeHui Aug 11, 2021
804b96e
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Aug 13, 2021
5db7621
Un-edit git-tree.
BillyONeal Aug 13, 2021
f3cf69c
Update cuda feature
PhoebeHui Aug 13, 2021
6770d35
Update the baseline
PhoebeHui Aug 13, 2021
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
3 changes: 1 addition & 2 deletions ports/ffmpeg/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ffmpeg",
"version": "4.4",
"port-version": 12,
"port-version": 13,
"description": [
"a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.",
"FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations."
Expand All @@ -22,7 +22,6 @@
"avdevice",
"avfilter",
"avformat",
"postproc",
"swresample",
"swscale"
],
Expand Down
12 changes: 11 additions & 1 deletion ports/opencv4/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "opencv4",
"version": "4.5.2",
"port-version": 1,
"description": "computer vision library",
"homepage": "https://github.com/opencv/opencv",
"dependencies": [
Expand Down Expand Up @@ -63,7 +64,16 @@
"ffmpeg": {
"description": "ffmpeg support for opencv",
"dependencies": [
"ffmpeg"
{
"name": "ffmpeg",
"default-features": false,
"features": [
"avcodec",
"avformat",
"swresample",
"swscale"
]
}
]
},
"gdcm": {
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 @@ -1998,7 +1998,7 @@
},
"ffmpeg": {
"baseline": "4.4",
"port-version": 12
"port-version": 13
},
"ffnvcodec": {
"baseline": "10.0.26.0",
Expand Down Expand Up @@ -4606,7 +4606,7 @@
},
"opencv4": {
"baseline": "4.5.2",
"port-version": 0
"port-version": 1
},
"opendnp3": {
"baseline": "3.1.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/f-/ffmpeg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "64bd86208925adf6521e3cf926734be757e2737d",
"version": "4.4",
"port-version": 13
},
{
"git-tree": "4d910207840ec65730eb972e472dab548fb8b5d2",
"version": "4.4",
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": "4765cbf1d57e99cded961c975c8324cb29fafd0f",
"version": "4.5.2",
"port-version": 1
},
{
"git-tree": "ac5c96fd5709b302c81b76814a3ccfd99dcdecdc",
"version": "4.5.2",
Expand Down