From f534a8147973ed5f412bda4c750d7df9cb0436b6 Mon Sep 17 00:00:00 2001 From: Andy Li Date: Fri, 29 Oct 2021 12:33:37 +0800 Subject: [PATCH 1/4] [ffmpeg] update to 4.4.1 --- ports/ffmpeg/portfile.cmake | 4 ++-- ports/ffmpeg/vcpkg.json | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 128726c2d453f5..9a547ebfd0f634 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -133,8 +133,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ffmpeg/ffmpeg - REF n4.4 - SHA512 ae7426ca476df9fa9dba52cab06c38e484f835653fb2da57e7c06f5589d887c0854ee17df93a2f57191d498c1264cb1c69312cf0a8214b476800382e2d260c4b + REF n4.4.1 + SHA512 a53e617937f9892c5cfddb00896be9ad8a3e398dc7cf3b6c893b52ff38aff6ff0cbc61a44cd5f93d9a28f775e71ae82996a5e2b699a769c1de8f882aab34c797 HEAD_REF master PATCHES 0001-create-lib-libraries.patch diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index fbf802114b5503..dd0b19cc88b4b2 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,6 @@ { "name": "ffmpeg", - "version": "4.4", - "port-version": 16, + "version": "4.4.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." From 3469846b64029531fa97a7559aa7f02af4013bc1 Mon Sep 17 00:00:00 2001 From: Andy Li Date: Fri, 29 Oct 2021 12:34:01 +0800 Subject: [PATCH 2/4] Update version database --- versions/baseline.json | 4 ++-- versions/f-/ffmpeg.json | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index cbbdd6004850c6..4185f2ecd0e51b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2129,8 +2129,8 @@ "port-version": 5 }, "ffmpeg": { - "baseline": "4.4", - "port-version": 16 + "baseline": "4.4.1", + "port-version": 0 }, "ffnvcodec": { "baseline": "11.1.5.0", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 83a90b0ae3b27a..980634c5b1b14e 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dece81926c04ebe4b2f6167ce9940714faf67723", + "version": "4.4.1", + "port-version": 0 + }, { "git-tree": "5a144dc0552d005429d8d6641608744883dee2ff", "version": "4.4", From 283a74703d36f3a5f68ce89c6cc5fd17bbb11426 Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Wed, 10 Nov 2021 17:52:32 +0800 Subject: [PATCH 3/4] update version --- versions/f-/ffmpeg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 980634c5b1b14e..d4518c3efc9aac 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "dece81926c04ebe4b2f6167ce9940714faf67723", + "git-tree": "93b0e1ad0b0e69214a632142b0c6a670137d5882", "version": "4.4.1", "port-version": 0 }, From 1df8c1e2ad64eb5a61d55bac7689485cc251d781 Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Fri, 12 Nov 2021 10:19:18 +0800 Subject: [PATCH 4/4] update version --- versions/f-/ffmpeg.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 0ec91d0afdfa37..fa79715efb5b9f 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e39b9e35530239498574713a75bd9160f23e1d20", + "version": "4.4.1", + "port-version": 0 + }, { "git-tree": "fa1d927c640e5fc9abb088c7409e90057cd0b371", "version": "4.4",