Skip to content

[ffmpeg] Fix tools dependency dll file #12063

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ras0219-msft merged 3 commits into from
Jul 7, 2020
Merged

[ffmpeg] Fix tools dependency dll file #12063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6cd911d
[ffmpeg] Fix tools dependency dll file
LilyWangL Jun 23, 2020
cabf738
Merge branch 'master' into dev/Lily/issue12008
JackBoosY Jun 28, 2020
3384719
[ffmpeg] Fix tools install path
LilyWangL Jul 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/ffmpeg/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: ffmpeg
Version: 4.2-12
Version: 4.2-13
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.
Expand Down
6 changes: 4 additions & 2 deletions ports/ffmpeg/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,10 +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)
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)
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()
Expand Down