gentoo auto-resync : 14:02:2025 - 00:13:14

6 files changed, 15 insertions, 564 deletions

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index b34e410a7a15..c1e86876fb59 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -5,16 +5,15 @@ AUX vlc-3.0.18-drop-minizip-dep.patch 1024 BLAKE2B f00df51fe46743b760785151fdc4b
 AUX vlc-3.0.2.1-vdpau.patch 9068 BLAKE2B 072ab73cde74dc6b6a592218914f5b08f59fff94bebcc9c9ec8e4fcdd6288611e544b8c6ddab65bfa9d01e50800f0fcc814bf598733a29e4c3d94f899d3ae5b2 SHA512 28e10fd80a9888f85cf7b75e3df40c9b9f44d6a1d6bf3ab14a37b79767142fb2d81f40f3f806d86fbc0db1f0a995352ef47b20448dbbcaecc03f764135dba21e
 AUX vlc-3.0.21-freerdp-2.patch 8386 BLAKE2B ad8abf54cbf62cac4e67a000c40595a2f1ed13d57c8039aa7a9309dbe3d213e3d6838d31faf2f36d031aa25fd1a5f97fc26435b1dc4e7e082a2e517ed629b285 SHA512 7a43186c6f37aa4d4b2b971f91789c4a9c8d5d192cd9c1ed3fa9609b2d713f47420b983865d0906ca0dd6d15bc1ae6b22e84b03909c0c8e0024b779362d26c92
 AUX vlc-3.0.21-vaapi-w-ffmpeg5.patch 5223 BLAKE2B 762df3b6e2857ab985b044fc69b9c328c488faff4ae8d70c43996d01171faaa3fc1dd157a2240f35b8ac0e2ac0205b1236759f8d5b58ba8bca9d07bacc29149f SHA512 3dc0253d5e1c6fa60c6e32f4f8e024f2c953b2ea87fb324550fa12a1f5420a679274927d5922d78097135d422fc7370ff85b28bafddd7cf60070bd8fa3f62bba
-AUX vlc-3.0.21-vaapi-without-ffmpeg4.patch 692 BLAKE2B 6e9194d387e5b4643fb90d06fed809834e3a2c8e8f7e8a43b4d0866b73d5c2bf479181b83ae6e1b0a3b7971494fb478577a4385870c559be44961bed0d5bc9df SHA512 709450c0f51000618a7341cca7e4ffe6eac42a76a4cb7092ed197fbe28a6d6502c6bb234d6b0579ca3eb69bd918d1217a691ad2aa2aa7869c383ca77939ae83f
 AUX vlc-3.0.6-fdk-aac-2.0.0.patch 3436 BLAKE2B 022201ed10fef189feeb36f44ab4194ab7994e4fdd8bad922070b54688d34d051fac28177a0e648d55670e0b9f0c6b45f9a05650476b0ae12ebfe759dd561e28 SHA512 68964adda04cd88e80b586984f1af0cfdccff5dbf8529070d5ab985b23402dfb7380b5d39eacfea433c1ba03434139e4f394c1c25d6b426489883d3a42cb7b5b
 AUX vlc-9999-configure-lua-version.patch 1840 BLAKE2B 1b9f11c05ed58e12616732c73a8418917870515f9612467b2839e8414f553ba3d0d9ede4c38e15957cc9b271aecae9364961103dafd72b80c6088a826f18777b SHA512 fa6350a02a92b65e5cc1c7b8e65e14045ca279d9d6f3f1ae255ab2a8ac88b3b3ff16102aa7e91e51e65e2500712bd7fccbdc987e760a5753581098afb1259eb9
 AUX vlc-9999-fix-libtremor-libs.patch 480 BLAKE2B 86102dc088705f546185023b2f941520b5435f852e0b0e7cdb8763e15df645cdc794087c188fb17ee331be7ba4d953311276583886e3fe0f93d6de32e63e3207 SHA512 93893a0accecc3470f33e505ef2ce86aeb5f2a3a6524adc7de354366bb8e51def2d67957be4ea705ff20c1510e7274691e587e70740d4b3657b35f5c91de7280
 AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bcfddee004e4e8469e1526a6a38fb5cc11a24a19888443e5f9062d7145665d594e142c12f3a9693967f195bab3b33ada38 SHA512 dd3375997a1935d3a227231785f35e300e3f992034da6a9c3019e28c68c1f005cbdd67190672264b342abc719e69005f965599f7af975e2bbd4cfccd89e3770d
 DIST vlc-3.0.21-taglib2.tar.xz 12620 BLAKE2B e0211789acc6c0381307bd154775ab32c0c403c9e245a965774667f9a83e801436b8609574f3152cde714e416d1826eb2b197349a54dfdf8eb86fc6ee3dd6f4e SHA512 f5b6691c36993b7f8002ff5c244f8e73b8fa8aeb09ef83f38f51ff9fda67c8204551cb2d762e16364229fdca6d7284a47c4d44d0a98b1d3c7759923500d04ffa
 DIST vlc-3.0.21.tar.xz 25649288 BLAKE2B 0ad05282d624611ba8a2b6ca062c68aabeac8f37410dd427cc9b8c0d107af48ed203b73978e2fe83e8171ea6b78caa51394f3497061b561447dbb41058e1af9f SHA512 cb1af76c8056648c331d7e6e0680d161ed1849eb635987504f45eae02531e9b432651034317fa7e02b0722905dfb9f0f5dad67b5924cc62edcaf0d173ac36aee
-EBUILD vlc-3.0.21-r1.ebuild 13683 BLAKE2B 37f55aac807012f5bbafdb2c0fae98340aea5aa4104f284c54973033050542ab5cce4a67da274535cb91d33aa0352c5dfd3732f726b3679f1e79351604bf77f1 SHA512 0dff4e8db522228dc975dcb027bd08581dbcb351da4707eff414f7525b2d7fd0204c2f85e41612ba3ef6448e4a26a6ce66516985fb8d89282bc1901db060b29f
+DIST vlc-3.0.21_p20250212.tar.bz2 24648402 BLAKE2B 4b54371cf921ac6caf7a2eeea44f25ba010f5660bd7a15bc638408d0e321889987cfdfa04c5df50414b463384708cdc7a3772ca0783e357e68e3ed9220949dc3 SHA512 6072052ffc78b6d447fbd13d992af4032f5e15bb0722a615433cbdb6fe2ca8411266c552084fbf4f5dd4a6a3b3b30acd788f205d0b7e08ee987b33ba512cb8e0
 EBUILD vlc-3.0.21-r3.ebuild 13389 BLAKE2B d3835c67c3eb74b405c1f31f14ee8392c8f2fb6956c1c859896b9a166990c3422e9262557761661a6bb7237b5f3b055a7e68faddf25ae519e6e375e6c30e30a0 SHA512 55625237298dd96e2f404f8800c9c3add4ffc37509db45874e33579ff32017561458b72cf4215293b8a8b2d0bdc2a4e58e3e720779de65b060737e37a53c572e
-EBUILD vlc-3.0.21.ebuild 13632 BLAKE2B cdf1b077440ba3400b7504018eb5d3af65f2cd18232a2c12072331dedd81ee5a0ddf245145cc55915807c297c07681485cf785361e0dc371261652a0467a3a46 SHA512 ef40a8bc248737c874527774e29107d8d89d36d5cc251ada4ea65c12b7194db850c207a06f982eca2df3982c37f7ac2dc3aca5615be335bfe0ef3a18f93de768
-EBUILD vlc-3.0.9999.ebuild 13552 BLAKE2B 6d8444fecd25f4941d4905b43cb8923ed0e5525eeeb3cf165096c4cea4fbbf95b118fcea6ca011657a3b1afc6933f85867d790efdd93bc5055a68eff3224f95c SHA512 8cfc23efe7b0fafb939425d6ee65c31442c161032d7bb0603e33fb5fdcf346c42227e548cf1e74ef4b056f9187c22700c96b46174c37085990ff88981e29a252
-EBUILD vlc-9999.ebuild 13528 BLAKE2B 6f2b1d1b5a708565c66d13b0e519bddfdc51ead8b4f28cb9e62fdbc7d6496c817fa413d488a86f21a84915e1b60bfaf10f0ec22c44744d625b40659dea70a362 SHA512 baa9aaf6056b6b62942804dc10ab9074bc9ad48200b9d6f92d8ace9b23f7791fce5658ca86d9bff61419a1205262449d7f08ed31ab3da7687d13dc8ad2cda61c
+EBUILD vlc-3.0.21_p20250212.ebuild 13325 BLAKE2B 58f11684ed3e847172f6ed4e27c52d8df33f103b3d6f9c2519d704c1968c9be563cc2a7082ab34157a2d3bb42dfc1b97c9686e978743a2b6e0654358a9b6ead8 SHA512 f2c209e3ecc71f247087c890632c597c91e2e93bd07c67c38ab3c0a6c69e446a0437176ac0bad21b36a0c93aa582231e914ca53e66cdea49ce686c566ef740e9
+EBUILD vlc-3.0.9999.ebuild 13591 BLAKE2B 03d2d1a3279a8f19053433f6de4925c515e26a8c869df1ed18ce1aa51101da9389ae1a8a0dcd814abcd2166d4a776c702a678a01eca2d81807a94e751c008f8a SHA512 7add14ba556414ad33b54bde3136d28d9ed060d1aa2a5d3349c534481a163e2186e6f823167636db6d97ad50550d60abfa775e3e6d52a4f6ca9f2232476e1a6a
+EBUILD vlc-9999.ebuild 13567 BLAKE2B 3fefd741ab6376eea8fc69979880fb0fd3bda3292ca7b768b6eb5f952ec85d43bd3621ddad4ebfd55d269122018c90ddedcf2ecbdc922a5cd802b0d77b8d58d5 SHA512 671c2df63c38240b1c1edcb14c891030d6850a2b66bf16954e1f4ee82b74670c23154ef14012bd0bfb26210cbe331d4a0d589e70f7c598749f31f5cc62a225ae
 MISC metadata.xml 4733 BLAKE2B 820fb938c3ca3079c48596f131adb1298ee98c9820921780ee4acf322c4475bab7c31de16688b5668a715c496857c572778bd7b4b5d3f3dcbb61b08fd0db8574 SHA512 d74d916645ae6a3b0fb8d6c6f0a2a35e24ab9a829b790d33d9f80e2fdd3165db8ffe2747e82e698bce7b9974384704a380dd2f4f50d8647bcaa91a016d1522cd
diff --git a/media-video/vlc/files/vlc-3.0.21-vaapi-without-ffmpeg4.patch b/media-video/vlc/files/vlc-3.0.21-vaapi-without-ffmpeg4.patch
deleted file mode 100644
index c71a39910733..000000000000
--- a/media-video/vlc/files/vlc-3.0.21-vaapi-without-ffmpeg4.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-avcodec_vaapi requires ffmpeg-4, but other vaapi modules can be built
-
-diff --git a/configure.ac b/configure.ac
-index 69beb77..c7f7142 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2454,9 +2454,9 @@ AS_IF([test "${have_vaapi}" = "yes" -a "${have_avcodec}" = "yes"], [
-     have_avcodec_vaapi="yes"
-   ],[
-     AS_IF([test -n "${enable_libva}"], [
--      AC_MSG_ERROR([libva is present but libavcodec/vaapi.h is missing])
-+      AC_MSG_WARN([libva is present but libavcodec/vaapi.h is missing])
-     ], [
--      AC_MSG_WARN([libva is present but libavcodec/vaapi.h is missing ])
-+      AC_MSG_NOTICE([libva is present but libavcodec/vaapi.h is missing ])
-     ])
-   ])
-   VLC_RESTORE_FLAGS
diff --git a/media-video/vlc/vlc-3.0.21.ebuild b/media-video/vlc/vlc-3.0.21.ebuild
deleted file mode 100644
index a133a040f602..000000000000
--- a/media-video/vlc/vlc-3.0.21.ebuild
+++ /dev/null
@@ -1,516 +0,0 @@
-# Copyright 2000-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..2} )
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-beta/-test}"
-MY_P="${PN}-${MY_PV}"
-if [[ ${PV} = *9999 ]] ; then
-	if [[ ${PV%.9999} != ${PV} ]] ; then
-		EGIT_BRANCH="3.0.x"
-	fi
-	EGIT_REPO_URI="https://code.videolan.org/videolan/vlc.git"
-	inherit git-r3
-else
-	if [[ ${MY_P} = ${P} ]] ; then
-		SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
-	else
-		SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
-	fi
-	KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv -sparc x86"
-fi
-inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
-
-DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
-HOMEPAGE="https://www.videolan.org/vlc/"
-
-S="${WORKDIR}/${MY_P}"
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/5-9" # vlc - vlccore
-
-IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus
-	dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth
-	fontconfig +gcrypt gme keyring gstreamer +gui ieee1394 jack jpeg kate
-	libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua
-	macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg
-	omxil optimisememory opus png projectm pulseaudio rdp run-as-root samba sdl-image
-	sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame
-	udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf zvbi
-	cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse
-"
-REQUIRED_USE="
-	chromecast? ( encode )
-	directx? ( ffmpeg )
-	fontconfig? ( truetype )
-	libcaca? ( X )
-	libtar? ( skins )
-	libtiger? ( kate )
-	lua? ( ${LUA_REQUIRED_USE} )
-	skins? ( archive gui truetype X xml )
-	ssl? ( gcrypt )
-	vaapi? ( ffmpeg X )
-	vdpau? ( ffmpeg X )
-"
-BDEPEND="
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	lua? ( ${LUA_DEPS} )
-	amd64? ( dev-lang/yasm )
-	wayland? ( dev-util/wayland-scanner )
-	x86? ( dev-lang/yasm )
-"
-# <ffmpeg-5 dep for USE="ffmpeg vaapi" for bug #864721
-RDEPEND="
-	media-libs/libvorbis
-	net-dns/libidn:=
-	sys-libs/zlib
-	virtual/libintl
-	virtual/opengl
-	a52? ( media-libs/a52dec )
-	alsa? ( media-libs/alsa-lib )
-	aom? ( media-libs/libaom:= )
-	archive? ( app-arch/libarchive:= )
-	aribsub? ( media-libs/aribb24 )
-	bidi? (
-		dev-libs/fribidi
-		media-libs/freetype:2[harfbuzz]
-		media-libs/harfbuzz:=
-		virtual/ttf-fonts
-	)
-	bluray? ( >=media-libs/libbluray-1.3.0:= )
-	cddb? ( media-libs/libcddb )
-	chromaprint? ( media-libs/chromaprint:= )
-	chromecast? (
-		>=dev-libs/protobuf-2.5.0:=
-		>=net-libs/libmicrodns-0.1.2:=
-	)
-	dav1d? ( media-libs/dav1d:= )
-	dbus? ( sys-apps/dbus )
-	dc1394? (
-		media-libs/libdc1394:2
-		sys-libs/libraw1394
-	)
-	dts? ( media-libs/libdca )
-	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= )
-	dvd? (
-		>=media-libs/libdvdnav-6.1.1:=
-		>=media-libs/libdvdread-6.1.2:=
-	)
-	faad? ( media-libs/faad2 )
-	fdk? ( media-libs/fdk-aac:= )
-	ffmpeg? ( >=media-video/ffmpeg-3.1.3:=[postproc,vaapi?,vdpau?] )
-	flac? (
-		media-libs/flac:=
-		media-libs/libogg
-	)
-	fluidsynth? ( media-sound/fluidsynth:= )
-	fontconfig? ( media-libs/fontconfig:1.0 )
-	gcrypt? (
-		dev-libs/libgcrypt:=
-		dev-libs/libgpg-error
-	)
-	gme? ( media-libs/game-music-emu )
-	keyring? ( app-crypt/libsecret )
-	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
-	gui? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		X? (
-			dev-qt/qtx11extras:5
-			x11-libs/libX11
-		)
-	)
-	ieee1394? (
-		sys-libs/libavc1394
-		sys-libs/libraw1394
-	)
-	jack? ( virtual/jack )
-	jpeg? ( media-libs/libjpeg-turbo:0 )
-	kate? ( media-libs/libkate )
-	libass? (
-		media-libs/fontconfig:1.0
-		media-libs/libass:=
-	)
-	libcaca? ( media-libs/libcaca )
-	libnotify? (
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:3
-		x11-libs/libnotify
-	)
-	libsamplerate? ( media-libs/libsamplerate )
-	libtar? ( dev-libs/libtar )
-	libtiger? ( media-libs/libtiger )
-	linsys? ( media-libs/zvbi )
-	lirc? ( app-misc/lirc )
-	live? ( media-plugins/live:= )
-	lua? ( ${LUA_DEPS} )
-	mad? ( media-libs/libmad )
-	matroska? (
-		>=dev-libs/libebml-1.4.2:=
-		media-libs/libmatroska:=
-	)
-	modplug? ( >=media-libs/libmodplug-0.8.9.0 )
-	mp3? ( media-sound/mpg123-base )
-	mpeg? ( media-libs/libmpeg2 )
-	mtp? ( media-libs/libmtp:= )
-	musepack? ( media-sound/musepack-tools )
-	ncurses? ( sys-libs/ncurses:=[unicode(+)] )
-	nfs? ( >=net-fs/libnfs-0.10.0:= )
-	ogg? ( media-libs/libogg )
-	opus? ( >=media-libs/opus-1.0.3 )
-	png? ( media-libs/libpng:0= )
-	projectm? (
-		media-fonts/dejavu
-		>=media-libs/libprojectm-3.1.12:0=
-	)
-	pulseaudio? ( media-libs/libpulse )
-	rdp? ( >=net-misc/freerdp-2.0.0_rc0:2= )
-	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
-	sdl-image? ( media-libs/sdl-image )
-	sftp? ( net-libs/libssh2 )
-	shout? ( media-libs/libshout )
-	sid? ( media-libs/libsidplay:2 )
-	skins? (
-		x11-libs/libXext
-		x11-libs/libXinerama
-		x11-libs/libXpm
-	)
-	soxr? ( >=media-libs/soxr-0.1.2 )
-	speex? (
-		>=media-libs/speex-1.2.0
-		media-libs/speexdsp
-	)
-	srt? ( >=net-libs/srt-1.4.2:= )
-	ssl? ( net-libs/gnutls:= )
-	svg? (
-		gnome-base/librsvg:2
-		x11-libs/cairo
-	)
-	taglib? ( >=media-libs/taglib-1.9 )
-	theora? ( media-libs/libtheora )
-	tremor? ( media-libs/tremor )
-	truetype? (
-		media-libs/freetype:2
-		virtual/ttf-fonts
-		!fontconfig? ( media-fonts/dejavu )
-	)
-	twolame? ( media-sound/twolame )
-	udev? ( virtual/udev )
-	upnp? ( net-libs/libupnp:=[ipv6(+)] )
-	v4l? ( media-libs/libv4l:= )
-	vaapi? (
-		<media-video/ffmpeg-5
-		media-libs/libva:=[drm(+),wayland?,X?]
-	)
-	vdpau? ( x11-libs/libvdpau )
-	vnc? ( net-libs/libvncserver )
-	vpx? ( media-libs/libvpx:= )
-	wayland? (
-		>=dev-libs/wayland-1.15
-		dev-libs/wayland-protocols
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libxcb
-		x11-libs/xcb-util
-		x11-libs/xcb-util-keysyms
-	)
-	x264? ( >=media-libs/x264-0.0.20190214:= )
-	x265? ( media-libs/x265:= )
-	xml? ( dev-libs/libxml2:2 )
-	zeroconf? ( net-dns/avahi[dbus] )
-	zvbi? ( media-libs/zvbi )
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
-	"${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
-	"${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
-	"${FILESDIR}"/${PN}-3.0.18-drop-minizip-dep.patch
-	"${FILESDIR}"/${PN}-3.0.21-freerdp-2.patch # bug 919296, 590164
-)
-
-DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
-
-pkg_setup() {
-	if use lua; then
-		lua-single_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-
-	# bug 608256
-	xdg_environment_reset
-
-	has_version 'net-libs/libupnp:1.8' && \
-		eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
-
-	# Bootstrap when we are on a git checkout.
-	if [[ ${PV} = *9999 ]] ; then
-		./bootstrap
-	fi
-
-	# Make it build with libtool 1.5
-	rm m4/lt* m4/libtool.m4 || die
-
-	# We are not in a real git checkout due to the absence of a .git directory.
-	touch src/revision.txt || die
-
-	# Don't use --started-from-file when not using dbus.
-	if ! use dbus ; then
-		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
-	fi
-
-	# Disable running of vlc-cache-gen, we do that in pkg_postinst
-	sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
-		-i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
-
-	# Fix gettext version mismatch errors.
-	sed -i -e s/GETTEXT_VERSION/GETTEXT_REQUIRE_VERSION/ configure.ac || die
-
-	eautoreconf
-
-	# Disable automatic running of tests.
-	find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
-}
-
-src_configure() {
-	local -x BUILDCC="$(tc-getBUILD_CC)"
-
-	local myeconfargs=(
-		--disable-aa
-		--disable-optimizations
-		--disable-rpath
-		--disable-update-check
-		--enable-fast-install
-		--enable-screen
-		--enable-vcd
-		--enable-vlc
-		--enable-vorbis
-		$(use_enable a52)
-		$(use_enable alsa)
-		$(use_enable aom)
-		$(use_enable archive)
-		$(use_enable aribsub)
-		$(use_enable bidi fribidi)
-		$(use_enable bidi harfbuzz)
-		$(use_enable bluray)
-		$(use_enable cddb libcddb)
-		$(use_enable chromaprint)
-		$(use_enable chromecast)
-		$(use_enable chromecast microdns)
-		$(use_enable cpu_flags_arm_neon neon)
-		$(use_enable cpu_flags_ppc_altivec altivec)
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable dav1d)
-		$(use_enable dbus)
-		$(use_enable dbus kwallet)
-		$(use_enable dc1394)
-		$(use_enable debug)
-		$(use_enable directx)
-		$(use_enable directx d3d11va)
-		$(use_enable directx dxva2)
-		$(use_enable dts dca)
-		$(use_enable dvbpsi)
-		$(use_enable dvd dvdnav)
-		$(use_enable dvd dvdread)
-		$(use_enable encode sout)
-		$(use_enable encode vlm)
-		$(use_enable faad)
-		$(use_enable fdk fdkaac)
-		$(use_enable ffmpeg avcodec)
-		$(use_enable ffmpeg avformat)
-		$(use_enable ffmpeg postproc)
-		$(use_enable ffmpeg swscale)
-		$(use_enable flac)
-		$(use_enable fluidsynth)
-		$(use_enable fontconfig)
-		$(use_enable gcrypt libgcrypt)
-		$(use_enable gme)
-		$(use_enable keyring secret)
-		$(use_enable gstreamer gst-decode)
-		$(use_enable gui qt)
-		$(use_enable ieee1394 dv1394)
-		$(use_enable jack)
-		$(use_enable jpeg)
-		$(use_enable kate)
-		$(use_enable libass)
-		$(use_enable libcaca caca)
-		$(use_enable libnotify notify)
-		$(use_enable libsamplerate samplerate)
-		$(use_enable libtar)
-		$(use_enable libtiger tiger)
-		$(use_enable linsys)
-		$(use_enable lirc)
-		$(use_enable live live555)
-		$(use_enable lua)
-		$(use_enable macosx-notifications osx-notifications)
-		$(use_enable mad)
-		$(use_enable matroska)
-		$(use_enable modplug mod)
-		$(use_enable mp3 mpg123)
-		$(use_enable mpeg libmpeg2)
-		$(use_enable mtp)
-		$(use_enable musepack mpc)
-		$(use_enable ncurses)
-		$(use_enable nfs)
-		$(use_enable ogg)
-		$(use_enable omxil)
-		$(use_enable omxil omxil-vout)
-		$(use_enable optimisememory optimize-memory)
-		$(use_enable opus)
-		$(use_enable png)
-		$(use_enable projectm)
-		$(use_enable pulseaudio pulse)
-		$(use_enable rdp freerdp)
-		$(use_enable run-as-root)
-		$(use_enable samba smbclient)
-		$(use_enable sdl-image)
-		$(use_enable sftp)
-		$(use_enable shout)
-		$(use_enable sid)
-		$(use_enable skins skins2)
-		$(use_enable soxr)
-		$(use_enable speex)
-		$(use_enable srt)
-		$(use_enable ssl gnutls)
-		$(use_enable svg)
-		$(use_enable svg svgdec)
-		$(use_enable taglib)
-		$(use_enable theora)
-		$(use_enable tremor)
-		$(use_enable twolame)
-		$(use_enable udev)
-		$(use_enable upnp)
-		$(use_enable v4l v4l2)
-		$(use_enable vaapi libva)
-		$(use_enable vdpau)
-		$(use_enable vnc)
-		$(use_enable vpx)
-		$(use_enable wayland)
-		$(use_with X x)
-		$(use_enable X xcb)
-		$(use_enable X xvideo)
-		$(use_enable x264)
-		$(use_enable x264 x26410b)
-		$(use_enable x265)
-		$(use_enable xml libxml2)
-		$(use_enable zeroconf avahi)
-		$(use_enable zvbi)
-		$(use_enable !zvbi telx)
-		--with-kde-solid="${EPREFIX}"/usr/share/solid/actions
-		--disable-asdcp
-		--disable-coverage
-		--disable-cprof
-		--disable-crystalhd
-		--disable-decklink
-		--disable-gles2
-		--disable-goom
-		--disable-kai
-		--disable-kva
-		--disable-libplacebo
-		--disable-maintainer-mode
-		--disable-merge-ffmpeg
-		--disable-mfx
-		--disable-mmal
-		--disable-opencv
-		--disable-opensles
-		--disable-oss
-		--disable-rpi-omxil
-		--disable-schroedinger
-		--disable-shine
-		--disable-sndio
-		--disable-spatialaudio
-		--disable-vsxu
-		--disable-wasapi
-		--disable-wma-fixed
-	)
-	# ^ We don't have these disabled libraries in the Portage tree yet.
-
-	# https://code.videolan.org/videolan/vlc/-/issues/17626 (bug #861143)
-	append-flags -fno-strict-aliasing
-	filter-lto
-
-	# Compatibility fix for Samba 4.
-	use samba && append-cppflags "-I${ESYSROOT}/usr/include/samba-4.0"
-
-	if use x86; then
-		# We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
-		append-cflags $(test-flags-CC -fno-stack-check)
-		# Bug 569774
-		replace-flags -Os -O2
-	fi
-
-	# FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
-	append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/sidplay/builders/"
-
-	if use riscv; then
-		# bug #803473
-		append-libs -latomic
-	fi
-
-	if use truetype || use bidi; then
-		myeconfargs+=( --enable-freetype )
-	else
-		myeconfargs+=( --disable-freetype )
-	fi
-
-	if use truetype || use projectm; then
-		local dejavu="${EPREFIX}/usr/share/fonts/dejavu/"
-		myeconfargs+=(
-			--with-default-font=${dejavu}/DejaVuSans.ttf
-			--with-default-font-family=Sans
-			--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
-			--with-default-monospace-font-family=Monospace
-		)
-	fi
-
-	econf "${myeconfargs[@]}"
-
-	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
-	# Other values may break the build (bug 523144), so definition should not be removed.
-	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h
-	sed -i '1i#undef _FORTIFY_SOURCE' config.h || die
-}
-
-src_test() {
-	virtx emake check-TESTS
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	if [[ -z "${ROOT}" ]] && [[ -x "${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
-		einfo "Running ${EPREFIX}/usr/$(get_libdir)/vlc/vlc-cache-gen on ${EROOT}/usr/$(get_libdir)/vlc/plugins/"
-		"${EPREFIX}/usr/$(get_libdir)/vlc/vlc-cache-gen" "${EROOT}/usr/$(get_libdir)/vlc/plugins/"
-	else
-		ewarn "We cannot run vlc-cache-gen (most likely ROOT != /)"
-		ewarn "Please run ${EPREFIX}/usr/$(get_libdir)/vlc/vlc-cache-gen manually"
-		ewarn "If you do not do it, vlc will take a long time to load."
-	fi
-
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	if [[ -e "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
-		rm "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
-	fi
-
-	xdg_pkg_postrm
-}
diff --git a/media-video/vlc/vlc-3.0.21-r1.ebuild b/media-video/vlc/vlc-3.0.21_p20250212.ebuild
index d34fc239251f..ed3cb68a42b4 100644
--- a/media-video/vlc/vlc-3.0.21-r1.ebuild
+++ b/media-video/vlc/vlc-3.0.21_p20250212.ebuild
@@ -3,33 +3,18 @@
 
 EAPI=8
 
+COMMIT=120f41a5741fc502b1a73d835093212cccbcb87d
 LUA_COMPAT=( lua5-{1..2} )
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-beta/-test}"
-MY_P="${PN}-${MY_PV}"
-if [[ ${PV} = *9999 ]] ; then
-	if [[ ${PV%.9999} != ${PV} ]] ; then
-		EGIT_BRANCH="3.0.x"
-	fi
-	EGIT_REPO_URI="https://code.videolan.org/videolan/vlc.git"
-	inherit git-r3
-else
-	if [[ ${MY_P} = ${P} ]] ; then
-		SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
-	else
-		SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
-	fi
-	S="${WORKDIR}/${MY_P}"
-	KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv -sparc x86"
-fi
 inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
 
 DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
 HOMEPAGE="https://www.videolan.org/vlc/"
+SRC_URI="https://code.videolan.org/videolan/${PN}/-/archive/${COMMIT}/${PN}-${COMMIT}.tar.bz2 -> ${P}.tar.bz2"
+S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0/5-9" # vlc - vlccore
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv -sparc ~x86"
 
 IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus
 	dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth
@@ -191,7 +176,7 @@ RDEPEND="
 		gnome-base/librsvg:2
 		x11-libs/cairo
 	)
-	taglib? ( <media-libs/taglib-2 )
+	taglib? ( media-libs/taglib:= )
 	theora? ( media-libs/libtheora )
 	tremor? ( media-libs/tremor )
 	truetype? (
@@ -233,8 +218,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
 	"${FILESDIR}"/${PN}-3.0.18-drop-minizip-dep.patch
 	"${FILESDIR}"/${PN}-3.0.21-freerdp-2.patch # bug 919296, 590164
-	"${FILESDIR}"/${PN}-3.0.21-vaapi-without-ffmpeg4.patch # bug 864721, thx Fedora
-	"${FILESDIR}"/${PN}-3.0.2.1-vdpau.patch # bug 946178
 )
 
 DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
@@ -255,7 +238,7 @@ src_prepare() {
 		eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
 
 	# Bootstrap when we are on a git checkout.
-	if [[ ${PV} = *9999 ]] ; then
+	if [[ ${PV} == *9999* || ${PV} == *_p[0-9]* ]] ; then
 		./bootstrap
 	fi
 
@@ -288,6 +271,7 @@ src_configure() {
 
 	local myeconfargs=(
 		--disable-aa
+		--disable-amf-frc # DirectX specific
 		--disable-optimizations
 		--disable-rpath
 		--disable-update-check
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index c3e406c30347..a0dac70525e4 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2000-2024 Gentoo Authors
+# Copyright 2000-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -286,6 +286,7 @@ src_configure() {
 
 	local myeconfargs=(
 		--disable-aa
+		--disable-amf-frc # DirectX specific
 		--disable-optimizations
 		--disable-rpath
 		--disable-update-check
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 105ed766410a..8e46924d0698 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2000-2024 Gentoo Authors
+# Copyright 2000-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -289,6 +289,7 @@ src_configure() {
 	local -x BUILDCC="$(tc-getBUILD_CC)"
 
 	local myeconfargs=(
+		--disable-amf-frc # DirectX specific
 		--disable-optimizations
 		--disable-rpath
 		--disable-update-check