Skip to content
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

[x264] Fix feature tool compilation errors #43004

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
+7 −6
Draft

[x264] Fix feature tool compilation errors #43004

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
2beb0b0
fix feature tool
jimwang118 Dec 30, 2024
1fbecb8
update version
jimwang118 Dec 30, 2024
e41147f
Merge branch 'master' of https://github.com/microsoft/vcpkg into fix-…
jimwang118 Dec 31, 2024
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
4 changes: 0 additions & 4 deletions ports/x264/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,6 @@ vcpkg_make_configure(

vcpkg_make_install()

if("tool" IN_LIST FEATURES)
vcpkg_copy_tools(TOOL_NAMES x264 AUTO_CLEAN)
Copy link
Contributor

Choose a reason for hiding this comment

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

Doesn't it need vcpkg_copy_tool_dependencies?

Copy link
Contributor

@WangWeiLin-MV WangWeiLin-MV Dec 31, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

The feature tool seems to be broken, fixing.

Copy link
Contributor

Choose a reason for hiding this comment

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

Well, vckg_configure_make/vcpkg_make_configure always placed the executables directly into tools/${PORT}/bin and tools/${PORT}/debug/bin. (Note #17607.)

So to provide DLLs, it has to be used with vcpkg_copy_tool_dependencies directly instead of vcpkg_copy_tools.

endif()

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

if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
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 @@ -9774,7 +9774,7 @@
},
"x264": {
"baseline": "0.164.3108",
"port-version": 1
"port-version": 2
},
"x265": {
"baseline": "3.6",
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": "ba0deb1be41cc1bd71c0753422e7f3c20f3a7cb0",
"version": "0.164.3108",
"port-version": 2
},
{
"git-tree": "0b3254a0abf3a2a2748b7353594b401893f74da9",
"version": "0.164.3108",
Expand Down