mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 03:09:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[libvpx] Only enable NASM for x86 and x64 (#42037)

Browse Source
This commit is contained in:
Andrew Kaster 2024-11-11 01:24:37 -07:00 committed by GitHub
parent 44adcd9480
commit 3ab232bd9a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ports/libvpx/portfile.cmake
View File

@ -24,9 +24,11 @@ endif()
find_program(BASH NAME bash HINTS ${MSYS_ROOT}/usr/bin REQUIRED NO_CACHE) find_program(BASH NAME bash HINTS ${MSYS_ROOT}/usr/bin REQUIRED NO_CACHE)
vcpkg_find_acquire_program(NASM) if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY) vcpkg_find_acquire_program(NASM)
vcpkg_add_to_path(${NASM_EXE_PATH}) get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY)
vcpkg_add_to_path(${NASM_EXE_PATH})
endif()
if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)

2
ports/libvpx/vcpkg.json
View File

@ -1,7 +1,7 @@
{ {
"name": "libvpx", "name": "libvpx",
"version": "1.13.1", "version": "1.13.1",
"port-version": 3, "port-version": 4,
"description": "The reference software implementation for the video coding formats VP8 and VP9.", "description": "The reference software implementation for the video coding formats VP8 and VP9.",
"homepage": "https://github.com/webmproject/libvpx", "homepage": "https://github.com/webmproject/libvpx",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",

2
versions/baseline.json
View File

@ -5318,7 +5318,7 @@
}, },
"libvpx": { "libvpx": {
"baseline": "1.13.1", "baseline": "1.13.1",
"port-version": 3 "port-version": 4
}, },
"libwandio": { "libwandio": {
"baseline": "4.2.1", "baseline": "4.2.1",

5
versions/l-/libvpx.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "51aa3269c3e4839a7c789ba5e7f25e653ef65b27",
"version": "1.13.1",
"port-version": 4
},
{ {
"git-tree": "113a0b3aef3819546a0d8fe587aa37146a7e8f30", "git-tree": "113a0b3aef3819546a0d8fe587aa37146a7e8f30",
"version": "1.13.1", "version": "1.13.1",