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

2 files changed, 7 insertions, 5 deletions

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 30272f0f1102..e0869fc1812d 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -241,11 +241,6 @@ sys-libs/glibc cet
 # https://github.com/linuxmint/wayland/issues
 gnome-extra/cinnamon wayland
 
-# James Le Cuirot <chewi@gentoo.org> (2024-02-11)
-# The Raspberry Pi patch set is very heavy and will probably fail to apply
-# against a live checkout.
->=media-video/ffmpeg-9999 soc
-
 # Michael Orlitzky <mjo@gentoo.org> (2024-01-24)
 # A missing "-o pipefail" in the gap-pkg eclass caused me to
 # miss a few crashes in dev-gap packages when GAP itself is
@@ -874,6 +869,7 @@ dev-db/mysql client-libs
 # This flag can be sensibly enabled only on macos.
 # Can be unmasked in prefix/darwin/macos profiles. Bug #637482
 media-video/ffmpeg appkit
+media-video/ffmpeg-compat appkit
 
 # Andreas K. Huettel <dilfridge@gentoo.org> (2017-09-09)
 # Potentially destructive. Use it only if you know what you're doing.
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 0857dcab86e1..5880f921cef0 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,6 +4,11 @@
 # New entries go on top.
 # Please use the same syntax as in package.use.mask.
 
+# Ionen Wolkens <ionen@gentoo.org> (2025-03-10)
+# dev-util/nvidia-cuda-toolkit may never be stabilized
+media-video/ffmpeg npp
+media-video/ffmpeg-compat npp
+
 # Sam James <sam@gentoo.org> (2025-03-07)
 # Gradually unmask for newer Rust to avoid making users recompile for
 # the change. See bug #735154.
@@ -50,6 +55,7 @@ sci-physics/lammps hip
 # 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
 
 # Guillermo Joandet <gjoandet@gmail.com> (2022-11-22)