mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-18 18:27:55 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[ffmpeg] fix LGPL build, disable avisynthplus on static builds (#18803)

Browse Source 
* [ffmpeg] do not pull in postproc for LGPL build

* [ffmpeg] disable avisynthplus on static builds (as it is not functional)

* [ffmpeg] bump port version

* [ffmpeg] x-add-version
This commit is contained in:
Matthias C. M. Troffaes 2021-07-06 21:45:15 +01:00 committed by GitHub
parent 8a07b5df24
commit 7179350f94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/ffmpeg/portfile.cmake
View File

@ -20,8 +20,8 @@ if("ass" IN_LIST FEATURES)
endif() endif()
if("avisynthplus" IN_LIST FEATURES) if("avisynthplus" IN_LIST FEATURES)
if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR (NOT VCPKG_TARGET_IS_WINDOWS)) if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR (NOT VCPKG_TARGET_IS_WINDOWS) OR (VCPKG_LIBRARY_LINKAGE STREQUAL "static"))
message(FATAL_ERROR "Feature 'avisynthplus' does not support '!windows | arm | uwp'") message(FATAL_ERROR "Feature 'avisynthplus' does not support '!windows | arm | uwp | static'")
endif() endif()
endif() endif()

35
ports/ffmpeg/vcpkg.json
View File

@ -1,7 +1,7 @@
{ {
"name": "ffmpeg", "name": "ffmpeg",
"version": "4.4", "version": "4.4",
"port-version": 6, "port-version": 7,
"description": [ "description": [
"a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.", "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." "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."
@ -28,7 +28,12 @@
"dependencies": [ "dependencies": [
{ {
"name": "ffmpeg", "name": "ffmpeg",
"default-features": false,
"features": [ "features": [
"avcodec",
"avdevice",
"avfilter",
"avformat",
"avresample", "avresample",
"bzip2", "bzip2",
"freetype", "freetype",
@ -40,6 +45,8 @@
"snappy", "snappy",
"soxr", "soxr",
"speex", "speex",
"swresample",
"swscale",
"theora", "theora",
"vorbis", "vorbis",
"vpx", "vpx",
@ -49,6 +56,7 @@
}, },
{ {
"name": "ffmpeg", "name": "ffmpeg",
"default-features": false,
"features": [ "features": [
"sdl2" "sdl2"
], ],
@ -56,6 +64,7 @@
}, },
{ {
"name": "ffmpeg", "name": "ffmpeg",
"default-features": false,
"features": [ "features": [
"opencl" "opencl"
], ],
@ -63,6 +72,7 @@
}, },
{ {
"name": "ffmpeg", "name": "ffmpeg",
"default-features": false,
"features": [ "features": [
"openh264" "openh264"
], ],
@ -70,6 +80,7 @@
}, },
{ {
"name": "ffmpeg", "name": "ffmpeg",
"default-features": false,
"features": [ "features": [
"xml2" "xml2"
], ],
@ -77,6 +88,7 @@
}, },
{ {
"name": "ffmpeg", "name": "ffmpeg",
"default-features": false,
"features": [ "features": [
"ilbc" "ilbc"
], ],
@ -84,6 +96,7 @@
}, },
{ {
"name": "ffmpeg", "name": "ffmpeg",
"default-features": false,
"features": [ "features": [
"ass" "ass"
], ],
@ -91,6 +104,7 @@
}, },
{ {
"name": "ffmpeg", "name": "ffmpeg",
"default-features": false,
"features": [ "features": [
"fribidi" "fribidi"
], ],
@ -98,6 +112,7 @@
}, },
{ {
"name": "ffmpeg", "name": "ffmpeg",
"default-features": false,
"features": [ "features": [
"ssh" "ssh"
], ],
@ -105,6 +120,7 @@
}, },
{ {
"name": "ffmpeg", "name": "ffmpeg",
"default-features": false,
"features": [ "features": [
"dav1d" "dav1d"
], ],
@ -112,6 +128,7 @@
}, },
{ {
"name": "ffmpeg", "name": "ffmpeg",
"default-features": false,
"features": [ "features": [
"modplug" "modplug"
], ],
@ -119,6 +136,7 @@
}, },
{ {
"name": "ffmpeg", "name": "ffmpeg",
"default-features": false,
"features": [ "features": [
"tensorflow" "tensorflow"
], ],
@ -126,6 +144,7 @@
}, },
{ {
"name": "ffmpeg", "name": "ffmpeg",
"default-features": false,
"features": [ "features": [
"opengl" "opengl"
], ],
@ -133,6 +152,7 @@
}, },
{ {
"name": "ffmpeg", "name": "ffmpeg",
"default-features": false,
"features": [ "features": [
"nvcodec" "nvcodec"
], ],
@ -140,6 +160,7 @@
}, },
{ {
"name": "ffmpeg", "name": "ffmpeg",
"default-features": false,
"features": [ "features": [
"tesseract" "tesseract"
], ],
@ -147,6 +168,7 @@
}, },
{ {
"name": "ffmpeg", "name": "ffmpeg",
"default-features": false,
"features": [ "features": [
"fontconfig" "fontconfig"
], ],
@ -159,13 +181,16 @@
"dependencies": [ "dependencies": [
{ {
"name": "ffmpeg", "name": "ffmpeg",
"default-features": false,
"features": [ "features": [
"all", "all",
"gpl" "gpl",
"postproc"
] ]
}, },
{ {
"name": "ffmpeg", "name": "ffmpeg",
"default-features": false,
"features": [ "features": [
"x264" "x264"
], ],
@ -173,6 +198,7 @@
}, },
{ {
"name": "ffmpeg", "name": "ffmpeg",
"default-features": false,
"features": [ "features": [
"x265" "x265"
], ],
@ -180,10 +206,11 @@
}, },
{ {
"name": "ffmpeg", "name": "ffmpeg",
"default-features": false,
"features": [ "features": [
"avisynthplus" "avisynthplus"
], ],
"platform": "windows & !arm & !uwp" "platform": "windows & !arm & !uwp & !static"
} }
] ]
}, },
@ -192,6 +219,7 @@
"dependencies": [ "dependencies": [
{ {
"name": "ffmpeg", "name": "ffmpeg",
"default-features": false,
"features": [ "features": [
"all-gpl", "all-gpl",
"nonfree", "nonfree",
@ -200,6 +228,7 @@
}, },
{ {
"name": "ffmpeg", "name": "ffmpeg",
"default-features": false,
"features": [ "features": [
"fdk-aac" "fdk-aac"
], ],

2
versions/baseline.json
View File

@ -1982,7 +1982,7 @@
}, },
"ffmpeg": { "ffmpeg": {
"baseline": "4.4", "baseline": "4.4",
"port-version": 6 "port-version": 7
}, },
"ffnvcodec": { "ffnvcodec": {
"baseline": "10.0.26.0", "baseline": "10.0.26.0",

5
versions/f-/ffmpeg.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "efdbc20f5003313df2fde681a28ab8718455495f",
"version": "4.4",
"port-version": 7
},
{ {
"git-tree": "8405d9f6850d7ceb6cede89a791b42c41253ef29", "git-tree": "8405d9f6850d7ceb6cede89a791b42c41253ef29",
"version": "4.4", "version": "4.4",