mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 05:29:00 +08:00
[libvpx][mpg123] Fix use of YASM in MSBuild (via path) (#10952)
* Update vcpkg_build_msbuild.cmake * Update vcpkg_install_msbuild.cmake * Update portfile.cmake * Update CONTROL * Update portfile.cmake * Update CONTROL * Update ci.baseline.txt. * Update ci.baseline.txt * Update ci.baseline.txt * Update ci.baseline.txt * Update portfile.cmake * Update CONTROL * Update CONTROL * Update portfile.cmake * [mpg123][libvpx] UWP is a target Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
This commit is contained in:
parent
43760aa86f
commit
ed9511fcf6
@ -1,4 +1,5 @@
|
||||
Source: libvpx
|
||||
Version: 1.8.1-1
|
||||
Version: 1.8.1-2
|
||||
Homepage: https://github.com/webmproject/libvpx
|
||||
Description: The reference software implementation for the video coding formats VP8 and VP9.
|
||||
Supports: !(uwp|arm|arm64|linux|osx)
|
||||
|
@ -1,4 +1,4 @@
|
||||
include(vcpkg_common_functions)
|
||||
vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP" "Linux" "OSX")
|
||||
|
||||
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
||||
|
||||
@ -23,7 +23,6 @@ vcpkg_acquire_msys(MSYS_ROOT PACKAGES diffutils)
|
||||
get_filename_component(YASM_EXE_PATH ${YASM} DIRECTORY)
|
||||
get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY)
|
||||
|
||||
message(STATUS "PERL_EXE_PATH ; ${PERL_EXE_PATH}")
|
||||
set(ENV{PATH} "${YASM_EXE_PATH};${MSYS_ROOT}/usr/bin;$ENV{PATH};${PERL_EXE_PATH}")
|
||||
set(BASH ${MSYS_ROOT}/usr/bin/bash.exe)
|
||||
|
||||
|
@ -1,4 +1,5 @@
|
||||
Source: mpg123
|
||||
Version: 1.25.8-6
|
||||
Version: 1.25.8-7
|
||||
Homepage: https://sourceforge.net/projects/mpg123/
|
||||
Description: mpg123 is a real time MPEG 1.0/2.0/2.5 audio player/decoder for layers 1, 2 and 3 (MPEG 1.0 layer 3 also known as MP3).
|
||||
Description: mpg123 is a real time MPEG 1.0/2.0/2.5 audio player/decoder for layers 1, 2 and 3 (MPEG 1.0 layer 3 also known as MP3).
|
||||
Supports: !(uwp|arm)
|
||||
|
@ -1,4 +1,4 @@
|
||||
include(vcpkg_common_functions)
|
||||
vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "UWP")
|
||||
|
||||
set(MPG123_VERSION 1.25.8)
|
||||
set(MPG123_HASH f226317dddb07841a13753603fa13c0a867605a5a051626cb30d45cfba266d3d4296f5b8254f65b403bb5eef6addce1784ae8829b671a746854785cda1bad203)
|
||||
|
@ -957,15 +957,10 @@ libuuid:x86-windows=fail
|
||||
libuv:arm64-windows=fail
|
||||
libuv:arm-uwp=fail
|
||||
libuv:x64-uwp=fail
|
||||
# libvpx is failing because the port's attempt to make yasm available is not succeeding
|
||||
libvpx:arm-uwp=fail
|
||||
libvpx:arm64-windows=fail
|
||||
libvpx:x64-linux=fail
|
||||
libvpx:x64-osx=fail
|
||||
libvpx:x64-uwp=fail
|
||||
libvpx:x64-windows-static=fail
|
||||
libvpx:x64-windows=fail
|
||||
libvpx:x86-windows=fail
|
||||
libwandio:x86-windows=fail
|
||||
libwandio:x64-windows=fail
|
||||
libwandio:x64-windows-static=fail
|
||||
@ -1124,12 +1119,8 @@ mozjpeg:x64-uwp = skip
|
||||
mozjpeg:x64-windows = skip
|
||||
mozjpeg:x64-windows-static = skip
|
||||
mozjpeg:x86-windows = skip
|
||||
# mpg123 is failing because the port's attempt to make yasm available is not succeeding
|
||||
mpg123:arm-uwp=fail
|
||||
mpg123:x64-uwp=fail
|
||||
mpg123:x64-windows-static=fail
|
||||
mpg123:x64-windows=fail
|
||||
mpg123:x86-windows=fail
|
||||
mpir:arm64-windows=fail
|
||||
mpir:arm-uwp=fail
|
||||
mpir:x64-uwp=fail
|
||||
|
@ -91,6 +91,7 @@ function(vcpkg_build_msbuild)
|
||||
|
||||
list(APPEND _csc_OPTIONS
|
||||
/t:${_csc_TARGET}
|
||||
/p:UseEnv=True
|
||||
/p:Platform=${_csc_PLATFORM}
|
||||
/p:PlatformToolset=${_csc_PLATFORM_TOOLSET}
|
||||
/p:VCPkgLocalAppDataDisabled=true
|
||||
|
@ -131,6 +131,7 @@ function(vcpkg_install_msbuild)
|
||||
|
||||
list(APPEND _csc_OPTIONS
|
||||
/t:${_csc_TARGET}
|
||||
/p:UseEnv=True
|
||||
/p:Platform=${_csc_PLATFORM}
|
||||
/p:PlatformToolset=${_csc_PLATFORM_TOOLSET}
|
||||
/p:VCPkgLocalAppDataDisabled=true
|
||||
|
Loading…
Reference in New Issue
Block a user