commit: 7a1589453cb80c7aae3b8eb1132855a93a83f405 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Fri Mar 28 02:58:19 2025 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Fri Mar 28 03:50:21 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a158945
profiles: cleanup obsolete ffmpeg entries Various USE were removed/renamed and/or enabled by default, and some dependencies have gained the required keywords. Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> profiles/arch/alpha/package.use.mask | 4 ---- profiles/arch/arm/package.use | 2 +- profiles/arch/arm/package.use.mask | 9 --------- profiles/arch/arm64/package.use | 2 +- profiles/arch/arm64/package.use.force | 1 - profiles/arch/arm64/package.use.mask | 6 ------ profiles/arch/base/package.use.mask | 1 - profiles/arch/hppa/package.use.mask | 2 +- profiles/arch/mips/package.use.mask | 4 ---- profiles/arch/ppc/package.use.mask | 5 ----- profiles/arch/riscv/package.use | 2 +- profiles/arch/sparc/package.use.mask | 2 +- profiles/arch/sparc/package.use.stable.mask | 4 ++-- profiles/features/hardened/amd64/package.use | 3 +-- profiles/features/musl/package.use.mask | 6 ------ profiles/prefix/darwin/macos/arch/x64/package.use.mask | 6 +----- profiles/prefix/darwin/macos/arch/x86/package.use.mask | 7 +------ 17 files changed, 10 insertions(+), 56 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 @@ -103,10 +103,6 @@ dev-util/perf bpf # dev-libs/capstone not keyworded here dev-lang/php capstone -# matoro <[email protected]> (2023-11-24) -# dev-util/glslang not keyworded here. -media-video/ffmpeg glslang - # matoro <[email protected]> (2023-11-24) # media-libs/shaderc not keyworded here. media-video/ffmpeg 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 <[email protected]> (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 <[email protected]> (2023-11-15) -# media-libs/shaderc in not keyworded -media-video/ffmpeg shaderc -media-video/ffmpeg-compat shaderc - # Jon Janzen <[email protected]> (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 <[email protected]> (2015-11-14) -# MMAL is available on the Raspberry Pi (armv6 & armv7 so far) -media-video/ffmpeg -mmal - # Alexis Ballier <[email protected]> (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 <[email protected]> (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 <[email protected]> (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 <[email protected]> (2023-11-15) -# media-libs/shaderc in not keyworded -media-video/ffmpeg shaderc -media-video/ffmpeg-compat shaderc - # Jimi Huotari <[email protected]> (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 <[email protected]> (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 <[email protected]> (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 <[email protected]> (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 <[email protected]> (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 <[email protected]> (2024-02-28) -# dev-util/glslang not keyworded here -media-video/ffmpeg glslang - # Sam James <[email protected]> (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 <[email protected]> (2023-12-26) # net-libs/grpc not keyworded here app-admin/syslog-ng grpc - -# Leonardo Hernández Hernández <[email protected]> (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 <[email protected]> (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 <[email protected]> (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 <[email protected]> (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 <[email protected]> (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 <[email protected]> (2020-04-10) # gnome-online-accounts not stable on sparc diff --git a/profiles/features/hardened/amd64/package.use b/profiles/features/hardened/amd64/package.use index 7d05dabcab8c..85c789b0817a 100644 --- a/profiles/features/hardened/amd64/package.use +++ b/profiles/features/hardened/amd64/package.use @@ -1,9 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Magnus Granberg <[email protected]> (2015-01-14) # We need to have the pic flag on. # Bugs 358929, 490276, 513464, 523736 and 512208. media-libs/x264 pic -media-video/ffmpeg pic media-libs/xvid pic diff --git a/profiles/features/musl/package.use.mask b/profiles/features/musl/package.use.mask index ec15d698d42e..17e380930e55 100644 --- a/profiles/features/musl/package.use.mask +++ b/profiles/features/musl/package.use.mask @@ -5,13 +5,7 @@ # Been failing to build for a long time for musl with modern compilers, # so mask until there is a proper fix. Note that this does not disable # v4l support entirely (always enabled), only libv4l use (bug #911499). -# -# Old ebuilds had a different meaning for USE=v4l (has *both* a libv4l -# and v4l) and it should not be masked, can be removed after cleanup. media-video/ffmpeg v4l -=media-video/ffmpeg-4.4.5-r1 libv4l -v4l -=media-video/ffmpeg-6.1.2-r0 libv4l -v4l -=media-video/ffmpeg-7.1-r0 libv4l -v4l media-video/ffmpeg-compat v4l # Ionen Wolkens <[email protected]> (2025-03-10) diff --git a/profiles/prefix/darwin/macos/arch/x64/package.use.mask b/profiles/prefix/darwin/macos/arch/x64/package.use.mask index e646fbe43b88..49f9420cdf1c 100644 --- a/profiles/prefix/darwin/macos/arch/x64/package.use.mask +++ b/profiles/prefix/darwin/macos/arch/x64/package.use.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Christoph Junghans <[email protected]> (2014-12-29) @@ -9,7 +9,3 @@ media-libs/xvid -pic # Relocation issues on 32-bit OSX only, bug #329859 media-sound/mpg123 -cpu_flags_x86_mmx -cpu_flags_x86_sse media-sound/mpg123-base -cpu_flags_x86_mmx -cpu_flags_x86_sse - -# Fabian Groffen <[email protected]> (2009-02-01) -# Doesn't compile on 32-bits OSX only, bug #257225 -media-video/ffmpeg -cpu_flags_x86_mmx diff --git a/profiles/prefix/darwin/macos/arch/x86/package.use.mask b/profiles/prefix/darwin/macos/arch/x86/package.use.mask index dcd35623faaf..7f9be69c0c2b 100644 --- a/profiles/prefix/darwin/macos/arch/x86/package.use.mask +++ b/profiles/prefix/darwin/macos/arch/x86/package.use.mask @@ -1,13 +1,8 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # All the Mac OS X profiles inherit from their matching arch profile here. - # Jeremy Olexa <[email protected]> (2010-07-29) # Relocation issues on 32-bit OSX, bug #329859 media-sound/mpg123 cpu_flags_x86_mmx cpu_flags_x86_sse - -# Fabian Groffen <[email protected]> (2009-02-01) -# Doesn't compile, bug #257225 -media-video/ffmpeg cpu_flags_x86_mmx
