Skip to content

Commit

Permalink
[ffmpeg] Decouple from automake1.16
Browse files Browse the repository at this point in the history
  • Loading branch information
dg0yt committed Oct 20, 2024
1 parent d567b66 commit 9b337d2
Showing 4 changed files with 15 additions and 4 deletions.
10 changes: 8 additions & 2 deletions ports/ffmpeg/portfile.cmake
Original file line number Diff line number Diff line change
@@ -151,9 +151,15 @@ 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 "${MSYS_ROOT}/usr/bin/automake" --print-lib
OUTPUT_VARIABLE automake_lib
OUTPUT_STRIP_TRAILING_WHITESPACE
LOGNAME automake-print-lib
)
list(APPEND prog_env "${MSYS_ROOT}/usr/bin" "${automake_lib}")
else()
find_program(SHELL bash)
endif()
2 changes: 1 addition & 1 deletion ports/ffmpeg/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ffmpeg",
"version": "7.0.2",
"port-version": 5,
"port-version": 6,
"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."
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
@@ -2734,7 +2734,7 @@
},
"ffmpeg": {
"baseline": "7.0.2",
"port-version": 5
"port-version": 6
},
"ffnvcodec": {
"baseline": "12.2.72.0",
5 changes: 5 additions & 0 deletions versions/f-/ffmpeg.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e637e8930edfb35602db1fbe48f9575d3060f9c4",
"version": "7.0.2",
"port-version": 6
},
{
"git-tree": "d4bc112c6581274674b70429dacd87e5d0715ac4",
"version": "7.0.2",

0 comments on commit 9b337d2

Please sign in to comment.