diff --git a/docs/maintainers/internal/z_vcpkg_setup_pkgconfig_path.md b/docs/maintainers/internal/z_vcpkg_setup_pkgconfig_path.md new file mode 100644 index 0000000..80c6654 --- /dev/null +++ b/docs/maintainers/internal/z_vcpkg_setup_pkgconfig_path.md @@ -0,0 +1,16 @@ +# z_vcpkg_setup_pkgconfig_path + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/). + +`z_vcpkg_setup_pkgconfig_path` sets up environment variables to use `pkgconfig`, such as `PKG_CONFIG` and `PKG_CONFIG_PATH`. +The original values are restored with `z_vcpkg_restore_pkgconfig_path`. `BASE_DIRS` indicates the base directories to find `.pc` files; typically `${CURRENT_INSTALLED_DIR}`, or `${CURRENT_INSTALLED_DIR}/debug`. + +```cmake +z_vcpkg_setup_pkgconfig_path(BASE_DIRS <"${CURRENT_INSTALLED_DIR}" ...>) +# Build process that may transitively invoke pkgconfig +z_vcpkg_restore_pkgconfig_path() +``` + + +## Source +[scripts/cmake/z\_vcpkg\_setup\_pkgconfig\_path.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/z_vcpkg_setup_pkgconfig_path.cmake) diff --git a/docs/maintainers/ports/vcpkg-cmake-get-vars.md b/docs/maintainers/ports/vcpkg-cmake-get-vars.md new file mode 100644 index 0000000..4881c82 --- /dev/null +++ b/docs/maintainers/ports/vcpkg-cmake-get-vars.md @@ -0,0 +1,3 @@ +# vcpkg-cmake-get-vars + +This port contains a helper function to extract CMake variables into the scope of the portfile or other scripts diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index d12a9fa..4304feb 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -1,140 +1,11 @@ -#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("ass" IN_LIST FEATURES) - if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_IS_UWP) - message(FATAL_ERROR "Feature 'ass' does not support 'uwp | arm'") - endif() -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'") - endif() -endif() - -if("dav1d" IN_LIST FEATURES) - if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_IS_OSX) - message(FATAL_ERROR "Feature 'dav1d' does not support 'uwp | arm | x86 | osx'") - endif() -endif() - -if("fdk-aac" IN_LIST FEATURES) - if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_IS_UWP) - message(FATAL_ERROR "Feature 'fdk-aac' does not support 'uwp | arm'") - endif() -endif() - -if("fontconfig" IN_LIST FEATURES) - if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_IS_UWP OR (VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")) - message(FATAL_ERROR "Feature 'fontconfig' does not support 'uwp | arm | (windows & static)'") - endif() -endif() - -if("fribidi" IN_LIST FEATURES) - if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_IS_UWP) - message(FATAL_ERROR "Feature 'fribidi' does not support 'uwp | arm'") - endif() -endif() - -if("ilbc" IN_LIST FEATURES) - if ((VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") AND VCPKG_TARGET_IS_UWP) - message(FATAL_ERROR "Feature 'ilbc' does not support 'uwp & arm'") - endif() -endif() - -if("modplug" IN_LIST FEATURES) - if (VCPKG_TARGET_IS_UWP OR (VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")) - message(FATAL_ERROR "Feature 'modplug' does not support 'uwp | (windows & static)'") - endif() -endif() - -if("nvcodec" IN_LIST FEATURES) - if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR ((NOT VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_LINUX))) - message(FATAL_ERROR "Feature 'nvcodec' does not support '!(windows | linux) | uwp | arm'") - 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_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") AND VCPKG_TARGET_IS_WINDOWS) OR VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_IS_OSX) - message(FATAL_ERROR "Feature 'opengl' does not support 'uwp | (windows & arm) | osx'") - endif() -endif() - -if("openh264" IN_LIST FEATURES) - vcpkg_fail_port_install(ON_TARGET "UWP" MESSAGE "Feature 'openh264' does not support 'uwp'") -endif() - -if("sdl2" IN_LIST FEATURES) - vcpkg_fail_port_install(ON_TARGET "OSX" MESSAGE "Feature 'sdl2' does not support 'osx'") -endif() - -if("ssh" IN_LIST FEATURES) - if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_IS_UWP OR VCPKG_LIBRARY_LINKAGE STREQUAL "static") - message(FATAL_ERROR "Feature 'ssh' does not support 'uwp | arm | static'") - endif() -endif() - -if("tensorflow" IN_LIST FEATURES) - if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_IS_UWP OR VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - message(FATAL_ERROR "Feature 'tensorflow' does not support 'x86 | arm | uwp | static'") - endif() -endif() - -if("tesseract" IN_LIST FEATURES) - if (((VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") AND VCPKG_TARGET_IS_WINDOWS) OR VCPKG_TARGET_IS_UWP OR VCPKG_LIBRARY_LINKAGE STREQUAL "static") - message(FATAL_ERROR "Feature 'tesseract' does not support 'uwp | (windows & arm) | static'") - endif() -endif() - -if("wavpack" IN_LIST FEATURES) - if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") - message(FATAL_ERROR "Feature 'wavpack' does not support 'arm'") - endif() -endif() - -if("x264" IN_LIST FEATURES) - if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") - message(FATAL_ERROR "Feature 'x264' does not support 'arm'") - endif() -endif() - -if("x265" IN_LIST FEATURES) - if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_IS_UWP) - message(FATAL_ERROR "Feature 'x265' does not support 'uwp | arm'") - endif() -endif() - -if("xml2" IN_LIST FEATURES) - if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") - message(FATAL_ERROR "Feature 'xml2' 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() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ffmpeg/ffmpeg - REF n4.4 - SHA512 ae7426ca476df9fa9dba52cab06c38e484f835653fb2da57e7c06f5589d887c0854ee17df93a2f57191d498c1264cb1c69312cf0a8214b476800382e2d260c4b + REF n4.4.1 + SHA512 a53e617937f9892c5cfddb00896be9ad8a3e398dc7cf3b6c893b52ff38aff6ff0cbc61a44cd5f93d9a28f775e71ae82996a5e2b699a769c1de8f882aab34c797 HEAD_REF master PATCHES 0001-create-lib-libraries.patch @@ -147,9 +18,9 @@ vcpkg_from_github( 0011-Fix-x265-detection.patch 0012-Fix-ssl-110-detection.patch 0013-define-WINVER.patch - 0014-avfilter-dependency-fix.patch # http://ffmpeg.org/pipermail/ffmpeg-devel/2021-February/275819.html + 0014-avfilter-dependency-fix.patch # https://ffmpeg.org/pipermail/ffmpeg-devel/2021-February/275819.html 0015-Fix-xml2-detection.patch - 0016-configure-dnn-needs-avformat.patch # http://ffmpeg.org/pipermail/ffmpeg-devel/2021-May/279926.html + 0016-configure-dnn-needs-avformat.patch # https://ffmpeg.org/pipermail/ffmpeg-devel/2021-May/279926.html ${PATCHES} 1000-resolume-small-memory-allocations.patch 1001-max_chunk_size-from-format-context-in-build_chunks.patch @@ -237,7 +108,36 @@ if(VCPKG_TARGET_IS_OSX AND VCPKG_OSX_DEPLOYMENT_TARGET) set(OPTIONS "--extra-ldflags=-mmacosx-version-min=${VCPKG_OSX_DEPLOYMENT_TARGET} ${OPTIONS}") endif() -set(ENV{${INCLUDE_VAR}} "${CURRENT_INSTALLED_DIR}/include${VCPKG_HOST_PATH_SEPARATOR}$ENV{${INCLUDE_VAR}}") +if(VCPKG_TARGET_IS_MINGW) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + string(APPEND OPTIONS " --target-os=mingw32") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + string(APPEND OPTIONS " --target-os=mingw64") + endif() +elseif(VCPKG_TARGET_IS_LINUX) + string(APPEND OPTIONS " --target-os=linux") +elseif(VCPKG_TARGET_IS_WINDOWS) + string(APPEND OPTIONS " --target-os=win32") +elseif(VCPKG_TARGET_IS_OSX) + string(APPEND OPTIONS " --target-os=darwin") +elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Android") + string(APPEND OPTIONS " --target-os=android") +endif() + +vcpkg_cmake_get_vars(cmake_vars_file) +include("${cmake_vars_file}") + +if(VCPKG_DETECTED_MSVC) + set(OPTIONS "--toolchain=msvc ${OPTIONS}") + # This is required because ffmpeg depends upon optimizations to link correctly + string(APPEND VCPKG_COMBINED_C_FLAGS_DEBUG " -O2") + string(REGEX REPLACE "(^| )-RTC1( |$)" " " VCPKG_COMBINED_C_FLAGS_DEBUG "${VCPKG_COMBINED_C_FLAGS_DEBUG}") + string(REGEX REPLACE "(^| )-Od( |$)" " " VCPKG_COMBINED_C_FLAGS_DEBUG "${VCPKG_COMBINED_C_FLAGS_DEBUG}") + string(REGEX REPLACE "(^| )-Ob0( |$)" " " VCPKG_COMBINED_C_FLAGS_DEBUG "${VCPKG_COMBINED_C_FLAGS_DEBUG}") +endif() + +string(APPEND VCPKG_COMBINED_C_FLAGS_DEBUG " -I \"${CURRENT_INSTALLED_DIR}/include\"") +string(APPEND VCPKG_COMBINED_C_FLAGS_RELEASE " -I \"${CURRENT_INSTALLED_DIR}/include\"") set(_csc_PROJECT_PATH ffmpeg) @@ -273,6 +173,10 @@ else() set(OPTIONS "${OPTIONS} --disable-ffprobe") endif() +if (NOT "alsa" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --disable-alsa") +endif() + if("avcodec" IN_LIST FEATURES) set(OPTIONS "${OPTIONS} --enable-avcodec") set(ENABLE_AVCODEC ON) @@ -613,10 +517,6 @@ else() set(OPTIONS "${OPTIONS} --disable-zlib") endif() -set(CMAKE_VARS_FILE "${CURRENT_BUILDTREES_DIR}/vars.cmake") -vcpkg_internal_get_cmake_vars(OUTPUT_FILE CMAKE_VARS_FILE) -include("${CMAKE_VARS_FILE}") - if (VCPKG_TARGET_IS_OSX) # if the sysroot isn't set in the triplet we fall back to whatever CMake detected for us if ("${VCPKG_OSX_SYSROOT}" STREQUAL "") @@ -628,7 +528,18 @@ if (VCPKG_TARGET_IS_OSX) set(OPTIONS "${OPTIONS} --extra-ldflags=\"-isysroot ${VCPKG_OSX_SYSROOT}\"") endif() -set(OPTIONS_CROSS "") +set(OPTIONS_CROSS " --enable-cross-compile") + +# ffmpeg needs --cross-prefix option to use appropriate tools for cross-compiling. +if(VCPKG_DETECTED_CMAKE_C_COMPILER MATCHES "(/.+)gcc$") + string(APPEND OPTIONS_CROSS " --cross-prefix=${CMAKE_MATCH_1}") +endif() + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + string(APPEND OPTIONS_CROSS " --arch=x86_64") +else() + string(APPEND OPTIONS_CROSS " --arch=${VCPKG_TARGET_ARCHITECTURE}") +endif() if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") if(VCPKG_TARGET_IS_WINDOWS) @@ -638,7 +549,7 @@ if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQU get_filename_component(GAS_ITEM_PATH ${GAS_PATH} DIRECTORY) set(ENV{PATH} "$ENV{PATH}${VCPKG_HOST_PATH_SEPARATOR}${GAS_ITEM_PATH}") endforeach(GAS_PATH) - elseif(VCPKG_TARGET_IS_OSX AND NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "${VCPKG_DETECTED_CMAKE_SYSTEM_PROCESSOR}") # VCPKG_TARGET_ARCHITECTURE = arm64 + elseif(VCPKG_TARGET_IS_OSX AND NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "${VCPKG_DETECTED_CMAKE_HOST_SYSTEM_PROCESSOR}") # get the number of architectures requested list(LENGTH VCPKG_OSX_ARCHITECTURES ARCHITECTURE_COUNT) @@ -651,6 +562,9 @@ if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQU endif() endif() elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + if(VCPKG_TARGET_IS_OSX) + set(OPTIONS_CROSS " --enable-cross-compile --target-os=darwin --arch=x86_64 --extra-ldflags=-arch --extra-ldflags=x86_64 --extra-cflags=-arch --extra-cflags=x86_64 --extra-cxxflags=-arch --extra-cxxflags=x86_64") + endif() elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") else() message(FATAL_ERROR "Unsupported architecture") @@ -663,7 +577,7 @@ if(VCPKG_TARGET_IS_UWP) set(OPTIONS_CROSS " --enable-cross-compile --target-os=win32 --arch=${VCPKG_TARGET_ARCHITECTURE}") endif() -set(OPTIONS_DEBUG "--debug") # Note: --disable-optimizations can't be used due to http://ffmpeg.org/pipermail/libav-user/2013-March/003945.html +set(OPTIONS_DEBUG "--debug") # Note: --disable-optimizations can't be used due to https://ffmpeg.org/pipermail/libav-user/2013-March/003945.html set(OPTIONS_RELEASE "") set(OPTIONS "${OPTIONS} ${OPTIONS_CROSS}") diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index 6fc8cc3..e13fadb 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,12 +1,23 @@ { "name": "ffmpeg", - "version-string": "4.4", - "port-version": 10, + "version": "4.4.1", + "port-version": 100, "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." ], "homepage": "https://ffmpeg.org", + "license": null, + "dependencies": [ + { + "name": "vcpkg-cmake-get-vars", + "host": true + }, + { + "name": "vcpkg-pkgconfig-get-modules", + "host": true + } + ], "default-features": [ "avcodec", "avdevice", @@ -22,7 +33,12 @@ "dependencies": [ { "name": "ffmpeg", + "default-features": false, "features": [ + "avcodec", + "avdevice", + "avfilter", + "avformat", "avresample", "bzip2", "freetype", @@ -35,15 +51,27 @@ "snappy", "soxr", "speex", + "swresample", + "swscale", "theora", "vorbis", "vpx", "webp", + "xml2", "zlib" ] }, { "name": "ffmpeg", + "default-features": false, + "features": [ + "alsa" + ], + "platform": "linux" + }, + { + "name": "ffmpeg", + "default-features": false, "features": [ "sdl2" ], @@ -51,94 +79,115 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ - "opencl" + "ass" ], "platform": "!uwp" }, { "name": "ffmpeg", + "default-features": false, "features": [ - "xml2" + "fontconfig" ], - "platform": "!static" + "platform": "!uwp" }, { "name": "ffmpeg", + "default-features": false, "features": [ - "ilbc" + "fribidi" ], - "platform": "!(arm & uwp)" + "platform": "!uwp" }, { "name": "ffmpeg", + "default-features": false, "features": [ - "ass" + "modplug" ], - "platform": "!(uwp | arm)" + "platform": "!uwp" }, { "name": "ffmpeg", + "default-features": false, "features": [ - "fribidi" + "opencl" ], - "platform": "!(uwp | arm)" + "platform": "!uwp" }, { "name": "ffmpeg", + "default-features": false, "features": [ - "ssh" + "openh264" ], - "platform": "!(uwp | arm) & !static" + "platform": "!uwp" }, { "name": "ffmpeg", + "default-features": false, "features": [ - "dav1d" + "ilbc" ], - "platform": "!(uwp | arm | x86 | osx)" + "platform": "!(arm & uwp)" }, { "name": "ffmpeg", + "default-features": false, "features": [ - "modplug" + "ssh" ], - "platform": "!(windows & static) & !uwp" + "platform": "!(uwp | arm)" }, { "name": "ffmpeg", + "default-features": false, "features": [ "tensorflow" ], - "platform": "!(x86 | arm | uwp) & !static" + "platform": "x64 & !static & !uwp" }, { "name": "ffmpeg", + "default-features": false, "features": [ - "opengl" + "aom" ], - "platform": "!uwp & !(windows & arm) & !osx" + "platform": "!(windows & arm & !uwp)" }, { "name": "ffmpeg", + "default-features": false, "features": [ - "nvcodec" + "dav1d" ], - "platform": "(windows | linux) & !uwp & !arm" + "platform": "!(uwp | arm | x86 | osx)" }, { "name": "ffmpeg", + "default-features": false, + "features": [ + "opengl" + ], + "platform": "!uwp & !(arm64 & windows)" + }, + { + "name": "ffmpeg", + "default-features": false, "features": [ "tesseract" ], - "platform": "!uwp & !(windows & arm) & !static" + "platform": "!(windows & arm) & !static & !uwp" }, { "name": "ffmpeg", + "default-features": false, "features": [ - "fontconfig" + "nvcodec" ], - "platform": "!(windows & static) & !(uwp | arm)" + "platform": "linux | (!osx & !uwp & !(arm64 & windows))" } ] }, @@ -147,31 +196,36 @@ "dependencies": [ { "name": "ffmpeg", + "default-features": false, "features": [ "all", - "gpl" + "gpl", + "postproc" ] }, { "name": "ffmpeg", + "default-features": false, "features": [ - "x264" + "x265" ], - "platform": "!arm" + "platform": "!(uwp | arm)" }, { "name": "ffmpeg", + "default-features": false, "features": [ - "x265" + "x264" ], - "platform": "!arm & !uwp" + "platform": "!(arm & windows)" }, { "name": "ffmpeg", + "default-features": false, "features": [ "avisynthplus" ], - "platform": "windows & !arm & !uwp" + "platform": "windows & !arm & !uwp & !static" } ] }, @@ -180,6 +234,7 @@ "dependencies": [ { "name": "ffmpeg", + "default-features": false, "features": [ "all-gpl", "nonfree", @@ -188,6 +243,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "fdk-aac" ], @@ -234,6 +290,7 @@ }, "avisynthplus": { "description": "Reading of AviSynth script files", + "supports": "windows & !static", "dependencies": [ "avisynthplus", { @@ -256,6 +313,7 @@ }, "dav1d": { "description": "AV1 decoding via libdav1d", + "supports": "!osx", "dependencies": [ "dav1d" ] @@ -275,6 +333,7 @@ }, "ffmpeg": { "description": "Build the ffmpeg application", + "supports": "!uwp", "dependencies": [ { "name": "ffmpeg", @@ -289,6 +348,7 @@ }, "ffplay": { "description": "Build the ffplay application", + "supports": "!uwp", "dependencies": [ { "name": "ffmpeg", @@ -306,6 +366,7 @@ }, "ffprobe": { "description": "Build the ffprobe application", + "supports": "!uwp", "dependencies": [ { "name": "ffmpeg", @@ -373,18 +434,21 @@ }, "nvcodec": { "description": "Nvidia video decoding/encoding acceleration", + "supports": "linux | (!osx & !uwp & !(arm64 & windows))", "dependencies": [ "ffnvcodec" ] }, "opencl": { "description": "OpenCL processing", + "supports": "!uwp", "dependencies": [ "opencl" ] }, "opengl": { "description": "OpenGL rendering", + "supports": "!uwp", "dependencies": [ "opengl", "opengl-registry" @@ -478,12 +542,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 5b79980..63fa39c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1,5 +1,5 @@ { "default": { - "ffmpeg": { "baseline": "4.4", "port-version": 10 } + "ffmpeg": { "baseline": "4.4.1", "port-version": 100 } } } diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index df98c33..e5b6f53 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,73 @@ { "versions": [{ + "version": "4.4.1", + "port-version": 100, + "git-tree": "1caf29e917ef6e06e68f9bd8eca1d6815b125902" + },{ + "version": "4.4.1", + "port-version": 12, + "git-tree": "027da02f06ef0809f00709782fdec26a947daaa8" + },{ + "version": "4.4.1", + "port-version": 11, + "git-tree": "44aafd7b8cf4d6a4f7e2081f9a5420be74892ee7" + },{ + "version": "4.4.1", + "port-version": 10, + "git-tree": "4ce0f5f93d2ae3b8c5c77fdc0d7baadc57080de5" + },{ + "version": "4.4.1", + "port-version": 9, + "git-tree": "8f35d1397a3a9e75537f5a9f0f08962ddd8bab49" + },{ + "version": "4.4.1", + "port-version": 8, + "git-tree": "c8b9ab05cb13b8d53f83ff9fa3b5e23fe4c556a9" + },{ + "version": "4.4.1", + "port-version": 7, + "git-tree": "4490d36cb3d49dd547bb8034aa941cbd4e03d9fb" + },{ + "version": "4.4.1", + "port-version": 6, + "git-tree": "35a1a8da47553f10059fe7422071efc178e75fc5" + },{ + "version": "4.4.1", + "port-version": 5, + "git-tree": "e57a8aa7560cfd50cf6a7c0233ffc4cc56d5900d" + },{ + "version": "4.4.1", + "port-version": 4, + "git-tree": "0a7070b940408899e1af1f4d23de97c8676ef878" + },{ + "version": "4.4.1", + "port-version": 3, + "git-tree": "3c9caf0e8dcb9ffe9c36bfe1e759a55472269988" + },{ + "version": "4.4.1", + "port-version": 2, + "git-tree": "9b5c157ced3deaebc51f9f90dfb1e72b29eaec48" + },{ + "version": "4.4.1", + "port-version": 1, + "git-tree": "b00a9a15538e29e1489c282b834a78e25d844833" + },{ + "version": "4.4.1", + "port-version": 0, + "git-tree": "6384a251e057d9ba25d06dbfce62d44f8460998b" + },{ + "version": "4.4", + "port-version": 13, + "git-tree": "89bfd39de61b60b76433f5f8da60ecec1d679e93" + },{ + "version": "4.4", + "port-version": 12, + "git-tree": "b9eb7a1cdacada35b714f0ca88130128c2184b9e" + },{ + "version": "4.4", + "port-version": 11, + "git-tree": "b853ee80e5bcf7babc9487e255e3bb4a02cc30b3" + },{ "version": "4.4", "port-version": 10, "git-tree": "bb61453372e1d3a6e1bfc44eb640b041d1a7d6a2"