gentoo auto-resync : 29:03:2025 - 00:32:15

13 files changed, 7 insertions, 37 deletions

diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index 45599e072898..c3a748c9c9de 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -104,10 +104,6 @@ dev-util/perf bpf
 dev-lang/php capstone
 
 # matoro <matoro_gentoo@matoro.tk> (2023-11-24)
-# dev-util/glslang not keyworded here.
-media-video/ffmpeg glslang
-
-# matoro <matoro_gentoo@matoro.tk> (2023-11-24)
 # media-libs/shaderc not keyworded here.
 media-video/ffmpeg shaderc
 media-video/ffmpeg-compat shaderc
diff --git a/profiles/arch/arm/package.use b/profiles/arch/arm/package.use
index 8ff3ebe82129..d146250e0b22 100644
--- a/profiles/arch/arm/package.use
+++ b/profiles/arch/arm/package.use
@@ -4,6 +4,6 @@
 # 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 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 b87e9fbb5509..074b55c51762 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -108,11 +108,6 @@ sys-kernel/installkernel -grub
 # Needs USE=video_cards_amdgpu, currently masked on this arch
 >=sys-apps/fwupd-1.9.10 amdgpu
 
-# 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
 dev-db/spatialite rttopo
@@ -400,10 +395,6 @@ net-print/hplip -scanner kde
 # Missing keywords
 >=media-plugins/grilo-plugins-0.2.16 upnp-av
 
-# Alexis Ballier <aballier@gentoo.org> (2015-11-14)
-# MMAL is available on the Raspberry Pi (armv6 & armv7 so far)
-media-video/ffmpeg -mmal
-
 # Alexis Ballier <aballier@gentoo.org> (2015-04-02)
 # Needs ilmbase (openexr), which does not build and is masked on arm.
 media-libs/freeimage tiff
diff --git a/profiles/arch/arm64/package.use b/profiles/arch/arm64/package.use
index 2a1e113cf3ce..a754ce4dfe8a 100644
--- a/profiles/arch/arm64/package.use
+++ b/profiles/arch/arm64/package.use
@@ -10,7 +10,7 @@
 # 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 soc
 media-video/ffmpeg-compat soc
 media-video/mpv soc
 
diff --git a/profiles/arch/arm64/package.use.force b/profiles/arch/arm64/package.use.force
index 21465a9f9842..8fe6484a9ee0 100644
--- a/profiles/arch/arm64/package.use.force
+++ b/profiles/arch/arm64/package.use.force
@@ -17,7 +17,6 @@ sys-kernel/vanilla-kernel -savedconfig
 
 # Aaron Bauman <bman@gentoo.org> (2019-12-27)
 # ffmpeg does support 64 bit neon
-media-video/ffmpeg cpu_flags_arm_neon
 media-video/ffmpeg-chromium cpu_flags_arm_neon
 net-misc/sunshine cpu_flags_arm_neon
 
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 25819edb77e6..a9122ef4b87b 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -138,11 +138,6 @@ dev-python/qtpy -pdfium
 # app-crypt/rpm-sequoia is keyworded here.
 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.
 media-video/obs-studio -mpegts
@@ -372,7 +367,6 @@ net-wireless/kismet ubertooth
 
 # Aaron Bauman <bman@gentoo.org> (2019-12-27)
 # ffmpeg does support 64 bit neon
-media-video/ffmpeg -cpu_flags_arm_neon
 media-video/ffmpeg-chromium -cpu_flags_arm_neon
 net-misc/sunshine -cpu_flags_arm_neon
 
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index f19231c8aaae..959b02c9e2d2 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -433,7 +433,6 @@ sys-boot/grub:2 grub_platforms_xen-32
 # MMAL is only available on the Raspberry Pi:
 # Mask it globally, unmask it on arm.
 media-video/motion mmal
-media-video/ffmpeg mmal
 
 # Brian Evans <grknight@gentoo.org> (2015-09-14)
 # Mask new USE flags for mariadb which all arches do not yet have dependencies
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index 6addbe2889f8..ed4842a55a90 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -115,7 +115,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 shaderc vulkan
 media-video/ffmpeg-compat shaderc vulkan
 
 # Violet Purcell <vimproved@inventati.org> (2023-10-12)
diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index ac2883d10553..62acfe613e3a 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -190,10 +190,6 @@ dev-cpp/eigen test
 # net-libs/libotr fails tests, #918448
 net-irc/irssi otr
 
-# matoro <matoro_gentoo@matoro.tk> (2024-02-28)
-# dev-util/glslang not keyworded here
-media-video/ffmpeg glslang
-
 # Sam James <sam@gentoo.org> (2024-01-02)
 # dev-libs/capstone not keyworded here
 dev-lang/php capstone
diff --git a/profiles/arch/ppc/package.use.mask b/profiles/arch/ppc/package.use.mask
index 6d6eec98724c..09825f47f418 100644
--- a/profiles/arch/ppc/package.use.mask
+++ b/profiles/arch/ppc/package.use.mask
@@ -36,8 +36,3 @@ dev-libs/mongo-c-driver test
 # Leonardo Hernández Hernández <leohdz172@proton.me> (2023-12-26)
 # net-libs/grpc not keyworded here
 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 f8dec229b22a..bd8a4a2e46a6 100644
--- a/profiles/arch/riscv/package.use
+++ b/profiles/arch/riscv/package.use
@@ -4,7 +4,7 @@
 # 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 soc
 media-video/ffmpeg-compat soc
 media-video/mpv soc
 
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index d00fdb2c733d..2fb48cb35e3b 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -156,7 +156,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 shaderc vulkan
 media-video/ffmpeg-compat shaderc vulkan
 
 # Michał Górny <mgorny@gentoo.org> (2023-10-22)
diff --git a/profiles/arch/sparc/package.use.stable.mask b/profiles/arch/sparc/package.use.stable.mask
index 911f4676d8b0..89e5ba628d6e 100644
--- a/profiles/arch/sparc/package.use.stable.mask
+++ b/profiles/arch/sparc/package.use.stable.mask
@@ -101,8 +101,8 @@ 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
+media-video/ffmpeg codec2 libaribb24 libilbc libtesseract lv2 rubberband vidstab
+media-video/ffmpeg-compat codec2 libaribb24 libilbc libtesseract lv2 rubberband vidstab
 
 # Rolf Eike Beer <eike@sf-mail.de> (2020-04-10)
 # gnome-online-accounts not stable on sparc