gentoo auto-resync : 12:03:2025 - 01:49:51next

23 files changed, 132 insertions, 5 deletions

diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index 8ba96a88b9a1..cf81f08e67af 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Ionen Wolkens <ionen@gentoo.org> (2025-03-10)
+# media-libs/libopenmpt is not keyworded here
+media-video/ffmpeg openmpt
+media-video/ffmpeg-compat openmpt
+
 # Sam James <sam@gentoo.org> (2025-03-04)
 # qt is not keyworded here
 net-wireless/wpa_supplicant gui
@@ -72,6 +77,7 @@ mail-filter/pyzor redis test
 # Andreas Sturmlechner <asturm@gentoo.org> (2024-06-29)
 # media-libs/libplacebo is not keyworded
 media-video/ffmpeg libplacebo
+media-video/ffmpeg-compat libplacebo
 
 # Michał Górny <mgorny@gentoo.org> (2024-05-08)
 # Requires sys-devel/{clang,llvm}:16.
@@ -99,7 +105,8 @@ media-video/ffmpeg glslang
 
 # matoro <matoro_gentoo@matoro.tk> (2023-11-24)
 # media-libs/shaderc not keyworded here.
->=media-video/ffmpeg-5 shaderc
+media-video/ffmpeg shaderc
+media-video/ffmpeg-compat shaderc
 
 # matoro <matoro_gentoo@matoro.tk> (2023-11-14)
 # dev-db/mysql not keyworded here.
@@ -211,6 +218,7 @@ media-libs/freetype svg
 # Adel Kara Slimane <adel.ks@zegrapher.com> (2022-03-14)
 # Untested useflag on other arches, needs keywording
 media-video/ffmpeg vmaf
+media-video/ffmpeg-compat vmaf
 
 # Sam James <sam@gentoo.org> (2022-01-29)
 # app-text/ronn-ng not keyworded here, bug #801103
@@ -219,6 +227,7 @@ app-accessibility/espeak-ng man
 # James Beddek <telans@posteo.de> (2022-01-15)
 # media-libs/svt-av1 is not keyworded here
 media-video/ffmpeg svt-av1
+media-video/ffmpeg-compat svt-av1
 
 # Sam James <sam@gentoo.org> (2021-11-05)
 # Avoid keywording unnecessary depenencies for now, bug #804115
@@ -282,6 +291,7 @@ sci-libs/umfpack cholmod
 # bug #769098, bug #769122
 media-libs/openal sndio
 media-video/ffmpeg sndio
+media-video/ffmpeg-compat sndio
 media-sound/moc sndio
 media-libs/libsdl2 sndio
 media-libs/libao sndio
@@ -370,6 +380,7 @@ sys-block/thin-provisioning-tools test
 # Mask USE=dav1d, media-libs/dav1d is not keyworded
 # Mask USE=libaribb24, media-libs/aribb24 is not keyworded
 media-video/ffmpeg dav1d libaribb24 libtesseract
+media-video/ffmpeg-compat dav1d libaribb24 libtesseract
 
 # Andrey Utkin <andrey_utkin@gentoo.org> (2020-03-11)
 # USE=bpf depends on llvm-core/clang which is not keyworded on alpha.
@@ -456,6 +467,7 @@ net-libs/gnutls test-full
 # Tobias Klausmann <klausman@gentoo.org> (2017-03-02)
 # libilbc has not been ported to alpha and likely never will be.
 media-video/ffmpeg libilbc
+media-video/ffmpeg-compat libilbc
 
 # Tobias Klausmann <klausman@gentoo.org> (2016-01-25)
 # The tests use hypothesis which complains about too-slow tests on
@@ -497,6 +509,7 @@ app-admin/conky cmus irc
 # Tobias Klausmann <klausman@gentoo.org> (2016-06-07)
 # nasm is x86/x86-64 only
 media-video/ffmpeg openh264
+media-video/ffmpeg-compat openh264
 
 # Tobias Klausmann <klausman@gentoo.org> (2016-02-04)
 # sys-cluster/ceph is not broken per se, but a maintenance burden.
@@ -557,6 +570,7 @@ app-accessibility/orca braille
 # Tobias Klausmann <klausman@gentoo.org>
 # media-libs/x265 doesn't work on alpha (bug 519046)
 media-video/ffmpeg x265
+media-video/ffmpeg-compat x265
 
 # Pacho Ramos <pacho@gentoo.org> (2014-02-22)
 # Missing keywords, bug #495250
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 4ab21f782c0f..c5a41dc29cea 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -17,6 +17,22 @@
 
 #--- END OF EXAMPLES ---
 
+# # Sam James <sam@gentoo.org> (2025-03-11)
+# The COBOL frontend only allows building on a small number of platforms
+# for now until more testing and integration is done.
+sys-devel/gcc -cobol
+
+# Ionen Wolkens <ionen@gentoo.org> (2025-03-10)
+# dev-util/nvidia-cuda-toolkit is keyworded here
+media-video/ffmpeg -npp
+media-video/ffmpeg-compat -npp
+
+# Ionen Wolkens <ionen@gentoo.org> (2025-03-10)
+# Old versions of ffmpeg needing old nv-codec-codecs complicate slots
+# (done here due to the unmasking in arch/amd64).
+<media-video/ffmpeg-5 nvenc
+<media-video/ffmpeg-compat-5 nvenc
+
 # Thibaud CANALE <thican@thican.net> (2025-03-09)
 # Google DNS dependencies available (bug 949851)
 app-crypt/certbot -certbot-dns-google
@@ -215,6 +231,7 @@ net-misc/curl -rustls -curl_ssl_rustls
 # Quick Sync Video (through intel-mediasdk or libvpl) is
 # only keyworded on amd64
 media-video/ffmpeg -qsv
+media-video/ffmpeg-compat -qsv
 
 # WANG Xuerui <xen0n@gentoo.org> (2022-10-07)
 # sys-libs/libsmbios is available here.
@@ -243,6 +260,7 @@ media-libs/libva-intel-driver -hybrid
 # Adel Kara Slimane <adel.ks@zegrapher.com> (2022-02-17)
 # Unmask AMF keyword on amd64 only
 media-video/ffmpeg -amf
+media-video/ffmpeg-compat -amf
 media-video/handbrake -amf
 
 # James Le Cuirot <chewi@gentoo.org> (2021-10-22)
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index 2d89b4ff1d90..23ef36b759f3 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -80,11 +80,13 @@ net-misc/curl rustls curl_ssl_rustls
 # Sam James <sam@gentoo.org> (2022-12-07)
 # Needs unstable media-libs/libvpl
 media-video/ffmpeg qsv
+media-video/ffmpeg-compat qsv
 media-video/handbrake qsv
 
 # Adel Kara Slimane <adel.ks@zegrapher.com> (2022-03-14)
 # needs stabilizing
 media-video/ffmpeg vmaf
+media-video/ffmpeg-compat vmaf
 
 # Joonas Niilola <juippis@gentoo.org> (2021-08-13)
 # dev-libs/efl is stabilized on amd64.
diff --git a/profiles/arch/arm/package.use b/profiles/arch/arm/package.use
index 651d66ae8208..8ff3ebe82129 100644
--- a/profiles/arch/arm/package.use
+++ b/profiles/arch/arm/package.use
@@ -5,4 +5,5 @@
 # Apply additional FFmpeg patches for efficient playback on some SoCs.
 media-tv/kodi soc
 media-video/ffmpeg libdrm soc
+media-video/ffmpeg-compat soc
 media-video/mpv soc
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index a5f1c79094d5..058f253aab59 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -107,6 +107,7 @@ sys-kernel/installkernel -grub
 # Leonardo Hernández Hernández <leohdz172@proton.me> (2023-11-15)
 # media-libs/shaderc in not keyworded
 media-video/ffmpeg shaderc
+media-video/ffmpeg-compat shaderc
 
 # Jon Janzen <jon@jonjanzen.com> (2023-09-11)
 # librttopo has not been tested on this arch
@@ -171,6 +172,7 @@ app-text/enchant nuspell
 # Adel Kara Slimane <adel.ks@zegrapher.com> (2022-03-14)
 # Untested useflag on other arches, needs keywording
 media-video/ffmpeg vmaf
+media-video/ffmpeg-compat vmaf
 
 # Sam James <sam@gentoo.org> (2022-03-10)
 # Boost has support for ARM32
diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask
index c31719dbb00f..a609e9cd3e66 100644
--- a/profiles/arch/arm/package.use.stable.mask
+++ b/profiles/arch/arm/package.use.stable.mask
@@ -16,6 +16,7 @@ x11-misc/xdg-utils plasma
 # Andreas Sturmlechner <asturm@gentoo.org> (2024-06-29)
 # media-libs/libplacebo is not stable here
 media-video/ffmpeg libplacebo
+media-video/ffmpeg-compat libplacebo
 
 # Nowa Ammerlaan <nowa@gentoo.org> (2024-03-21)
 # Experimental, virt-firmware is keyworded only unstable
@@ -139,6 +140,7 @@ media-sound/mpd fluidsynth
 # Alexis Ballier <aballier@gentoo.org> (2017-05-29)
 # frei0r-plugins is not stable yet, mask it on stable versions
 media-video/ffmpeg frei0r
+media-video/ffmpeg-compat frei0r
 
 # Michael Weber <xmw@gentoo.org> (2017-04-01)
 # no stable jdk
diff --git a/profiles/arch/arm64/package.use b/profiles/arch/arm64/package.use
index 14f8b65ef281..2a1e113cf3ce 100644
--- a/profiles/arch/arm64/package.use
+++ b/profiles/arch/arm64/package.use
@@ -11,6 +11,7 @@
 # Apply additional FFmpeg patches for efficient playback on some SoCs.
 media-tv/kodi soc
 media-video/ffmpeg libdrm soc
+media-video/ffmpeg-compat soc
 media-video/mpv soc
 
 # Alexis Ballier <aballier@gentoo.org> (2017-07-10)
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index b60e01d5b242..a1bf2726fc8c 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,22 @@
 # Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2025-03-11)
+# The COBOL frontend only allows building on a small number of platforms
+# for now until more testing and integration is done.
+sys-devel/gcc -cobol
+
+# Ionen Wolkens <ionen@gentoo.org> (2025-03-10)
+# dev-util/nvidia-cuda-toolkit is keyworded here
+media-video/ffmpeg -npp
+media-video/ffmpeg-compat -npp
+
+# Ionen Wolkens <ionen@gentoo.org> (2025-03-10)
+# Old versions of ffmpeg needing old nv-codec-codecs complicate slots
+# (done here due to the unmasking in arch/arm64).
+<media-video/ffmpeg-5 nvenc
+<media-video/ffmpeg-compat-5 nvenc
+
 # Thibaud CANALE <thican@thican.net> (2025-03-09)
 # Google DNS dependencies available (bug 949851)
 app-crypt/certbot -certbot-dns-google
@@ -121,6 +137,7 @@ app-arch/rpm -sequoia
 # Leonardo Hernández Hernández <leohdz172@proton.me> (2023-11-15)
 # media-libs/shaderc in not keyworded
 media-video/ffmpeg shaderc
+media-video/ffmpeg-compat shaderc
 
 # Jimi Huotari <chiitoo@gentoo.org> (2023-10-21)
 # Unmask on specific arches where it's available.
@@ -184,6 +201,7 @@ app-text/enchant nuspell
 # Adel Kara Slimane <adel.ks@zegrapher.com> (2022-03-14)
 # Untested useflag on other arches, needs keywording
 media-video/ffmpeg vmaf
+media-video/ffmpeg-compat vmaf
 
 # Sam James <sam@gentoo.org> (2022-02-26)
 # Supports 64-bit NEON
@@ -401,6 +419,7 @@ media-libs/mlt -sdl
 media-libs/openal -sdl
 media-sound/mpg123 -sdl
 media-video/ffmpeg -sdl
+media-video/ffmpeg-compat -sdl
 media-video/mplayer -sdl
 media-video/mpv -sdl
 >=x11-libs/wxGTK-3 -sdl
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index e0b6400c3139..8d11766e0f71 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -1,6 +1,16 @@
 # Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2025-03-11)
+# The COBOL frontend only allows building on a small number of platforms
+# for now until more testing and integration is done.
+sys-devel/gcc cobol
+
+# Ionen Wolkens <ionen@gentoo.org> (2025-03-10)
+# dev-util/nvidia-cuda-toolkit has very few keywords
+media-video/ffmpeg npp
+media-video/ffmpeg-compat npp
+
 # Thibaud CANALE <thican@thican.net> (2025-03-09)
 # Too many dependencies are not keyworded (bug 949851)
 # - dev-python/google-api-python-client
@@ -182,6 +192,7 @@ net-misc/curl rustls curl_ssl_rustls
 # Quick Sync Video (through intel-mediasdk or oneVPL) is
 # only keyworded on amd64
 media-video/ffmpeg qsv
+media-video/ffmpeg-compat qsv
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2022-12-01)
 # Only supported on ppc64le.
@@ -228,6 +239,7 @@ sys-boot/grub grub_platforms_loongson grub_platforms_qemu-mips
 # Mask AMF keyword on non-amd64 arches
 # It is unusable, for now, in other arches
 media-video/ffmpeg amf
+media-video/ffmpeg-compat amf
 media-video/handbrake amf
 
 # Sam James <sam@gentoo.org> (2021-11-15)
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index 1706428078a7..f954f68764b3 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -4,6 +4,11 @@
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.
 
+# Ionen Wolkens <ionen@gentoo.org> (2025-03-10)
+# media-libs/libopenmpt is not keyworded here
+media-video/ffmpeg openmpt
+media-video/ffmpeg-compat openmpt
+
 # Sam James <sam@gentoo.org> (2025-01-14)
 # dev-cpp/benchmark isn't (yet) keyworded here, although >=1.9.1 should
 # work fine with patching as the ebuild does.
@@ -103,6 +108,7 @@ media-libs/libv4l bpf
 # Leonardo Hernández Hernández <leohdz172@proton.me> (2023-11-15)
 # Vulkan is not available here
 media-video/ffmpeg glslang shaderc vulkan
+media-video/ffmpeg-compat shaderc vulkan
 
 # Violet Purcell <vimproved@inventati.org> (2023-10-12)
 # dev-build/samurai is not keyworded here.
@@ -218,6 +224,7 @@ media-libs/xine-lib dav1d
 # Adel Kara Slimane <adel.ks@zegrapher.com> (2022-03-14)
 # Untested useflag on other arches, needs keywording
 media-video/ffmpeg vmaf
+media-video/ffmpeg-compat vmaf
 
 # Sam James <sam@gentoo.org> (2022-03-06)
 # Unkeyworded dependencies
@@ -345,6 +352,7 @@ media-sound/vorbis-tools kate
 # Rolf Eike Beer <eike@sf-mail.de> (2020-04-14)
 # dependencies not keyworded
 media-video/ffmpeg dav1d libaribb24 libtesseract vidstab
+media-video/ffmpeg-compat dav1d libaribb24 libtesseract vidstab
 
 # Rolf Eike Beer <eike@sf-mail.de> (2020-04-11)
 # media-gfx/nvidia-texture-tools, media-libs/allegro not keyworded on hppa
@@ -422,6 +430,7 @@ app-forensics/sleuthkit java
 # media-libs/libilbc has not been ported to HPPA
 # media-libs/zimg triggers a toolchain issue (bug #597152)
 media-video/ffmpeg libilbc zimg
+media-video/ffmpeg-compat libilbc zimg
 
 # Justin Lecher <jlec@gentoo.org> (2017-01-15)
 # unkeyworded rev deps
diff --git a/profiles/arch/hppa/package.use.stable.mask b/profiles/arch/hppa/package.use.stable.mask
index 4e7b74a3ce95..ad506be86530 100644
--- a/profiles/arch/hppa/package.use.stable.mask
+++ b/profiles/arch/hppa/package.use.stable.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # When you add an entry to the top of this file, add your name, the date, and
@@ -258,6 +258,7 @@ media-gfx/imagemagick raw
 # media-libs/{libdc1394,x264} is not stable.
 # media-libs/game-music-emu is not stable.
 media-video/ffmpeg gme ieee1394 x264
+media-video/ffmpeg-compat gme ieee1394 x264
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2018-05-06)
 # sci-visualization/gnuplot is not stable.
diff --git a/profiles/arch/loong/package.use.mask b/profiles/arch/loong/package.use.mask
index d9c844bc2a59..4a64c1ccfb41 100644
--- a/profiles/arch/loong/package.use.mask
+++ b/profiles/arch/loong/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Ionen Wolkens <ionen@gentoo.org> (2025-03-10)
+# media-libs/libopenmpt is not keyworded here
+media-video/ffmpeg openmpt
+media-video/ffmpeg-compat openmpt
+
 # WANG Xuerui <xen0n@gentoo.org> (2025-03-04)
 # this target has support for sanitizers
 sys-devel/gcc -sanitize
@@ -54,6 +59,7 @@ media-libs/libass libunibreak
 # WANG Xuerui <xen0n@gentoo.org> (2024-09-27)
 # media-libs/libilbc needs porting
 media-video/ffmpeg libilbc
+media-video/ffmpeg-compat libilbc
 net-analyzer/wireshark ilbc
 net-libs/pjproject ilbc
 net-misc/asterisk ilbc
@@ -252,6 +258,7 @@ app-cdr/brasero tracker
 dev-cpp/libcmis man
 media-libs/opencv tesseract
 media-video/ffmpeg libtesseract
+media-video/ffmpeg-compat libtesseract
 
 # WANG Xuerui <xen0n@gentoo.org> (2022-12-05)
 # sys-auth/sssd isn't keyworded here yet
diff --git a/profiles/arch/m68k/package.use.mask b/profiles/arch/m68k/package.use.mask
index 18462660235f..fedd05d2ea0f 100644
--- a/profiles/arch/m68k/package.use.mask
+++ b/profiles/arch/m68k/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # James Le Cuirot <chewi@gentoo.org> (2024-07-13)
@@ -35,6 +35,7 @@ sys-apps/systemd tpm xkb
 # Adel Kara Slimane <adel.ks@zegrapher.com> (2022-03-14)
 # Untested useflag on other arches, needs keywording
 media-video/ffmpeg vmaf
+media-video/ffmpeg-compat vmaf
 
 # James Le Cuirot <chewi@gentoo.org> (2022-01-09)
 # Most usage of KMS requires GBM, which is provided by Mesa, which currently
diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index 877f13ac5057..530e1a1a93fb 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -1,6 +1,16 @@
 # Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Ionen Wolkens <ionen@gentoo.org> (2025-03-10)
+# net-libs/rabbitmq-c is not keyworded here
+media-video/ffmpeg rabbitmq
+media-video/ffmpeg-compat rabbitmq
+
+# Ionen Wolkens <ionen@gentoo.org> (2025-03-10)
+# media-libs/libopenmpt is not keyworded here
+media-video/ffmpeg openmpt
+media-video/ffmpeg-compat openmpt
+
 # Sam James <sam@gentoo.org> (2025-03-04)
 # qt is not keyworded here
 net-wireless/wpa_supplicant gui
@@ -8,6 +18,7 @@ net-wireless/wpa_supplicant gui
 # Sam James <sam@gentoo.org> (2025-02-21)
 # media-video/rav1e is not yet keyworded here
 media-video/ffmpeg rav1e
+media-video/ffmpeg-compat rav1e
 
 # Pacho Ramos <pacho@gentoo.org> (2025-01-26)
 # Needs unkeyworded net-libs/msgraph
@@ -68,6 +79,7 @@ app-crypt/gcr:4 gtk
 # Arthur Zamarin <arthurzam@gentoo.org> (2024-09-06)
 # media-libs/vidstab is not keyworded
 media-video/ffmpeg vidstab
+media-video/ffmpeg-compat vidstab
 
 # Arthur Zamarin <arthurzam@gentoo.org> (2024-09-06)
 # media-video/rav1e isn't keyworded here
@@ -142,6 +154,7 @@ dev-util/maturin doc
 # Andreas Sturmlechner <asturm@gentoo.org> (2024-06-29)
 # media-libs/libplacebo is not keyworded
 media-video/ffmpeg libplacebo
+media-video/ffmpeg-compat libplacebo
 
 # Michał Górny <mgorny@gentoo.org> (2024-05-08)
 # Requires sys-devel/{clang,llvm}:16.
@@ -177,10 +190,12 @@ dev-lang/php capstone
 # media-libs/libjxl casualties
 # https://github.com/libjxl/libjxl/issues/2433
 media-video/ffmpeg jpegxl
+media-video/ffmpeg-compat jpegxl
 
 # matoro <matoro_gentoo@matoro.tk> (2023-12-15)
 # media-libs/libvpx casualties (#700902)
 media-video/ffmpeg vpx
+media-video/ffmpeg-compat vpx
 media-plugins/gst-plugins-meta vpx
 
 # matoro <matoro_gentoo@matoro.tk> (2023-11-26)
@@ -193,7 +208,8 @@ net-analyzer/rrdtool rados
 
 # matoro <matoro_gentoo@matoro.tk> (2023-11-24)
 # media-libs/shaderc not keyworded here.
->=media-video/ffmpeg-5 shaderc
+media-video/ffmpeg shaderc
+media-video/ffmpeg-compat shaderc
 
 # matoro <matoro_gentoo@matoro.tk> (2023-11-22)
 # PyQt 6 is not keyworded here
@@ -207,6 +223,7 @@ net-p2p/bitcoin-core gui qrcode
 # media-libs/libaom casualties
 # https://bugs.chromium.org/p/aomedia/issues/detail?id=3487
 media-video/ffmpeg libaom
+media-video/ffmpeg-compat libaom
 media-libs/libavif aom
 media-libs/libheif aom
 
@@ -256,6 +273,7 @@ app-text/enchant nuspell
 # Adel Kara Slimane <adel.ks@zegrapher.com> (2022-03-14)
 # Untested useflag on other arches, needs keywording
 media-video/ffmpeg vmaf
+media-video/ffmpeg-compat vmaf
 
 # James Le Cuirot <chewi@gentoo.org> (2022-02-24)
 # These GRUB platforms are only for MIPS.
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 72e1352de25c..e55fd975a910 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -132,6 +132,7 @@ app-text/enchant nuspell
 # Adel Kara Slimane <adel.ks@zegrapher.com> (2022-03-14)
 # Untested useflag on other arches, needs keywording
 media-video/ffmpeg vmaf
+media-video/ffmpeg-compat vmaf
 
 # Sam James <sam@gentoo.org> (2021-11-15)
 # librtas is available on (only) ppc*
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index 3410b476f68e..0a25bfe94651 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -4,6 +4,7 @@
 # Sam James <sam@gentoo.org> (2025-02-21)
 # media-video/rav1e is not yet keyworded here
 media-video/ffmpeg rav1e
+media-video/ffmpeg-compat rav1e
 
 # Pacho Ramos <pacho@gentoo.org> (2025-01-26)
 # Needs unkeyworded net-libs/msgraph
diff --git a/profiles/arch/powerpc/ppc32/package.use.stable.mask b/profiles/arch/powerpc/ppc32/package.use.stable.mask
index 526c3e92c261..5fe6b61f4069 100644
--- a/profiles/arch/powerpc/ppc32/package.use.stable.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.stable.mask
@@ -54,6 +54,7 @@ net-fs/nfs-utils nfsv4
 net-fs/samba client
 gnome-base/gvfs samba
 media-video/ffmpeg samba
+media-video/ffmpeg-compat samba
 media-video/vlc samba
 
 # Sam James <sam@gentoo.org> (2022-03-03)
diff --git a/profiles/arch/ppc/package.use.mask b/profiles/arch/ppc/package.use.mask
index 406a9252e17d..97b34e145eb3 100644
--- a/profiles/arch/ppc/package.use.mask
+++ b/profiles/arch/ppc/package.use.mask
@@ -36,3 +36,4 @@ app-admin/syslog-ng grpc
 # Leonardo Hernández Hernández <leohdz172@proton.me> (2023-11-15)
 # media-libs/shaderc in not keyworded
 media-video/ffmpeg shaderc
+media-video/ffmpeg-compat shaderc
diff --git a/profiles/arch/riscv/package.use b/profiles/arch/riscv/package.use
index dd7d9ebd37e6..f8dec229b22a 100644
--- a/profiles/arch/riscv/package.use
+++ b/profiles/arch/riscv/package.use
@@ -1,10 +1,11 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # James Le Cuirot <chewi@gentoo.org> (2023-12-16)
 # Apply additional FFmpeg patches for efficient playback on some SoCs.
 media-tv/kodi soc
 media-video/ffmpeg libdrm soc
+media-video/ffmpeg-compat soc
 media-video/mpv soc
 
 # Yixun Lan <dlan@gentoo.org> (2021-07-20)
diff --git a/profiles/arch/s390/package.use.mask b/profiles/arch/s390/package.use.mask
index f39f5b057b6b..4f89ecfd4757 100644
--- a/profiles/arch/s390/package.use.mask
+++ b/profiles/arch/s390/package.use.mask
@@ -238,6 +238,7 @@ app-portage/nattka depgraph-order
 # Adel Kara Slimane <adel.ks@zegrapher.com> (2022-03-14)
 # Untested useflag on other arches, needs keywording
 media-video/ffmpeg vmaf
+media-video/ffmpeg-compat vmaf
 
 # Sam James <sam@gentoo.org> (2021-11-05)
 # Avoid keywording unnecessary depenencies for now, bug #804115
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 403317b18af6..9e0e37bdc187 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Ionen Wolkens <ionen@gentoo.org> (2025-03-10)
+# media-libs/libopenmpt is not keyworded here
+media-video/ffmpeg openmpt
+media-video/ffmpeg-compat openmpt
+
 # Sam James <sam@gentoo.org> (2025-03-04)
 # qt is not keyworded here
 net-wireless/wpa_supplicant gui
@@ -8,6 +13,7 @@ net-wireless/wpa_supplicant gui
 # Sam James <sam@gentoo.org> (2025-02-21)
 # media-video/rav1e is not yet keyworded here
 media-video/ffmpeg rav1e
+media-video/ffmpeg-compat rav1e
 
 # Matt Jolly <kangie@gentoo.org> (2025-01-29)
 # Needs dev-lang/go which is not keyworded here
@@ -73,6 +79,7 @@ x11-misc/xdg-utils plasma
 # Andreas Sturmlechner <asturm@gentoo.org> (2024-06-29)
 # media-libs/libplacebo is not keyworded here
 media-video/ffmpeg libplacebo
+media-video/ffmpeg-compat libplacebo
 
 # Sam James <sam@gentoo.org> (2024-06-23)
 # app-crypt/gcr:4[gtk] is not available here
@@ -142,6 +149,7 @@ media-libs/libavif rav1e
 # Leonardo Hernández Hernández <leohdz172@proton.me> (2023-11-15)
 # Vulkan is not available here
 media-video/ffmpeg glslang shaderc vulkan
+media-video/ffmpeg-compat shaderc vulkan
 
 # Michał Górny <mgorny@gentoo.org> (2023-10-22)
 # This is not ISDN CAPI, so unmask it.
@@ -281,6 +289,7 @@ media-libs/freetype svg
 # Adel Kara Slimane <adel.ks@zegrapher.com> (2022-03-14)
 # Untested useflag on other arches, needs keywording
 media-video/ffmpeg vmaf
+media-video/ffmpeg-compat vmaf
 
 # Sam James <sam@gentoo.org> (2022-03-06)
 # Unkeyworded dependencies
@@ -447,6 +456,7 @@ net-analyzer/snort open-appid
 # Rolf Eike Beer <eike@sf-mail.de> (2020-04-14)
 # net-libs/srt is -sparc
 media-video/ffmpeg srt
+media-video/ffmpeg-compat srt
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-04-11)
 # git useflag requires dev-libs/libgit2
@@ -629,6 +639,7 @@ dev-libs/libpeas lua
 # Alexis Ballier <aballier@gentoo.org> (2015-02-11)
 # Missing ffmpeg deps, bug #510340
 media-video/ffmpeg x265
+media-video/ffmpeg-compat x265
 
 # Pacho Ramos <pacho@gentoo.org> (2014-01-10)
 # Missing keywords
diff --git a/profiles/arch/sparc/package.use.stable.mask b/profiles/arch/sparc/package.use.stable.mask
index 0a5f9b75b9d6..cc4369435915 100644
--- a/profiles/arch/sparc/package.use.stable.mask
+++ b/profiles/arch/sparc/package.use.stable.mask
@@ -33,6 +33,7 @@ net-fs/nfs-utils nfsv4
 net-fs/samba client
 gnome-base/gvfs samba
 media-video/ffmpeg samba
+media-video/ffmpeg-compat samba
 media-video/vlc samba
 
 # Sam James <sam@gentoo.org> (2022-05-10)
@@ -96,6 +97,7 @@ media-sound/vorbis-tools kate
 # Rolf Eike Beer <eike@sf-mail.de> (2020-04-14)
 # dependencies not stable on sparc
 media-video/ffmpeg codec2 dav1d libaom libaribb24 libilbc libtesseract lv2 rubberband vidstab
+media-video/ffmpeg-compat codec2 dav1d libaom libaribb24 libilbc libtesseract lv2 rubberband vidstab
 
 # Rolf Eike Beer <eike@sf-mail.de> (2020-04-10)
 # gnome-online-accounts not stable on sparc
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index c6ebe9b80b1f..8d1d325157a7 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -193,6 +193,7 @@ lxqt-base/lxqt-meta desktop-portal
 # Adel Kara Slimane <adel.ks@zegrapher.com> (2022-03-14)
 # Untested useflag on other arches, needs keywording
 media-video/ffmpeg vmaf
+media-video/ffmpeg-compat vmaf
 
 # Sam James <sam@gentoo.org> (2022-03-10)
 # dev-util/hip and its rocm dependencies not keyworded here