diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 880205c20f5967..7a879dae1ad1f8 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -1,51 +1,3 @@ -#Check for unsupported features - -if("ffmpeg" IN_LIST FEATURES) - vcpkg_fail_port_install(ON_TARGET "UWP" MESSAGE "Feature 'ffmpeg' does not support 'uwp'") -endif() - -if("ffplay" IN_LIST FEATURES) - vcpkg_fail_port_install(ON_TARGET "UWP" MESSAGE "Feature 'ffplay' does not support 'uwp'") -endif() - -if("ffprobe" IN_LIST FEATURES) - vcpkg_fail_port_install(ON_TARGET "UWP" MESSAGE "Feature 'ffprobe' does not support 'uwp'") -endif() - -if("avisynthplus" IN_LIST FEATURES) - if ((NOT VCPKG_TARGET_IS_WINDOWS) OR (VCPKG_LIBRARY_LINKAGE STREQUAL "static")) - message(FATAL_ERROR "Feature 'avisynthplus' does not support '!windows | static'") - endif() -endif() - -if("dav1d" IN_LIST FEATURES) - if (VCPKG_TARGET_IS_OSX) - message(FATAL_ERROR "Feature 'dav1d' does not support 'osx'") - endif() -endif() - -if("opencl" IN_LIST FEATURES) - vcpkg_fail_port_install(ON_TARGET "UWP" MESSAGE "Feature 'opencl' does not support 'uwp'") -endif() - -if("opengl" IN_LIST FEATURES) - if (VCPKG_TARGET_IS_UWP) - message(FATAL_ERROR "Feature 'opengl' does not support 'uwp") - endif() -endif() - -if("tesseract" IN_LIST FEATURES) - if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") - message(FATAL_ERROR "Feature 'tesseract' does not support 'static'") - endif() -endif() - -if("tensorflow" IN_LIST FEATURES) - if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") - message(FATAL_ERROR "Feature 'tensorflow' does not support 'static'") - endif() -endif() - if(VCPKG_TARGET_IS_WINDOWS) set(PATCHES 0017-Patch-for-ticket-9019-CUDA-Compile-Broken-Using-MSVC.patch) # https://trac.ffmpeg.org/ticket/9019 endif() diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index 84f37b2e73b750..ac74b443bc2d92 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", "version": "4.4.1", - "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." @@ -278,6 +278,7 @@ }, "avisynthplus": { "description": "Reading of AviSynth script files", + "supports": "windows & !static", "dependencies": [ "avisynthplus", { @@ -300,6 +301,7 @@ }, "dav1d": { "description": "AV1 decoding via libdav1d", + "supports": "!osx", "dependencies": [ "dav1d" ] @@ -325,6 +327,7 @@ }, "ffmpeg": { "description": "Build the ffmpeg application", + "supports": "!uwp", "dependencies": [ { "name": "ffmpeg", @@ -339,6 +342,7 @@ }, "ffplay": { "description": "Build the ffplay application", + "supports": "!uwp", "dependencies": [ { "name": "ffmpeg", @@ -356,6 +360,7 @@ }, "ffprobe": { "description": "Build the ffprobe application", + "supports": "!uwp", "dependencies": [ { "name": "ffmpeg", @@ -429,12 +434,14 @@ }, "opencl": { "description": "OpenCL processing", + "supports": "!uwp", "dependencies": [ "opencl" ] }, "opengl": { "description": "OpenGL rendering", + "supports": "!uwp", "dependencies": [ "opengl", "opengl-registry" @@ -539,12 +546,14 @@ }, "tensorflow": { "description": "TensorFlow as a DNN module backend for DNN based filters like sr", + "supports": "!static", "dependencies": [ "tensorflow" ] }, "tesseract": { "description": "Tesseract, needed for ocr filter", + "supports": "!static", "dependencies": [ "tesseract" ] diff --git a/versions/baseline.json b/versions/baseline.json index b8df75061fadb1..c4ec36a47cf0e3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2150,7 +2150,7 @@ }, "ffmpeg": { "baseline": "4.4.1", - "port-version": 6 + "port-version": 7 }, "ffnvcodec": { "baseline": "11.1.5.0", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 15660645bf7da0..9ee299366a6de8 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8b692478001452049ea19d32ec199f58c5de3a77", + "version": "4.4.1", + "port-version": 7 + }, { "git-tree": "f81278fe4661e442e3bd6ea274af6b397e4e3ff5", "version": "4.4.1",