diff options
| author | genevanmeter <47541158+genevanmeter@users.noreply.github.com> | 2021-03-31 13:20:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-31 10:20:17 -0700 |
| commit | db1df24767ae50fdcd8229bc4ae37c672e2b3e53 (patch) | |
| tree | 65eaf9095e91271378fd8afe6553a94e7aee787f /versions | |
| parent | ed54efbb16ae8a457296c7a7e1462a9f54571e94 (diff) | |
| download | vcpkg-db1df24767ae50fdcd8229bc4ae37c672e2b3e53.tar.gz vcpkg-db1df24767ae50fdcd8229bc4ae37c672e2b3e53.zip | |
[ffmpeg] Fix FindFFMPEG lib versions for building opencv[ffmpeg] (#16882)
* Fix FindFFMPEG lib versions for opencv[ffmpeg]
libavutil, libavdevice, etc. define their versions separate from FFMPEG main version in a version.h file located with each component headers.
This change fixes building opencv[ffmpeg] when it attempts to discover the individual versions of FFMPEG libs. Before this change opencv[ffmpeg] would build but the FFMPEG functionality was disabled since all the lib versions were set to 4.3.1
* Modified Port-Version of CONTROL to 13
Ran vcpkg.exe x-add-version ffmpeg
* Ran vcpkg.exe x-add-version ffmpeg --overwrite-version per Cheney-W's instructions
* Updated Port-Version of CONTROL to 1 for FFMPEG version 4.3.2
* Ran vcpkg x-add-version ffmpeg
Diffstat (limited to 'versions')
| -rw-r--r-- | versions/baseline.json | 4 | ||||
| -rw-r--r-- | versions/f-/ffmpeg.json | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/versions/baseline.json b/versions/baseline.json index bbe16fdf8..d37be89bb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1934,7 +1934,7 @@ }, "ffmpeg": { "baseline": "4.3.2", - "port-version": 0 + "port-version": 1 }, "ffnvcodec": { "baseline": "10.0.26.0", @@ -2552,7 +2552,7 @@ "baseline": "9.0.0", "port-version": 0 }, - "iir1": { + "iir1": { "baseline": "1.8.0", "port-version": 0 }, diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 5fbf8e4dd..42b7421a3 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "8d581e93ca7ee374d63bae07dff49356c79dee8c", + "version-string": "4.3.2", + "port-version": 1 + }, + { "git-tree": "fd3c02af90662935ece6ca6ced78f23319b753c9", "version-string": "4.3.2", "port-version": 0 |