diff options
| author | Matthias C. M. Troffaes <matthias.troffaes@gmail.com> | 2020-10-13 21:36:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-13 13:36:20 -0700 |
| commit | b1517c933e77526431df3968999f615b51af2828 (patch) | |
| tree | 8fa31e4702b775fcf74b94555ae8bbdced19c33e | |
| parent | 83f88c7a629a8c681fa0f68c207377a9146dd7e5 (diff) | |
| download | vcpkg-b1517c933e77526431df3968999f615b51af2828.tar.gz vcpkg-b1517c933e77526431df3968999f615b51af2828.zip | |
[ffmpeg:x64-linux] install tools also on non-windows platforms (#13932)
* [ffmpeg:x64-linux] install tools
* [ffmpeg] use vcpkg_copy_tools to copy tools
| -rw-r--r-- | ports/ffmpeg/CONTROL | 1 | ||||
| -rw-r--r-- | ports/ffmpeg/portfile.cmake | 24 |
2 files changed, 12 insertions, 13 deletions
diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL index 60a234637..de7d3a5f4 100644 --- a/ports/ffmpeg/CONTROL +++ b/ports/ffmpeg/CONTROL @@ -1,5 +1,6 @@ Source: ffmpeg Version: 4.3.1 +Port-Version: 1 Homepage: https://ffmpeg.org 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. diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 5d50f707a..f41dbd38d 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -467,26 +467,24 @@ if(VCPKG_TARGET_IS_WINDOWS) ) endforeach() - # Handle tools file(GLOB EXP_FILES ${CURRENT_PACKAGES_DIR}/lib/*.exp ${CURRENT_PACKAGES_DIR}/debug/lib/*.exp) file(GLOB LIB_FILES ${CURRENT_PACKAGES_DIR}/bin/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX} ${CURRENT_PACKAGES_DIR}/debug/bin/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}) - file(GLOB EXE_FILES_REL ${CURRENT_PACKAGES_DIR}/bin/*${VCPKG_TARGET_EXECUTABLE_SUFFIX}) - file(GLOB EXE_FILES_DBG ${CURRENT_PACKAGES_DIR}/debug/bin/*${VCPKG_TARGET_EXECUTABLE_SUFFIX}) - set(FILES_TO_REMOVE ${EXP_FILES} ${LIB_FILES} ${DEF_FILES} ${EXE_FILES_REL} ${EXE_FILES_DBG}) - + list(APPEND FILES_TO_REMOVE ${EXP_FILES} ${LIB_FILES} ${DEF_FILES}) if(FILES_TO_REMOVE) - if (EXE_FILES_REL) - file(INSTALL ${EXE_FILES_REL} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) - endif() - if (EXE_FILES_DBG) - file(INSTALL ${EXE_FILES_DBG} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/${PORT}) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/debug/tools/${PORT}) - endif() file(REMOVE ${FILES_TO_REMOVE}) endif() endif() +if("ffmpeg" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES ffmpeg AUTO_CLEAN) +endif() +if("ffprobe" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES ffprobe AUTO_CLEAN) +endif() +if("ffplay" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES ffplay AUTO_CLEAN) +endif() + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") |