Skip to content

[ffmpeg] Fix libx264-164.dll file is not copied to bin directory after build #43901

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

Closed
JonLiu1993 wants to merge 9 commits into from
Closed

[ffmpeg] Fix libx264-164.dll file is not copied to bin directory after build #43901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9f32fe8
[x264] copy bin directory after build
Feb 18, 2025
795c876
update version
Feb 18, 2025
0cfac7e
fix pipline error
Feb 18, 2025
f8d39d0
update version
Feb 18, 2025
a303072
fix pipeline
Feb 18, 2025
1ec10e2
update version
Feb 18, 2025
5384927
Merge branch 'master' of https://github.com/Microsoft/vcpkg into dev/…
Feb 19, 2025
671d064
Apply suggesstion
Feb 19, 2025
b501939
update version
Feb 19, 2025
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
12 changes: 8 additions & 4 deletions ports/x264/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ vcpkg_make_configure(
--disable-gpac
--disable-lsmash
--disable-bashcompletion
--bindir=[debug/]bin
OPTIONS_RELEASE
${OPTIONS_RELEASE}
--enable-strip
Expand All @@ -96,10 +97,6 @@ vcpkg_make_configure(

vcpkg_make_install()

if("tool" IN_LIST FEATURES)
vcpkg_copy_tools(TOOL_NAMES x264 AUTO_CLEAN)
endif()

Comment on lines -99 to -102
Copy link
Contributor Author

@JonLiu1993 JonLiu1993 Feb 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix error:

CMake Error at scripts/cmake/vcpkg_copy_tools.cmake:36 (message):
  Couldn't find tool "x264":

      "F:/Feature-test/vcpkg/packages/x264_x64-windows/bin/x264.exe" does not exist

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
Expand All @@ -123,6 +120,13 @@ elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
)
endif()

if(VCPKG_TARGET_IS_WINDOWS)
if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug" AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
file(COPY "${CURRENT_PACKAGES_DIR}/tools/x264/bin/libx264-164.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
file(COPY "${CURRENT_PACKAGES_DIR}/bin" DESTINATION "${CURRENT_PACKAGES_DIR}/debug")
endif()
endif()

vcpkg_fixup_pkgconfig()

vcpkg_copy_pdbs()
Expand Down
2 changes: 1 addition & 1 deletion ports/x264/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "x264",
"version": "0.164.3108",
"port-version": 1,
"port-version": 2,
"description": "x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format",
"homepage": "https://www.videolan.org/developers/x264.html",
"license": "GPL-2.0-or-later",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9918,7 +9918,7 @@
},
"x264": {
"baseline": "0.164.3108",
"port-version": 1
"port-version": 2
},
"x265": {
"baseline": "4.1",
Expand Down
5 changes: 5 additions & 0 deletions versions/x-/x264.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9bee6ff2ae0128061fb62fc4be756c80b86643c0",
"version": "0.164.3108",
"port-version": 2
},
{
"git-tree": "0b3254a0abf3a2a2748b7353594b401893f74da9",
"version": "0.164.3108",
Expand Down