[libvpx] resolve bash by PATH rather then hard-coding its' location (#35605)

This commit is contained in:
Alonso Schaich 2023-12-19 22:58:28 +00:00 committed by GitHub
parent d67c1d59cf
commit 16e9142b56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 3 deletions

View File

@ -19,12 +19,12 @@ get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY)
if(CMAKE_HOST_WIN32)
vcpkg_acquire_msys(MSYS_ROOT PACKAGES make)
set(BASH ${MSYS_ROOT}/usr/bin/bash.exe)
set(ENV{PATH} "${MSYS_ROOT}/usr/bin;$ENV{PATH};${PERL_EXE_PATH}")
else()
set(BASH /bin/bash)
set(ENV{PATH} "${MSYS_ROOT}/usr/bin:$ENV{PATH}:${PERL_EXE_PATH}")
endif()
find_program(BASH NAME bash HINTS ${MSYS_ROOT}/usr/bin REQUIRED NO_CACHE)
vcpkg_find_acquire_program(NASM)
get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY)

View File

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

View File

@ -5010,7 +5010,7 @@
},
"libvpx": {
"baseline": "1.13.1",
"port-version": 0
"port-version": 1
},
"libwandio": {
"baseline": "4.2.1",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "88491a53de6cdc69ec82882d44aab8cf3b315577",
"version": "1.13.1",
"port-version": 1
},
{
"git-tree": "1484fb529e99fdedd95f2b46f65738a9e95fcaa1",
"version": "1.13.1",