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

Jump to bottom

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

Merged
merged 4 commits into from
Jul 6, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
67df7ee
[ffmpeg] do not pull in postproc for LGPL build
mcmtroffaes Jul 4, 2021
66925a8
[ffmpeg] disable avisynthplus on static builds (as it is not functional)
mcmtroffaes Jul 4, 2021
bc24bf1
[ffmpeg] bump port version
mcmtroffaes Jul 4, 2021
93c0467
[ffmpeg] x-add-version
mcmtroffaes Jul 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions ports/ffmpeg/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ if("ass" IN_LIST FEATURES)
endif()

if("avisynthplus" IN_LIST FEATURES)
if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR (NOT VCPKG_TARGET_IS_WINDOWS))
message(FATAL_ERROR "Feature 'avisynthplus' does not support '!windows | arm | uwp'")
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 | static'")
endif()
endif()

Expand Down
35 changes: 32 additions & 3 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": 6,
"port-version": 7,
"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 @@ -28,7 +28,12 @@
"dependencies": [
{
"name": "ffmpeg",
"default-features": false,
"features": [
"avcodec",
"avdevice",
"avfilter",
"avformat",
"avresample",
"bzip2",
"freetype",
Expand All @@ -40,6 +45,8 @@
"snappy",
"soxr",
"speex",
"swresample",
"swscale",
"theora",
"vorbis",
"vpx",
Expand All @@ -49,104 +56,119 @@
},
{
"name": "ffmpeg",
"default-features": false,
"features": [
"sdl2"
],
"platform": "!osx"
},
{
"name": "ffmpeg",
"default-features": false,
"features": [
"opencl"
],
"platform": "!uwp"
},
{
"name": "ffmpeg",
"default-features": false,
"features": [
"openh264"
],
"platform": "!uwp"
},
{
"name": "ffmpeg",
"default-features": false,
"features": [
"xml2"
],
"platform": "!static"
},
{
"name": "ffmpeg",
"default-features": false,
"features": [
"ilbc"
],
"platform": "!(arm & uwp)"
},
{
"name": "ffmpeg",
"default-features": false,
"features": [
"ass"
],
"platform": "!(uwp | arm)"
},
{
"name": "ffmpeg",
"default-features": false,
"features": [
"fribidi"
],
"platform": "!(uwp | arm)"
},
{
"name": "ffmpeg",
"default-features": false,
"features": [
"ssh"
],
"platform": "!(uwp | arm) & !static"
},
{
"name": "ffmpeg",
"default-features": false,
"features": [
"dav1d"
],
"platform": "!(uwp | arm | x86 | osx)"
},
{
"name": "ffmpeg",
"default-features": false,
"features": [
"modplug"
],
"platform": "!(windows & static) & !uwp"
},
{
"name": "ffmpeg",
"default-features": false,
"features": [
"tensorflow"
],
"platform": "!(x86 | arm | uwp) & !static"
},
{
"name": "ffmpeg",
"default-features": false,
"features": [
"opengl"
],
"platform": "!uwp & !(windows & arm) & !osx"
},
{
"name": "ffmpeg",
"default-features": false,
"features": [
"nvcodec"
],
"platform": "(windows | linux) & !uwp & !arm"
},
{
"name": "ffmpeg",
"default-features": false,
"features": [
"tesseract"
],
"platform": "!uwp & !(windows & arm) & !static"
},
{
"name": "ffmpeg",
"default-features": false,
"features": [
"fontconfig"
],
Expand All @@ -159,31 +181,36 @@
"dependencies": [
{
"name": "ffmpeg",
"default-features": false,
"features": [
"all",
"gpl"
"gpl",
"postproc"
]
},
{
"name": "ffmpeg",
"default-features": false,
"features": [
"x264"
],
"platform": "!arm"
},
{
"name": "ffmpeg",
"default-features": false,
"features": [
"x265"
],
"platform": "!arm & !uwp"
},
{
"name": "ffmpeg",
"default-features": false,
"features": [
"avisynthplus"
],
"platform": "windows & !arm & !uwp"
"platform": "windows & !arm & !uwp & !static"
}
]
},
Expand All @@ -192,6 +219,7 @@
"dependencies": [
{
"name": "ffmpeg",
"default-features": false,
"features": [
"all-gpl",
"nonfree",
Expand All @@ -200,6 +228,7 @@
},
{
"name": "ffmpeg",
"default-features": false,
"features": [
"fdk-aac"
],
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1982,7 +1982,7 @@
},
"ffmpeg": {
"baseline": "4.4",
"port-version": 6
"port-version": 7
},
"ffnvcodec": {
"baseline": "10.0.26.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": "efdbc20f5003313df2fde681a28ab8718455495f",
"version": "4.4",
"port-version": 7
},
{
"git-tree": "8405d9f6850d7ceb6cede89a791b42c41253ef29",
"version": "4.4",
Expand Down