3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 10:21:07 +08:00
Code Issues Projects Releases Wiki Activity

[ffmpeg] use nasm instead of yasm (#14547)

Browse Source 
* [ffmpeg] use nasm instead of yasm

* [ffmpeg] bump port version

* [ffmpeg] remove old yasm path reference

* update baseline

* [ffmpeg] fall back to yasm on x86

* [ffmpeg] add comment in portfile about issue with ffmpeg nasm build for future reference

* [ffmpeg] update git-tree

Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
This commit is contained in:
Matthias C. M. Troffaes 2021-01-28 02:29:58 +00:00 committed by GitHub
parent d2cc90fe9c
commit 3c466eb80c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/ffmpeg/CONTROL
View File

@ -1,6 +1,6 @@
Source: ffmpeg
Version: 4.3.1
Port-Version: 9
Port-Version: 10
Homepage: https://ffmpeg.org
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.

16
ports/ffmpeg/portfile.cmake
View File

@ -23,8 +23,17 @@ 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()
vcpkg_find_acquire_program(YASM)
get_filename_component(YASM_EXE_PATH ${YASM} DIRECTORY)
if(${VCPKG_TARGET_ARCHITECTURE} STREQUAL x86)
# ffmpeg nasm build gives link error on x86, so fall back to yasm
vcpkg_find_acquire_program(YASM)
get_filename_component(YASM_EXE_PATH ${YASM} DIRECTORY)
vcpkg_add_to_path(${YASM_EXE_PATH})
else()
vcpkg_find_acquire_program(NASM)
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)
#We're assuming that if we're building for Windows we're using MSVC
@ -35,8 +44,7 @@ else()
set(LIB_PATH_VAR "LIBRARY_PATH")
endif()
set(ENV{PATH} "$ENV{PATH}${VCPKG_HOST_PATH_SEPARATOR}${YASM_EXE_PATH}")
set(OPTIONS "--enable-asm --enable-yasm --disable-doc --enable-debug --enable-runtime-cpudetect")
set(OPTIONS "--enable-asm --enable-x86asm --disable-doc --enable-debug --enable-runtime-cpudetect")
if(VCPKG_TARGET_IS_WINDOWS)
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")

2
versions/baseline.json
View File

@ -1878,7 +1878,7 @@
},
"ffmpeg": {
"baseline": "4.3.1",
"port-version": 9
"port-version": 10
},
"ffnvcodec": {
"baseline": "10.0.26.0",

5
versions/f-/ffmpeg.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "93395ca1a700faa1c8c6ce04ef4a6dfa26e9fade",
"version-string": "4.3.1",
"port-version": 10
},
{
"git-tree": "f591a51746536b99b4621d39ea7e0dcd8a693016",
"version-string": "4.3.1",