From 6cd911dda48da4ca0a94fc8444961297238bc849 Mon Sep 17 00:00:00 2001 From: wangli28 Date: Tue, 23 Jun 2020 01:52:13 +0000 Subject: [PATCH 1/2] [ffmpeg] Fix tools dependency dll file --- ports/ffmpeg/CONTROL | 2 +- ports/ffmpeg/portfile.cmake | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL index 2b85582d503c24..00f713ae660b47 100644 --- a/ports/ffmpeg/CONTROL +++ b/ports/ffmpeg/CONTROL @@ -1,5 +1,5 @@ Source: ffmpeg -Version: 4.2-10 +Version: 4.2-11 Build-Depends: zlib 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. diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index dc1bff6aeff927..f044b2ece6201f 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -268,9 +268,11 @@ if (VCPKG_TARGET_IS_WINDOWS) if(FILES_TO_REMOVE) if (EXE_FILES_REL) file(INSTALL ${EXE_FILES_REL} DESTINATION ${CURRENT_PACKAGES_DIR}/tools) + vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools) endif() if (EXE_FILES_DBG) file(INSTALL ${EXE_FILES_DBG} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools) + vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/debug/tools) endif() file(REMOVE ${FILES_TO_REMOVE}) endif() From 33847190508e1a8a324d51e1ec0ab32cd99d6512 Mon Sep 17 00:00:00 2001 From: Lily <47812810+LilyWangL@users.noreply.github.com> Date: Tue, 7 Jul 2020 16:10:20 +0800 Subject: [PATCH 2/2] [ffmpeg] Fix tools install path --- ports/ffmpeg/portfile.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index fe85a4f5b4acf4..f451fa30f7a322 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -273,12 +273,12 @@ if (VCPKG_TARGET_IS_WINDOWS) if(FILES_TO_REMOVE) if (EXE_FILES_REL) - file(INSTALL ${EXE_FILES_REL} DESTINATION ${CURRENT_PACKAGES_DIR}/tools) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools) + 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) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/debug/tools) + 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()