mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-28 03:49:06 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[ffmpeg] fix optional X11 platform dependencies (#17625)

Browse Source 
* [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
This commit is contained in:
Matthias C. M. Troffaes 2021-05-06 21:48:26 +01:00 committed by GitHub
parent edd61643a5
commit 373915929e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/ffmpeg/CONTROL
View File

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

2
ports/ffmpeg/FindFFMPEG.cmake.in
View File

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

2
versions/baseline.json
View File

@ -1954,7 +1954,7 @@
},
"ffmpeg": {
"baseline": "4.3.2",
"port-version": 10
"port-version": 11
},
"ffnvcodec": {
"baseline": "10.0.26.0",

5
versions/f-/ffmpeg.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "fe496d461929767f020d5d9e577408ed298febcc",
"version-string": "4.3.2",
"port-version": 11
},
{
"git-tree": "2664b57a1b900287af6772394ec3c99a080f132b",
"version-string": "4.3.2",