mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 10:21:07 +08:00
[ffmpeg] Add feature harfbuzz (#40105)
This commit is contained in:
parent
73964f854d
commit
eaef71b136
12
ports/ffmpeg/0043-fix-miss-head.patch
Normal file
12
ports/ffmpeg/0043-fix-miss-head.patch
Normal file
@ -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)
|
@ -17,7 +17,7 @@ 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
|
||||
)
|
||||
|
||||
if(SOURCE_PATH MATCHES " ")
|
||||
@ -323,6 +323,12 @@ else()
|
||||
set(OPTIONS "${OPTIONS} --disable-libfontconfig")
|
||||
endif()
|
||||
|
||||
if("drawtext" IN_LIST FEATURES)
|
||||
set(OPTIONS "${OPTIONS} --enable-libharfbuzz")
|
||||
else()
|
||||
set(OPTIONS "${OPTIONS} --disable-libharfbuzz")
|
||||
endif()
|
||||
|
||||
if("freetype" IN_LIST FEATURES)
|
||||
set(OPTIONS "${OPTIONS} --enable-libfreetype")
|
||||
else()
|
||||
|
@ -1,6 +1,7 @@
|
||||
{
|
||||
"name": "ffmpeg",
|
||||
"version": "7.0.2",
|
||||
"port-version": 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."
|
||||
@ -342,6 +343,19 @@
|
||||
"dav1d"
|
||||
]
|
||||
},
|
||||
"drawtext": {
|
||||
"description": "Enable the drawtext filter",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "ffmpeg",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"freetype"
|
||||
]
|
||||
},
|
||||
"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": [
|
||||
|
@ -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": [
|
||||
@ -47,6 +47,14 @@
|
||||
],
|
||||
"platform": "linux"
|
||||
},
|
||||
{
|
||||
"name": "ffmpeg",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"drawtext"
|
||||
],
|
||||
"platform": "!(uwp | android)"
|
||||
},
|
||||
{
|
||||
"name": "ffmpeg",
|
||||
"default-features": false,
|
||||
|
@ -2706,7 +2706,7 @@
|
||||
},
|
||||
"ffmpeg": {
|
||||
"baseline": "7.0.2",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"ffnvcodec": {
|
||||
"baseline": "12.1.14.0",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "35e04580b3c51724181a21fb38b75d55e53df9af",
|
||||
"version": "7.0.2",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "06d65a365249176f8903a085753cace74541b48e",
|
||||
"version": "7.0.2",
|
||||
|
Loading…
x
Reference in New Issue
Block a user