diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index dae0587e0c..afb5fc7785 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -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") 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) get_filename_component(NASM_EXE_PATH "${NASM}" DIRECTORY) vcpkg_add_to_path("${NASM_EXE_PATH}") diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index 32a54b4914..de90c54006 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ffmpeg", "version": "7.1", + "port-version": 1, "description": [ "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." diff --git a/versions/baseline.json b/versions/baseline.json index fbb8f941f1..638984bf71 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2746,7 +2746,7 @@ }, "ffmpeg": { "baseline": "7.1", - "port-version": 0 + "port-version": 1 }, "ffnvcodec": { "baseline": "12.2.72.0", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 9a5de38824..9afce4e5e4 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8bf6bad9b522d47e259a13d9033a825a6abd41a9", + "version": "7.1", + "port-version": 1 + }, { "git-tree": "2f0b2eabf82953dfedabf9ed344318d5d411373f", "version": "7.1",