Skip to content

Commit c7c198f

Browse files
committed
feat(libass): Move asm architecture check to portfile, fix require-system-font-provider option
1 parent e0f1a3d commit c7c198f

3 files changed

Lines changed: 20 additions & 13 deletions

File tree

ports/libass/portfile.cmake

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,28 @@ list(APPEND options
2020
-Dtest=disabled
2121
)
2222

23+
if(NOT VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_OSX AND NOT VCPKG_TARGET_IS_LINUX)
24+
list(APPEND options -Drequire-system-font-provider=false)
25+
endif()
26+
27+
set(asm_option disabled)
2328
set(additional_binaries "")
2429
if("asm" IN_LIST FEATURES)
25-
list(APPEND options -Dasm=enabled)
26-
if(VCPKG_TARGET_ARCHITECTURE MATCHES "^(x86|x64)$")
27-
vcpkg_find_acquire_program(NASM)
28-
get_filename_component(NASM_EXE_PATH "${NASM}" DIRECTORY)
29-
vcpkg_add_to_path("${NASM_EXE_PATH}")
30-
elseif(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
31-
vcpkg_find_acquire_program(CLANG)
32-
list(APPEND additional_binaries "clang = ['${CLANG}']")
30+
if(VCPKG_TARGET_ARCHITECTURE MATCHES "^(x86|x64|arm64)$")
31+
set(asm_option enabled)
32+
if(VCPKG_TARGET_ARCHITECTURE MATCHES "^(x86|x64)$")
33+
vcpkg_find_acquire_program(NASM)
34+
get_filename_component(NASM_EXE_PATH "${NASM}" DIRECTORY)
35+
vcpkg_add_to_path("${NASM_EXE_PATH}")
36+
elseif(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
37+
vcpkg_find_acquire_program(CLANG)
38+
list(APPEND additional_binaries "clang = ['${CLANG}']")
39+
endif()
40+
else()
41+
message(WARNING "Feature 'asm' is not supported on ${VCPKG_TARGET_ARCHITECTURE}; disabling assembly optimizations.")
3342
endif()
34-
else()
35-
list(APPEND options -Dasm=disabled)
3643
endif()
44+
list(APPEND options -Dasm=${asm_option})
3745

3846
vcpkg_configure_meson(
3947
SOURCE_PATH "${SOURCE_PATH}"

ports/libass/vcpkg.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@
2323
],
2424
"features": {
2525
"asm": {
26-
"description": "Enable assembly optimizations",
27-
"supports": "x86 | x64 | arm64"
26+
"description": "Enable assembly optimizations"
2827
}
2928
}
3029
}

versions/l-/libass.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"versions": [
33
{
4-
"git-tree": "c3156c4393ce4f7947428a3fd8ba3282be6f6f9a",
4+
"git-tree": "b9f53dbb93437ce09b6c53808aba3f1dd1b2ca96",
55
"version": "0.17.4",
66
"port-version": 1
77
},

0 commit comments

Comments
 (0)