commit: edd65ed61fd33325159526d96493869ca2e05347
Author: Leonardo Hernández Hernández <leohdz172 <AT> proton <DOT> me>
AuthorDate: Sun Nov 12 04:53:33 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 22 17:35:28 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edd65ed6
media-video/ffmpeg: sync live
Signed-off-by: Leonardo Hernández Hernández <leohdz172 <AT> proton.me>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/ffmpeg/ffmpeg-9999.ebuild | 16 +++++++++++++---
media-video/ffmpeg/metadata.xml | 1 +
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild
b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 9d0e86211982..2f76b30f7342 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -91,7 +91,7 @@ FFMPEG_FLAG_MAP=(
appkit
bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r
vmaf:libvmaf
fribidi:libfribidi fontconfig ladspa lcms:lcms2 libass
libplacebo libtesseract lv2
- truetype:libfreetype vidstab:libvidstab
+ truetype:libfreetype truetype:libharfbuzz vidstab:libvidstab
rubberband:librubberband zeromq:libzmq zimg:libzimg
# libswresample options
libsoxr
@@ -269,7 +269,10 @@ RDEPEND="
)
nvenc? ( >=media-libs/nv-codec-headers-9.1.23.1 )
svt-av1? ( >=media-libs/svt-av1-0.9.0[${MULTILIB_USEDEP}] )
- truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+ truetype? (
+ >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
+ media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
+ )
vaapi? ( >=media-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] )
vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
vidstab? ( >=media-libs/vidstab-1.1.0[${MULTILIB_USEDEP}] )
@@ -447,6 +450,8 @@ multilib_src_configure() {
for i in "${CPU_FEATURES_MAP[@]}" ; do
use ${i%:*} || myconf+=( --disable-${i#*:} )
done
+ # Bug #917277, #917278
+ myconf+=( --disable-dotprod --disable-i8mm )
if use pic ; then
myconf+=( --enable-pic )
@@ -468,11 +473,16 @@ multilib_src_configure() {
done
# LTO support, bug #566282, bug #754654, bug #772854
- [[ ${ABI} != x86 ]] && is-flagq "-flto*" && myconf+=( "--enable-lto" )
+ if [[ ${ABI} != x86 ]] && is-flagq "-flto*"; then
+ # Respect -flto value, e.g -flto=thin
+ local v="$(get-flag flto)"
+ [[ -n ${v} ]] && myconf+=( "--enable-lto=${v}" ) || myconf+=(
"--enable-lto" )
+ fi
filter-lto
# Mandatory configuration
myconf=(
+ --disable-libaribcaption # libaribcaption is not packaged (yet?)
--enable-avfilter
--disable-stripping
# This is only for hardcoded cflags; those are used in
configure checks that may
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index d24bdaedb63c..14fb807be699 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -67,6 +67,7 @@
<flag name="srt">Enable support for Secure Reliable Transport
(SRT) via <pkg>net-libs/srt</pkg></flag>
<flag name="ssh">Enable SSH/sftp support via
<pkg>net-libs/libssh</pkg>.</flag>
<flag name="svt-av1">Enables AV1 encoding support via
<pkg>media-libs/svt-av1</pkg>.</flag>
+ <flag name="truetype">Enables drawtext filter via
<pkg>media-libs/freetype</pkg> and <pkg>media-libs/harfbuzz</pkg>.</flag>
<flag name="twolame">Enables MP2 encoding via
<pkg>media-sound/twolame</pkg> as an alternative to the internal encoder.</flag>
<flag name="vidstab">Enables video stabilization filter using
vid.stab library (<pkg>media-libs/vidstab</pkg>).</flag>
<flag name="vmaf">Enables Netflix's perceptual video quality
assessment filter using the library (<pkg>media-libs/libvmaf</pkg>).</flag>
