diff options
| author | Matthias C. M. Troffaes <matthias.troffaes@gmail.com> | 2021-05-06 21:48:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-06 13:48:26 -0700 |
| commit | 373915929eac1d0219474c18a6e8a3134783dfc5 (patch) | |
| tree | c5ce747ac2e1f64d89ed60012b9150bacdbf638f | |
| parent | edd61643a5298bd66d7d7775dd16dc3ace3443c9 (diff) | |
| download | vcpkg-373915929eac1d0219474c18a6e8a3134783dfc5.tar.gz vcpkg-373915929eac1d0219474c18a6e8a3134783dfc5.zip | |
[ffmpeg] fix optional X11 platform dependencies (#17625)
* [ffmpeg] fix optional X11 platform dependencies
* [ffmpeg] bump port version
* [ffmpeg] x-add-version
* [ffmpeg] bump port version
* [ffmpeg] x-add-version
* [ffmpeg] version bump
* [ffmpeg] x-add-version
* [ffmpeg] version bump
* [ffmpeg] x-add-version
| -rw-r--r-- | ports/ffmpeg/CONTROL | 2 | ||||
| -rw-r--r-- | ports/ffmpeg/FindFFMPEG.cmake.in | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/f-/ffmpeg.json | 5 |
4 files changed, 8 insertions, 3 deletions
diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL index 7e077ceaf..64d238cd0 100644 --- a/ports/ffmpeg/CONTROL +++ b/ports/ffmpeg/CONTROL @@ -1,6 +1,6 @@ Source: ffmpeg Version: 4.3.2 -Port-Version: 10 +Port-Version: 11 Homepage: https://ffmpeg.org 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. diff --git a/ports/ffmpeg/FindFFMPEG.cmake.in b/ports/ffmpeg/FindFFMPEG.cmake.in index c810bb98b..69beb4f82 100644 --- a/ports/ffmpeg/FindFFMPEG.cmake.in +++ b/ports/ffmpeg/FindFFMPEG.cmake.in @@ -334,7 +334,7 @@ endif() # Platform dependent libraries required by FFMPEG if(UNIX AND NOT APPLE) - list(APPEND FFMPEG_PLATFORM_DEPENDENT_LIBS -lX11) + find_platform_dependent_optional_libraries(NAMES Xv X11 Xext) find_platform_dependent_optional_libraries(NAMES va-drm va vdpau) if(@ENABLE_AVDEVICE@) find_platform_dependent_optional_libraries(NAMES xcb xcb-shm xcb-shape xcb-xfixes) diff --git a/versions/baseline.json b/versions/baseline.json index 060bf5262..1cb946622 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1954,7 +1954,7 @@ }, "ffmpeg": { "baseline": "4.3.2", - "port-version": 10 + "port-version": 11 }, "ffnvcodec": { "baseline": "10.0.26.0", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index bc6c6a851..250729edb 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "fe496d461929767f020d5d9e577408ed298febcc", + "version-string": "4.3.2", + "port-version": 11 + }, + { "git-tree": "2664b57a1b900287af6772394ec3c99a080f132b", "version-string": "4.3.2", "port-version": 10 |