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

[ffmpeg] Only enable NASM for x86 and x64 (#42038)

Browse Source
This commit is contained in:
Andrew Kaster 2024-11-11 01:23:59 -07:00 committed by GitHub
parent 54e04ebab6
commit ba7070b86a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/ffmpeg/portfile.cmake
View File

@ -23,7 +23,7 @@ if(SOURCE_PATH MATCHES " ")
message(FATAL_ERROR "Error: ffmpeg will not build with spaces in the path. Please use a directory with no spaces") message(FATAL_ERROR "Error: ffmpeg will not build with spaces in the path. Please use a directory with no spaces")
endif() endif()
if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "wasm32") if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
vcpkg_find_acquire_program(NASM) vcpkg_find_acquire_program(NASM)
get_filename_component(NASM_EXE_PATH "${NASM}" DIRECTORY) get_filename_component(NASM_EXE_PATH "${NASM}" DIRECTORY)
vcpkg_add_to_path("${NASM_EXE_PATH}") vcpkg_add_to_path("${NASM_EXE_PATH}")

1
ports/ffmpeg/vcpkg.json
View File

@ -1,6 +1,7 @@
{ {
"name": "ffmpeg", "name": "ffmpeg",
"version": "7.1", "version": "7.1",
"port-version": 1,
"description": [ "description": [
"A library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.", "A library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.",
"FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations." "FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations."

2
versions/baseline.json
View File

@ -2746,7 +2746,7 @@
}, },
"ffmpeg": { "ffmpeg": {
"baseline": "7.1", "baseline": "7.1",
"port-version": 0 "port-version": 1
}, },
"ffnvcodec": { "ffnvcodec": {
"baseline": "12.2.72.0", "baseline": "12.2.72.0",

5
versions/f-/ffmpeg.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "8bf6bad9b522d47e259a13d9033a825a6abd41a9",
"version": "7.1",
"port-version": 1
},
{ {
"git-tree": "2f0b2eabf82953dfedabf9ed344318d5d411373f", "git-tree": "2f0b2eabf82953dfedabf9ed344318d5d411373f",
"version": "7.1", "version": "7.1",