commit:     3c8ddcdcf98a702560e4b64a03c03e0865504575
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  9 12:58:28 2026 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Jan  9 13:07:53 2026 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c8ddcdc

media-video/ffmpeg-compat: sync with ffmpeg

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 media-video/ffmpeg-compat/ffmpeg-compat-4.4.5-r2.ebuild | 4 ++--
 media-video/ffmpeg-compat/ffmpeg-compat-4.4.6-r1.ebuild | 4 ++--
 media-video/ffmpeg-compat/ffmpeg-compat-6.1.3.ebuild    | 5 ++---
 media-video/ffmpeg-compat/ffmpeg-compat-6.1.4.ebuild    | 7 +++----
 media-video/ffmpeg-compat/ffmpeg-compat-7.1.2.ebuild    | 5 ++---
 media-video/ffmpeg-compat/ffmpeg-compat-7.1.3.ebuild    | 7 +++----
 media-video/ffmpeg-compat/metadata.xml                  | 1 -
 7 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/media-video/ffmpeg-compat/ffmpeg-compat-4.4.5-r2.ebuild 
b/media-video/ffmpeg-compat/ffmpeg-compat-4.4.5-r2.ebuild
index bf7ce1cc0ce1..017a422fce00 100644
--- a/media-video/ffmpeg-compat/ffmpeg-compat-4.4.5-r2.ebuild
+++ b/media-video/ffmpeg-compat/ffmpeg-compat-4.4.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2025 Gentoo Authors
+# Copyright 2025-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -412,7 +412,7 @@ multilib_src_configure() {
                --disable-libopencv # leaving for later due to circular 
opencv[ffmpeg]
                --disable-librist # librist itself needs attention first (bug 
#822012)
                --disable-libtensorflow # causes headaches, and is gone
-               --disable-libvmaf # use ffmpeg-6+ instead, needs old vmaf 
library
+               --disable-libvmaf # use ffmpeg-8+ instead, needs old vmaf (bug 
#968554)
                --disable-mbedtls # messy with slots, tests underlinking issues
                --disable-mmal # unsupported
                --disable-omx # unsupported (bug #653386)

diff --git a/media-video/ffmpeg-compat/ffmpeg-compat-4.4.6-r1.ebuild 
b/media-video/ffmpeg-compat/ffmpeg-compat-4.4.6-r1.ebuild
index db50965ff30b..9ce9c395d9d6 100644
--- a/media-video/ffmpeg-compat/ffmpeg-compat-4.4.6-r1.ebuild
+++ b/media-video/ffmpeg-compat/ffmpeg-compat-4.4.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2025 Gentoo Authors
+# Copyright 2025-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -412,7 +412,7 @@ multilib_src_configure() {
                --disable-libopencv # leaving for later due to circular 
opencv[ffmpeg]
                --disable-librist # librist itself needs attention first (bug 
#822012)
                --disable-libtensorflow # causes headaches, and is gone
-               --disable-libvmaf # use ffmpeg-6+ instead, needs old vmaf 
library
+               --disable-libvmaf # use ffmpeg-8+ instead, needs old vmaf (bug 
#968554)
                --disable-mbedtls # messy with slots, tests underlinking issues
                --disable-mmal # unsupported
                --disable-omx # unsupported (bug #653386)

diff --git a/media-video/ffmpeg-compat/ffmpeg-compat-6.1.3.ebuild 
b/media-video/ffmpeg-compat/ffmpeg-compat-6.1.3.ebuild
index 9632ac5f70a7..b75d342a6986 100644
--- a/media-video/ffmpeg-compat/ffmpeg-compat-6.1.3.ebuild
+++ b/media-video/ffmpeg-compat/ffmpeg-compat-6.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2025 Gentoo Authors
+# Copyright 2025-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -118,7 +118,6 @@ FFMPEG_IUSE_MAP=(
        vaapi
        vdpau
        vidstab:libvidstab
-       vmaf:libvmaf
        vorbis:libvorbis
        vpx:libvpx
        vulkan
@@ -273,7 +272,6 @@ COMMON_DEPEND="
                x11-libs/libvdpau[${MULTILIB_USEDEP}]
        )
        vidstab? ( media-libs/vidstab[${MULTILIB_USEDEP}] )
-       vmaf? ( media-libs/libvmaf:=[${MULTILIB_USEDEP}] )
        vorbis? ( media-libs/libvorbis[${MULTILIB_USEDEP}] )
        vpx? ( media-libs/libvpx:=[${MULTILIB_USEDEP}] )
        vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
@@ -463,6 +461,7 @@ multilib_src_configure() {
                --disable-libopencv # leaving for later due to circular 
opencv[ffmpeg]
                --disable-librist # librist itself needs attention first (bug 
#822012)
                --disable-libtensorflow # causes headaches, and is gone
+               --disable-libvmaf # use ffmpeg-8+ instead, needs old vmaf (bug 
#968554)
                --disable-mbedtls # messy with slots, tests underlinking issues
                --disable-mmal # prefer USE=soc
                --disable-omx # unsupported (bug #653386)

diff --git a/media-video/ffmpeg-compat/ffmpeg-compat-6.1.4.ebuild 
b/media-video/ffmpeg-compat/ffmpeg-compat-6.1.4.ebuild
index a836ea141d3d..b75d342a6986 100644
--- a/media-video/ffmpeg-compat/ffmpeg-compat-6.1.4.ebuild
+++ b/media-video/ffmpeg-compat/ffmpeg-compat-6.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2025 Gentoo Authors
+# Copyright 2025-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -25,7 +25,7 @@ else
                https://dev.gentoo.org/~ionen/distfiles/ffmpeg-$(ver_cut 
1-2)-patchset-3.tar.xz
        "
        S=${WORKDIR}/ffmpeg-${PV} # avoid ${P} for ffmpeg-compat
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
+       KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv 
~sparc x86 ~arm64-macos ~x64-macos"
 fi
 
 DESCRIPTION="Complete solution to record/convert/stream audio and video"
@@ -118,7 +118,6 @@ FFMPEG_IUSE_MAP=(
        vaapi
        vdpau
        vidstab:libvidstab
-       vmaf:libvmaf
        vorbis:libvorbis
        vpx:libvpx
        vulkan
@@ -273,7 +272,6 @@ COMMON_DEPEND="
                x11-libs/libvdpau[${MULTILIB_USEDEP}]
        )
        vidstab? ( media-libs/vidstab[${MULTILIB_USEDEP}] )
-       vmaf? ( media-libs/libvmaf:=[${MULTILIB_USEDEP}] )
        vorbis? ( media-libs/libvorbis[${MULTILIB_USEDEP}] )
        vpx? ( media-libs/libvpx:=[${MULTILIB_USEDEP}] )
        vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
@@ -463,6 +461,7 @@ multilib_src_configure() {
                --disable-libopencv # leaving for later due to circular 
opencv[ffmpeg]
                --disable-librist # librist itself needs attention first (bug 
#822012)
                --disable-libtensorflow # causes headaches, and is gone
+               --disable-libvmaf # use ffmpeg-8+ instead, needs old vmaf (bug 
#968554)
                --disable-mbedtls # messy with slots, tests underlinking issues
                --disable-mmal # prefer USE=soc
                --disable-omx # unsupported (bug #653386)

diff --git a/media-video/ffmpeg-compat/ffmpeg-compat-7.1.2.ebuild 
b/media-video/ffmpeg-compat/ffmpeg-compat-7.1.2.ebuild
index 7c015bc736e2..df095d5bdd16 100644
--- a/media-video/ffmpeg-compat/ffmpeg-compat-7.1.2.ebuild
+++ b/media-video/ffmpeg-compat/ffmpeg-compat-7.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2025 Gentoo Authors
+# Copyright 2025-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -122,7 +122,6 @@ FFMPEG_IUSE_MAP=(
        vaapi
        vdpau
        vidstab:libvidstab
-       vmaf:libvmaf
        vorbis:libvorbis
        vpx:libvpx
        vulkan
@@ -284,7 +283,6 @@ COMMON_DEPEND="
                x11-libs/libvdpau[${MULTILIB_USEDEP}]
        )
        vidstab? ( media-libs/vidstab[${MULTILIB_USEDEP}] )
-       vmaf? ( media-libs/libvmaf:=[${MULTILIB_USEDEP}] )
        vorbis? ( media-libs/libvorbis[${MULTILIB_USEDEP}] )
        vpx? ( media-libs/libvpx:=[${MULTILIB_USEDEP}] )
        vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
@@ -477,6 +475,7 @@ multilib_src_configure() {
                --disable-librist # librist itself needs attention first (bug 
#822012)
                --disable-libtensorflow # causes headaches, and is gone
                --disable-libtorch # support may need special attention (bug 
#936127)
+               --disable-libvmaf # use ffmpeg-8+ instead, needs old vmaf (bug 
#968554)
                --disable-mbedtls # messy with slots, tests underlinking issues
                --disable-mmal # prefer USE=soc
                --disable-omx # unsupported (bug #653386)

diff --git a/media-video/ffmpeg-compat/ffmpeg-compat-7.1.3.ebuild 
b/media-video/ffmpeg-compat/ffmpeg-compat-7.1.3.ebuild
index ec95180052fc..df095d5bdd16 100644
--- a/media-video/ffmpeg-compat/ffmpeg-compat-7.1.3.ebuild
+++ b/media-video/ffmpeg-compat/ffmpeg-compat-7.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2025 Gentoo Authors
+# Copyright 2025-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -25,7 +25,7 @@ else
                https://dev.gentoo.org/~ionen/distfiles/ffmpeg-$(ver_cut 
1-2)-patchset-2.tar.xz
        "
        S=${WORKDIR}/ffmpeg-${PV} # avoid ${P} for ffmpeg-compat
-       KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86 ~arm64-macos ~x64-macos"
+       KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc 
x86 ~arm64-macos ~x64-macos"
 fi
 
 DESCRIPTION="Complete solution to record/convert/stream audio and video"
@@ -122,7 +122,6 @@ FFMPEG_IUSE_MAP=(
        vaapi
        vdpau
        vidstab:libvidstab
-       vmaf:libvmaf
        vorbis:libvorbis
        vpx:libvpx
        vulkan
@@ -284,7 +283,6 @@ COMMON_DEPEND="
                x11-libs/libvdpau[${MULTILIB_USEDEP}]
        )
        vidstab? ( media-libs/vidstab[${MULTILIB_USEDEP}] )
-       vmaf? ( media-libs/libvmaf:=[${MULTILIB_USEDEP}] )
        vorbis? ( media-libs/libvorbis[${MULTILIB_USEDEP}] )
        vpx? ( media-libs/libvpx:=[${MULTILIB_USEDEP}] )
        vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
@@ -477,6 +475,7 @@ multilib_src_configure() {
                --disable-librist # librist itself needs attention first (bug 
#822012)
                --disable-libtensorflow # causes headaches, and is gone
                --disable-libtorch # support may need special attention (bug 
#936127)
+               --disable-libvmaf # use ffmpeg-8+ instead, needs old vmaf (bug 
#968554)
                --disable-mbedtls # messy with slots, tests underlinking issues
                --disable-mmal # prefer USE=soc
                --disable-omx # unsupported (bug #653386)

diff --git a/media-video/ffmpeg-compat/metadata.xml 
b/media-video/ffmpeg-compat/metadata.xml
index 351ad96c19dc..b31eae0d6899 100644
--- a/media-video/ffmpeg-compat/metadata.xml
+++ b/media-video/ffmpeg-compat/metadata.xml
@@ -99,7 +99,6 @@
                        in addition to FFmpeg's own implementation
                </flag>
                <flag name="vidstab">Enable video stabilization filter support 
via <pkg>media-libs/vidstab</pkg></flag>
-               <flag name="vmaf">Enable Netflix's perceptual video quality 
assessment filter support via <pkg>media-libs/libvmaf</pkg></flag>
                <flag name="vpx">
                        Enable VP8 and VP9 de/encoding support via 
<pkg>media-libs/libvpx</pkg>
                        in addition to FFmpeg's own implementation (for 
decoding only)

Reply via email to