diff options
| author | Andre Abrantes <andre.abrantes@sieve.com.br> | 2019-04-10 03:02:31 -0300 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-04-09 23:02:31 -0700 |
| commit | 8c3e093d0509fb0c7cc325692834fc1583a05390 (patch) | |
| tree | 754da6a16c18640e449cfc32af248eecf321243d | |
| parent | 45e7641ea0fe8c38e5c8f63e3ee234e080157067 (diff) | |
| download | vcpkg-8c3e093d0509fb0c7cc325692834fc1583a05390.tar.gz vcpkg-8c3e093d0509fb0c7cc325692834fc1583a05390.zip | |
[fix][ffmpeg] changing $PATH separator for Linux (#6015)
* [fix][ffmpeg] changing $PATH separator for Linux
Using a semicolon in $PATH might break on some flavors of Linux, eg Docker based on Ubuntu 18.04.
| -rw-r--r-- | ports/ffmpeg/CONTROL | 2 | ||||
| -rw-r--r-- | ports/ffmpeg/portfile.cmake | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL index 0fb3df0a7..2060e37af 100644 --- a/ports/ffmpeg/CONTROL +++ b/ports/ffmpeg/CONTROL @@ -1,5 +1,5 @@ Source: ffmpeg -Version: 4.1-2 +Version: 4.1-3 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/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 262867d84..2a35d6b94 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -21,22 +21,22 @@ vcpkg_apply_patches( vcpkg_find_acquire_program(YASM) get_filename_component(YASM_EXE_PATH ${YASM} DIRECTORY) -set(ENV{PATH} "$ENV{PATH};${YASM_EXE_PATH}") if (WIN32) + set(ENV{PATH} "$ENV{PATH};${YASM_EXE_PATH}") + set(BUILD_SCRIPT ${CMAKE_CURRENT_LIST_DIR}\\build.sh) + if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") vcpkg_acquire_msys(MSYS_ROOT PACKAGES perl gcc diffutils make) else() vcpkg_acquire_msys(MSYS_ROOT PACKAGES diffutils make) endif() -endif() - -if (WIN32) - set(BASH ${MSYS_ROOT}/usr/bin/bash.exe) - set(BUILD_SCRIPT ${CMAKE_CURRENT_LIST_DIR}\\build.sh) + + set(BASH ${MSYS_ROOT}/usr/bin/bash.exe) else() - set(BASH bash) - set(BUILD_SCRIPT ${CMAKE_CURRENT_LIST_DIR}/build_linux.sh) + set(ENV{PATH} "$ENV{PATH}:${YASM_EXE_PATH}") + set(BASH /bin/bash) + set(BUILD_SCRIPT ${CMAKE_CURRENT_LIST_DIR}/build_linux.sh) endif() set(ENV{INCLUDE} "${CURRENT_INSTALLED_DIR}/include;$ENV{INCLUDE}") |