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

Jump to bottom

[aom] Enable arm, arm64 target support for Windows Desktop. #28739

Merged
merged 1 commit into from
Jan 7, 2023
Merged

[aom] Enable arm, arm64 target support for Windows Desktop. #28739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion ports/aom/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@ vcpkg_from_git(
)

set(aom_target_cpu "")
if(VCPKG_TARGET_IS_UWP)
if(VCPKG_TARGET_IS_UWP OR (VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE MATCHES "^arm"))
# UWP + aom's assembler files result in weirdness and build failures
# Also, disable assembly on ARM and ARM64 Windows to fix compilation issues.
set(aom_target_cpu "-DAOM_TARGET_CPU=generic")
endif()

Expand Down
2 changes: 1 addition & 1 deletion ports/aom/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "aom",
"version-semver": "3.5.0",
"port-version": 1,
"description": "AV1 codec library",
"homepage": "https://aomedia.googlesource.com/aom",
"license": "BSD-2-Clause",
"supports": "!(windows & arm & !uwp)",
"dependencies": [
{
"name": "vcpkg-cmake",
Expand Down
5 changes: 5 additions & 0 deletions versions/a-/aom.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "daaa6d5ccf417cb9e4997d35b9574f18eaa98cd3",
"version-semver": "3.5.0",
"port-version": 1
},
{
"git-tree": "c6e0216430b4aded29b420b2d9e4b14ef6271620",
"version-semver": "3.5.0",
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 @@ -122,7 +122,7 @@
},
"aom": {
"baseline": "3.5.0",
"port-version": 0
"port-version": 1
},
"approval-tests-cpp": {
"baseline": "10.12.2",
Expand Down