diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 1dfe4b18e21a14..9b70694c2a5688 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -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() diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index 1b5c40f0a0d672..8ce76f9e343ce4 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -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." @@ -28,7 +28,12 @@ "dependencies": [ { "name": "ffmpeg", + "default-features": false, "features": [ + "avcodec", + "avdevice", + "avfilter", + "avformat", "avresample", "bzip2", "freetype", @@ -40,6 +45,8 @@ "snappy", "soxr", "speex", + "swresample", + "swscale", "theora", "vorbis", "vpx", @@ -49,6 +56,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "sdl2" ], @@ -56,6 +64,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "opencl" ], @@ -63,6 +72,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "openh264" ], @@ -70,6 +80,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "xml2" ], @@ -77,6 +88,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "ilbc" ], @@ -84,6 +96,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "ass" ], @@ -91,6 +104,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "fribidi" ], @@ -98,6 +112,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "ssh" ], @@ -105,6 +120,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "dav1d" ], @@ -112,6 +128,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "modplug" ], @@ -119,6 +136,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "tensorflow" ], @@ -126,6 +144,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "opengl" ], @@ -133,6 +152,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "nvcodec" ], @@ -140,6 +160,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "tesseract" ], @@ -147,6 +168,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "fontconfig" ], @@ -159,13 +181,16 @@ "dependencies": [ { "name": "ffmpeg", + "default-features": false, "features": [ "all", - "gpl" + "gpl", + "postproc" ] }, { "name": "ffmpeg", + "default-features": false, "features": [ "x264" ], @@ -173,6 +198,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "x265" ], @@ -180,10 +206,11 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "avisynthplus" ], - "platform": "windows & !arm & !uwp" + "platform": "windows & !arm & !uwp & !static" } ] }, @@ -192,6 +219,7 @@ "dependencies": [ { "name": "ffmpeg", + "default-features": false, "features": [ "all-gpl", "nonfree", @@ -200,6 +228,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "fdk-aac" ], diff --git a/versions/baseline.json b/versions/baseline.json index a200b7aee8824e..44e8737d1e8bc4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1982,7 +1982,7 @@ }, "ffmpeg": { "baseline": "4.4", - "port-version": 6 + "port-version": 7 }, "ffnvcodec": { "baseline": "10.0.26.0", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 14c7c2f68b7c56..c510b16ed25c50 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "efdbc20f5003313df2fde681a28ab8718455495f", + "version": "4.4", + "port-version": 7 + }, { "git-tree": "8405d9f6850d7ceb6cede89a791b42c41253ef29", "version": "4.4",