From 5a58e645cefaae63d149ff50fc1ca1ec54c47a77 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Tue, 30 Jan 2024 12:39:15 -0800 Subject: [PATCH] [FFmpeg] update to 6.1.1 (#36443) * [FFmpeg] update to 6.1.1 * update version --------- Co-authored-by: Jon --- ports/ffmpeg/portfile.cmake | 2 +- ports/ffmpeg/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/f-/ffmpeg.json | 5 +++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 0a58f38816..82eca0f1e0 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ffmpeg/ffmpeg REF "n${VERSION}" - SHA512 abb9207364553248278f8e23e3d565da51ecb0ae9b20edda41624b314541bc3f53a8d6aac7fa5455168d2323d5d70d5a8acbe059f33423fbc2563e1a6cd0348b + SHA512 a84209fe36a2a0262ebc34b727e7600b12d4739991a95599d7b4df533791b12e2e43586ccc6ff26aab2f935a3049866204e322ec0c5e49e378fc175ded34e183 HEAD_REF master PATCHES 0001-create-lib-libraries.patch diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index 80601de1c0..7499e61358 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,6 @@ { "name": "ffmpeg", - "version": "6.1", - "port-version": 2, + "version": "6.1.1", "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/versions/baseline.json b/versions/baseline.json index b235da4a74..79abf41bf4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2625,8 +2625,8 @@ "port-version": 7 }, "ffmpeg": { - "baseline": "6.1", - "port-version": 2 + "baseline": "6.1.1", + "port-version": 0 }, "ffnvcodec": { "baseline": "11.1.5.3", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 95f7e1cd54..f2d8064f64 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1bb35d5c0d560a56e6429ca412c7bc5f3e55e930", + "version": "6.1.1", + "port-version": 0 + }, { "git-tree": "e749968704c8ad09bb7d2d9cfda93777fe94b563", "version": "6.1",