mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-13 20:41:07 +08:00
[ffmpeg] Decouple from automake1.16 (#41678)
This commit is contained in:
parent
a18a047e3b
commit
cff6ed4571
@ -151,9 +151,16 @@ if(VCPKG_DETECTED_CMAKE_STRIP)
|
||||
endif()
|
||||
|
||||
if(VCPKG_HOST_IS_WINDOWS)
|
||||
vcpkg_acquire_msys(MSYS_ROOT PACKAGES automake1.16)
|
||||
vcpkg_acquire_msys(MSYS_ROOT PACKAGES automake)
|
||||
set(SHELL "${MSYS_ROOT}/usr/bin/bash.exe")
|
||||
list(APPEND prog_env "${MSYS_ROOT}/usr/bin" "${MSYS_ROOT}/usr/share/automake-1.16")
|
||||
vcpkg_execute_required_process(
|
||||
COMMAND "${SHELL}" -c "'/usr/bin/automake' --print-lib"
|
||||
OUTPUT_VARIABLE automake_lib
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
WORKING_DIRECTORY "${MSYS_ROOT}"
|
||||
LOGNAME automake-print-lib
|
||||
)
|
||||
list(APPEND prog_env "${MSYS_ROOT}/usr/bin" "${MSYS_ROOT}${automake_lib}")
|
||||
else()
|
||||
find_program(SHELL bash)
|
||||
endif()
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "ffmpeg",
|
||||
"version": "7.0.2",
|
||||
"port-version": 6,
|
||||
"port-version": 7,
|
||||
"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."
|
||||
|
@ -2738,7 +2738,7 @@
|
||||
},
|
||||
"ffmpeg": {
|
||||
"baseline": "7.0.2",
|
||||
"port-version": 6
|
||||
"port-version": 7
|
||||
},
|
||||
"ffnvcodec": {
|
||||
"baseline": "12.2.72.0",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "d6af07437c8b77783c3184f4d15a2b24d6b8f317",
|
||||
"version": "7.0.2",
|
||||
"port-version": 7
|
||||
},
|
||||
{
|
||||
"git-tree": "a269e8f98d0aabee2671587388602275bd7af837",
|
||||
"version": "7.0.2",
|
||||
|
Loading…
x
Reference in New Issue
Block a user