Skip to content

[x264] enable cross-compile settings propagation for arm64-linux #23532

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
sylvain-prevost wants to merge 13 commits into from
Closed

[x264] enable cross-compile settings propagation for arm64-linux #23532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
eba15a4
[x264] enable cross-compile settings propagation for arm64-linux.
sylvain-prevost Mar 13, 2022
8d79e58
[x264] add license field to vcpkg.json + invoke vcpkg_cmake_get_vars(…
sylvain-prevost Mar 13, 2022
6f19e02
[x264] update version & hash.
sylvain-prevost Mar 13, 2022
b5ff789
[x264] use version instead of version-string in vcpkg.json.
sylvain-prevost Mar 13, 2022
4f31b27
[x264] update hash.
sylvain-prevost Mar 13, 2022
564c2d9
[x264] use more efficient regex + revert to original version-string s…
sylvain-prevost Mar 15, 2022
8842dd2
[x264]: update hash.
sylvain-prevost Mar 15, 2022
9c6ee13
[x264] - re-trigger CI.
sylvain-prevost Mar 16, 2022
2011890
[x264] update hash.
sylvain-prevost Mar 16, 2022
45f57d1
CI
sylvain-prevost Mar 24, 2022
cdaed3f
CI
sylvain-prevost Apr 1, 2022
cce3293
format manifest
Apr 2, 2022
83b923f
version
Apr 2, 2022
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
17 changes: 16 additions & 1 deletion ports/x264/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,23 @@ if(VCPKG_TARGET_IS_UWP)
endif()

if(VCPKG_TARGET_IS_LINUX)

list(APPEND OPTIONS --enable-pic)

if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
Copy link
Member

@BillyONeal BillyONeal May 5, 2022

Choose a reason for hiding this comment

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

This condition is probably wrong: Why is cross compiling for arm64 different than any other cross compiling?


vcpkg_cmake_get_vars(cmake_vars_file)
include("${cmake_vars_file}")

if (VCPKG_DETECTED_CMAKE_CROSSCOMPILING)
# Attempt to determine the fully qualified prefix from VCPKG_DETECTED_CMAKE_C_COMPILER (using most common naming conventions for linux targets)
# and if valid, use it to initialize --cross-prefix build-option of x264 package.
if(VCPKG_DETECTED_CMAKE_C_COMPILER MATCHES "^(.*-)gcc\$")
list(APPEND OPTIONS "--cross-prefix=${CMAKE_MATCH_1}")
endif()
endif()
endif()

endif()

vcpkg_configure_make(
Expand All @@ -45,7 +61,6 @@ vcpkg_configure_make(
--disable-gpac
--disable-lsmash
--enable-debug

)

vcpkg_install_make()
Expand Down
9 changes: 7 additions & 2 deletions ports/x264/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
{
"name": "x264",
"version-string": "164-5db6aa6cab1b146",
"port-version": 4,
"version": "164-5db6aa6cab1b146",
"port-version": 5,
"description": "x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format",
"homepage": "https://github.com/mirror/x264",
"license": "GPL-2.0-or-later",
"supports": "!(arm & windows)",
"dependencies": [
{
"name": "pthread",
"platform": "linux & osx"
},
{
"name": "vcpkg-cmake",
"host": true
}
]
}
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 @@ -7438,7 +7438,7 @@
},
"x264": {
"baseline": "164-5db6aa6cab1b146",
"port-version": 4
"port-version": 5
},
"x265": {
"baseline": "3.4",
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": "c41df96f5b563f5ca75a965b0efc19f1daf05671",
"version": "164-5db6aa6cab1b146",
"port-version": 5
},
{
"git-tree": "7eea109502309e62a578bcc69811ad0659e00f9d",
"version-string": "164-5db6aa6cab1b146",
Expand Down