From b8c06302db236943193ea9732bfb2f033983ef07 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Fri, 26 Jul 2024 02:58:27 +0000 Subject: [PATCH 01/24] add feature --- ports/ffmpeg/portfile.cmake | 6 ++++++ ports/ffmpeg/vcpkg.json | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 4d1b9c716f4d0b..cc3a3c5776a3ab 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -334,6 +334,12 @@ else() set(OPTIONS "${OPTIONS} --disable-libfribidi") endif() +if("harfbuzz" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-libharfbuzz") +else() + set(OPTIONS "${OPTIONS} --disable-libharfbuzz") +endif() + if("iconv" IN_LIST FEATURES) set(OPTIONS "${OPTIONS} --enable-iconv") set(WITH_ICONV ON) diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index 0746fafd1d5872..b45f4be361eb03 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", "version": "6.1.1", - "port-version": 11, + "port-version": 12, "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." @@ -421,6 +421,12 @@ "freetype" ] }, + "harfbuzz": { + "description": "Needed for drawtext filter", + "dependencies": [ + "harfbuzz" + ] + }, "fribidi": { "description": "Improves drawtext filter", "dependencies": [ From ab779bc04bd4c3f6c5344f029d548bcfc4355678 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Fri, 26 Jul 2024 02:59:11 +0000 Subject: [PATCH 02/24] update version --- ports/ffmpeg/vcpkg.json | 12 ++++++------ versions/baseline.json | 10 +++++----- versions/f-/ffmpeg.json | 5 +++++ 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index b45f4be361eb03..cc5dc00046140e 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -421,12 +421,6 @@ "freetype" ] }, - "harfbuzz": { - "description": "Needed for drawtext filter", - "dependencies": [ - "harfbuzz" - ] - }, "fribidi": { "description": "Improves drawtext filter", "dependencies": [ @@ -436,6 +430,12 @@ "gpl": { "description": "Allow use of GPL code, the resulting libs and binaries will be under GPL" }, + "harfbuzz": { + "description": "Needed for drawtext filter", + "dependencies": [ + "harfbuzz" + ] + }, "iconv": { "description": "Iconv support", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index bf7533ff105ffa..990cbdd8e965c0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2128,10 +2128,6 @@ "baseline": "30.475.1", "port-version": 0 }, - "cyrus-sasl": { - "baseline": "2.1.28", - "port-version": 0 - }, "cxxgraph": { "baseline": "4.1.0", "port-version": 0 @@ -2148,6 +2144,10 @@ "baseline": "0.10.4", "port-version": 0 }, + "cyrus-sasl": { + "baseline": "2.1.28", + "port-version": 0 + }, "czmq": { "baseline": "4.2.1", "port-version": 4 @@ -2702,7 +2702,7 @@ }, "ffmpeg": { "baseline": "6.1.1", - "port-version": 11 + "port-version": 12 }, "ffnvcodec": { "baseline": "12.1.14.0", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index dbec2ed1c725b9..2bc26cb8ffc59a 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3f6246c93b4f77b7fce7e93dff26c4a3b98658c3", + "version": "6.1.1", + "port-version": 12 + }, { "git-tree": "15b90b33b76e69c2d9b876b32c4c9b47c97846ed", "version": "6.1.1", From c3131a5b8a262c29bf0b4d1fb0a9acf8300ea37b Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Fri, 26 Jul 2024 03:05:20 +0000 Subject: [PATCH 03/24] 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 2bc26cb8ffc59a..dc5f7578bb6831 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "3f6246c93b4f77b7fce7e93dff26c4a3b98658c3", + "git-tree": "33b69a45bc3566c50f7ecc9744d4dff8615ffb82", "version": "6.1.1", "port-version": 12 }, From ab0476d0f68fdba8cdd34878ba45d1e337d86527 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Fri, 26 Jul 2024 06:02:34 +0000 Subject: [PATCH 04/24] add feature --- scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json b/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json index 675db85c30ef9f..1c68beeca6b856 100644 --- a/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json +++ b/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json @@ -17,6 +17,7 @@ "bzip2", "freetype", "gpl", + "harfbuzz", "iconv", "lzma", "mp3lame", From b6cc104dcd060db7c3f9cc9625d3162d47c59069 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Fri, 26 Jul 2024 07:04:05 +0000 Subject: [PATCH 05/24] modify feature name --- ports/ffmpeg/vcpkg.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index cc5dc00046140e..d92210bf3775b8 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -430,8 +430,8 @@ "gpl": { "description": "Allow use of GPL code, the resulting libs and binaries will be under GPL" }, - "harfbuzz": { - "description": "Needed for drawtext filter", + "drawtext": { + "description": "Enable the drawtext filter", "dependencies": [ "harfbuzz" ] From 3b9fc2884263b985275d0e103f292633f72923d2 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Fri, 26 Jul 2024 07:04:45 +0000 Subject: [PATCH 06/24] update version --- ports/ffmpeg/vcpkg.json | 12 ++++++------ versions/f-/ffmpeg.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index d92210bf3775b8..3300806f2a1912 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -343,6 +343,12 @@ "dav1d" ] }, + "drawtext": { + "description": "Enable the drawtext filter", + "dependencies": [ + "harfbuzz" + ] + }, "fdk-aac": { "description": "AAC de/encoding via libfdk-aac, **including GPL-incompatible patent-encumbered HE-AAC**. If you do not require HE-AAC, use the built-in FFmpeg AAC codec.", "dependencies": [ @@ -430,12 +436,6 @@ "gpl": { "description": "Allow use of GPL code, the resulting libs and binaries will be under GPL" }, - "drawtext": { - "description": "Enable the drawtext filter", - "dependencies": [ - "harfbuzz" - ] - }, "iconv": { "description": "Iconv support", "dependencies": [ diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index dc5f7578bb6831..f0986d791e9bed 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "33b69a45bc3566c50f7ecc9744d4dff8615ffb82", + "git-tree": "87b20d08dd6797e0d3fad13dee8184323c13a7db", "version": "6.1.1", "port-version": 12 }, From 30d04d70126bcf8bae7863ce765ced68cea2ab32 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Fri, 26 Jul 2024 07:05:44 +0000 Subject: [PATCH 07/24] 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 f0986d791e9bed..7ec187976ef89d 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "87b20d08dd6797e0d3fad13dee8184323c13a7db", + "git-tree": "13d88bc0f22132df8dfc62df8181398d3a9c483c", "version": "6.1.1", "port-version": 12 }, From 49807ad0bc49fbdb6f0ae5a5160e4b10a9ef9e57 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Fri, 26 Jul 2024 07:28:15 +0000 Subject: [PATCH 08/24] modify feature name --- ports/ffmpeg/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index cc3a3c5776a3ab..4a266d2f600d2c 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -334,7 +334,7 @@ else() set(OPTIONS "${OPTIONS} --disable-libfribidi") endif() -if("harfbuzz" IN_LIST FEATURES) +if("drawtext" IN_LIST FEATURES) set(OPTIONS "${OPTIONS} --enable-libharfbuzz") else() set(OPTIONS "${OPTIONS} --disable-libharfbuzz") From 3f034f249620ebb739c343a4d1bc65c65ec80772 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Fri, 26 Jul 2024 07:28:25 +0000 Subject: [PATCH 09/24] modify feature name --- 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 7ec187976ef89d..9ce72c8d9f4580 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "13d88bc0f22132df8dfc62df8181398d3a9c483c", + "git-tree": "bf143a89b701c8c74cdd9ff69765a452cc4378e7", "version": "6.1.1", "port-version": 12 }, From e0e991a22d6b9050a754b68614b019a94a55081f Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Fri, 26 Jul 2024 07:40:24 +0000 Subject: [PATCH 10/24] modify ci test --- scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json b/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json index 1c68beeca6b856..58bf9a4172aa75 100644 --- a/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json +++ b/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json @@ -17,7 +17,7 @@ "bzip2", "freetype", "gpl", - "harfbuzz", + "drawtext", "iconv", "lzma", "mp3lame", From fd23fd895e7bd447cdc52a1e89fe2fbfd74168ff Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Mon, 5 Aug 2024 08:25:40 +0000 Subject: [PATCH 11/24] update version --- versions/baseline.json | 2 +- versions/f-/ffmpeg.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 6fc0613b371b41..d861adb8908c47 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2706,7 +2706,7 @@ }, "ffmpeg": { "baseline": "7.0", - "port-version": 0 + "port-version": 1 }, "ffnvcodec": { "baseline": "12.1.14.0", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 1f372997354614..cbcfddcb53db7d 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c5ac4ed2146d819b4d20db5c30215f56b431a22c", + "version": "7.0", + "port-version": 1 + }, { "git-tree": "6c14224b4a8c90efabd3640a98f76eaee8607f98", "version": "7.0", From cff6d7cc931e982aef01e7235877052066f0e40f Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Mon, 5 Aug 2024 09:05:39 +0000 Subject: [PATCH 12/24] merge master --- ports/ffmpeg/vcpkg.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index 96de59a0cdab0c..2ba6a81c1079d5 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -343,6 +343,12 @@ "dav1d" ] }, + "drawtext": { + "description": "Enable the drawtext filter", + "dependencies": [ + "harfbuzz" + ] + }, "fdk-aac": { "description": "AAC de/encoding via libfdk-aac, **including GPL-incompatible patent-encumbered HE-AAC**. If you do not require HE-AAC, use the built-in FFmpeg AAC codec.", "dependencies": [ From 6c011f791d02a22a44e733ab0a221a3ed74aea80 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Mon, 5 Aug 2024 09:06:04 +0000 Subject: [PATCH 13/24] 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 cbcfddcb53db7d..773709f1bdef37 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "c5ac4ed2146d819b4d20db5c30215f56b431a22c", + "git-tree": "870aca7c7ee0e7f640ae9590aad02dcc7c8c4b0a", "version": "7.0", "port-version": 1 }, From bd4552a6f7eeca5a6f29b4178c7959c2d709a4ad Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Tue, 6 Aug 2024 08:33:56 +0000 Subject: [PATCH 14/24] test feature --- scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json b/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json index 58bf9a4172aa75..dc5168515955be 100644 --- a/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json +++ b/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vcpkg-ci-ffmpeg", "version-string": "1", - "port-version": 2, + "port-version": 3, "description": "Port to force features of certain ports within CI", "homepage": "https://github.com/microsoft/vcpkg", "dependencies": [ @@ -15,6 +15,7 @@ "avformat", "avresample", "bzip2", + "drawtext", "freetype", "gpl", "drawtext", From 17a8a16811b8f2e768ed0753aab7a1f97008c673 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Wed, 7 Aug 2024 06:48:21 +0000 Subject: [PATCH 15/24] add missing head files --- ports/ffmpeg/0043-fix-miss-head.patch | 12 ++++++++++++ ports/ffmpeg/portfile.cmake | 1 + 2 files changed, 13 insertions(+) create mode 100644 ports/ffmpeg/0043-fix-miss-head.patch diff --git a/ports/ffmpeg/0043-fix-miss-head.patch b/ports/ffmpeg/0043-fix-miss-head.patch new file mode 100644 index 00000000000000..eeb5e94615298c --- /dev/null +++ b/ports/ffmpeg/0043-fix-miss-head.patch @@ -0,0 +1,12 @@ +diff --git a/libavfilter/textutils.c b/libavfilter/textutils.c +index ef658d0..c61b0ad 100644 +--- a/libavfilter/textutils.c ++++ b/libavfilter/textutils.c +@@ -30,6 +30,7 @@ + #include "libavutil/error.h" + #include "libavutil/file.h" + #include "libavutil/time.h" ++#include "libavutil/time_internal.h" + + static int ff_expand_text_function_internal(FFExpandTextContext *expand_text, AVBPrint *bp, + char *name, unsigned argc, char **argv) diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 88c664c983eafd..3f63f1bd622dcd 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -18,6 +18,7 @@ vcpkg_from_github( 0040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch # Do not remove this patch. It is required by chromium 0041-add-const-for-opengl-definition.patch 0042-fix-arm64-linux.patch #https://github.com/FFmpeg/FFmpeg/commit/fcfd17dbb4a6cf270cdd82e91c21a5efdc878d12 + 0043-fix-miss-head.patch ) if(SOURCE_PATH MATCHES " ") From 3757b30708dc30251437aa50a404c7098f8f1d60 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Wed, 7 Aug 2024 06:49:36 +0000 Subject: [PATCH 16/24] 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 773709f1bdef37..680fca5674c4f8 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "870aca7c7ee0e7f640ae9590aad02dcc7c8c4b0a", + "git-tree": "ed79eafa865ec6b07b5809e199265001478e5f0d", "version": "7.0", "port-version": 1 }, From 3693bef7fb260a6878d50123a7eaf6923fbdccbc Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Thu, 8 Aug 2024 06:53:55 +0000 Subject: [PATCH 17/24] add support --- scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json b/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json index dc5168515955be..f45b6070d2a328 100644 --- a/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json +++ b/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json @@ -15,10 +15,8 @@ "avformat", "avresample", "bzip2", - "drawtext", "freetype", "gpl", - "drawtext", "iconv", "lzma", "mp3lame", @@ -49,6 +47,14 @@ ], "platform": "linux" }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "drawtext" + ], + "platform": "!(uwp | android)" + }, { "name": "ffmpeg", "default-features": false, From 27ddf256adceabbcfa49194b535283e0f6878515 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Tue, 13 Aug 2024 03:09:50 +0000 Subject: [PATCH 18/24] udpate version --- versions/baseline.json | 2 +- versions/f-/ffmpeg.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 5f3135d01d3de8..02f4568237a336 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2706,7 +2706,7 @@ }, "ffmpeg": { "baseline": "7.0.2", - "port-version": 0 + "port-version": 1 }, "ffnvcodec": { "baseline": "12.1.14.0", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index a09c08d30204d6..5aad82c7d689d4 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9df3cb0543ac18ed879ea9316a5c59b3796ad1c7", + "version": "7.0.2", + "port-version": 1 + }, { "git-tree": "06d65a365249176f8903a085753cace74541b48e", "version": "7.0.2", From 3a1faba1182c42702df1ea1f777ad7872c2f94e4 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Tue, 13 Aug 2024 06:21:05 +0000 Subject: [PATCH 19/24] delete patch --- ports/ffmpeg/portfile.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 72d7dcdec8fb52..c73c6a2bf2955a 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -17,7 +17,6 @@ vcpkg_from_github( 0024-fix-osx-host-c11.patch 0040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch # Do not remove this patch. It is required by chromium 0041-add-const-for-opengl-definition.patch - #0042-fix-arm64-linux.patch #https://github.com/FFmpeg/FFmpeg/commit/fcfd17dbb4a6cf270cdd82e91c21a5efdc878d12 0043-fix-miss-head.patch ) From f730861f85cacae2f6f3dc924b1fffe8f36a712c Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Tue, 13 Aug 2024 06:21:31 +0000 Subject: [PATCH 20/24] 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 5aad82c7d689d4..f2ff693209a4d8 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "9df3cb0543ac18ed879ea9316a5c59b3796ad1c7", + "git-tree": "451812089ffc5a1cf3185d9a078da1aa162ee60c", "version": "7.0.2", "port-version": 1 }, From ff3e21d646b43091e4c22bce9ca8670a263e8005 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Thu, 15 Aug 2024 06:13:42 +0000 Subject: [PATCH 21/24] add feature --- ports/ffmpeg/vcpkg.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index d6da0b20a685ce..dcec526d4784e8 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -346,7 +346,13 @@ "drawtext": { "description": "Enable the drawtext filter", "dependencies": [ - "freetype", + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "freetype" + ] + }, "harfbuzz" ] }, From a8c0c06eec0b23bfefd7f95a77ed8e04f2aa5913 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Thu, 15 Aug 2024 06:14:10 +0000 Subject: [PATCH 22/24] 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 f2ff693209a4d8..fc720c6e2c8639 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "451812089ffc5a1cf3185d9a078da1aa162ee60c", + "git-tree": "ea90dfd2cfe984ef99a794e77335068e49aec2b7", "version": "7.0.2", "port-version": 1 }, From 078141880ce9cfd0db567a08b8d5deedce64cff3 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Thu, 15 Aug 2024 06:17:42 +0000 Subject: [PATCH 23/24] add feature --- ports/ffmpeg/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index c73c6a2bf2955a..3dd639f571c373 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -324,9 +324,9 @@ else() endif() if("drawtext" IN_LIST FEATURES) - set(OPTIONS "${OPTIONS} --enable-libharfbuzz --enable-libfreetype") + set(OPTIONS "${OPTIONS} --enable-libharfbuzz") else() - set(OPTIONS "${OPTIONS} --disable-libharfbuzz --disable-libfreetype") + set(OPTIONS "${OPTIONS} --disable-libharfbuzz") endif() if("freetype" IN_LIST FEATURES) From 24b40fd47c55f0ce14f623f37cad3bba0d3115e2 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Thu, 15 Aug 2024 06:17:53 +0000 Subject: [PATCH 24/24] 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 fc720c6e2c8639..cdd5b9476e10bc 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "ea90dfd2cfe984ef99a794e77335068e49aec2b7", + "git-tree": "35e04580b3c51724181a21fb38b75d55e53df9af", "version": "7.0.2", "port-version": 1 },