[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/, media-video/vlc/files/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     5817a4701c7df20e15f4e11e6bd03ecc657dd383
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 21 14:02:43 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 21 22:42:44 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5817a470

media-video/vlc: drop 3.0.21-r3

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-video/vlc/Manifest                           |   2 -
 media-video/vlc/files/vlc-3.0.2.1-vdpau.patch      | 174 -------
 .../vlc/files/vlc-3.0.21-vaapi-w-ffmpeg5.patch     | 149 ------
 media-video/vlc/vlc-3.0.21-r3.ebuild               | 500 ---------------------
 4 files changed, 825 deletions(-)

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 3d3cdb65cdb5..4153cbbeb8b0 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,3 +1 @@
-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
 DIST vlc-3.0.21_p20250217.tar.bz2 24645521 BLAKE2B 473cc2bc5f385635ba7c36bca2ddb0ca6cb479491e7a5baa51583edce3fa1e4b0a7afd883d595332cafe8d1b22e743e0f306aebfe2c7c13d3317d0ea5502bb38 SHA512 95d23c8ecf013d072530fe7cd6e78b5efc0a7132407e8d09d02014b4a7cf9f508cea4c18c0f39edced634338fce06613a207b5f0b556344c7481a1ed5af2dc5f

diff --git a/media-video/vlc/files/vlc-3.0.2.1-vdpau.patch b/media-video/vlc/files/vlc-3.0.2.1-vdpau.patch
deleted file mode 100644
index 884c1fcd1eb2..000000000000
--- a/media-video/vlc/files/vlc-3.0.2.1-vdpau.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-https://bugs.gentoo.org/946178
-https://code.videolan.org/videolan/vlc/-/issues/28374
-https://code.videolan.org/videolan/vlc/-/merge_requests/6454
-https://code.videolan.org/videolan/vlc/-/merge_requests/6496
-
-From 056d7349a559cb63b456505bb11c08a4910452aa Mon Sep 17 00:00:00 2001
-From: Alexandre Janniaux <ajanni@videolabs.io>
-Date: Sun, 1 Dec 2024 06:25:29 +0100
-Subject: [PATCH] Makefile.am: enforce pkglib dependency order for install
-
-During installation, no dependencies existed between the targets being
-installed and the targets being relinked against the installed version,
-which made the following race condition:
-
-    ../doltlibtool   --mode=install /usr/bin/install -c   libvlc_pipewire.la libvlc_pulse.la libvlc_vdpau.la libvlc_xcb_events.la '/builds/videolan/vlc/vlc-4.0.0-dev/_inst/lib/vlc'
-    libtool: install: (cd /builds/videolan/vlc/vlc-4.0.0-dev/_build/sub/modules; /bin/bash "/builds/videolan/vlc/vlc-4.0.0-dev/_build/sub/modules/../libtool"  --silent --tag CC --mode=relink gcc -g -O2 -pthread -Wall -Wextra -Wsign-compare -Wundef -Wpointer-arith -Wvolatile-register-var -Wformat -Wformat-security -Wduplicated-branches -Wduplicated-cond -Wbad-function-cast -Wwrite-strings -Wmissing-prototypes -Werror-implicit-function-declaration -Winit-self -Wlogical-op -Wshadow=local -Wmultistatement-macros -pipe -Werror=missing-field-initializers -Werror=format -Werror=incompatible-pointer-types -Werror=restrict -Werror=int-conversion -Werror=implicit-int -Werror=return-mismatch -Werror=declaration-missing-parameter-type -fvisibility=hidden -fno-math-errno -funsafe-math-optimizations -fno-rounding-math -fno-signaling-nans -fcx-limited-range -funroll-loops -fstack-protector-strong -avoid-version -module -export-symbols-regex "^vlc_entry" -shrext .so -no-undefined ../compat/libcompa
 t.la ../src/libvlccore.la -Wl,-z,defs -o libvdpau_instance_plugin.la -rpath /builds/videolan/vlc/vlc-4.0.0-dev/_inst/lib/vlc/plugins/vdpau hw/vdpau/libvdpau_instance_plugin_la-device.lo libvlc_vdpau.la -lSM -lICE -lX11 -lanl )
-    libtool: install: /usr/bin/install -c .libs/libvlc_vdpau.so.0.0.0 /builds/videolan/vlc/vlc-4.0.0-dev/_inst/lib/vlc/libvlc_vdpau.so.0.0.0
-    /usr/bin/ld: cannot find -lvlc_vdpau: No such file or directory
-    libtool: install: (cd /builds/videolan/vlc/vlc-4.0.0-dev/_inst/lib/vlc && { ln -s -f libvlc_vdpau.so.0.0.0 libvlc_vdpau.so.0 || { rm -f libvlc_vdpau.so.0 && ln -s libvlc_vdpau.so.0.0.0 libvlc_vdpau.so.0; }; })
-    collect2: error: ld returned 1 exit status
-    libtool: install: (cd /builds/videolan/vlc/vlc-4.0.0-dev/_inst/lib/vlc && { ln -s -f libvlc_vdpau.so.0.0.0 libvlc_vdpau.so || { rm -f libvlc_vdpau.so && ln -s libvlc_vdpau.so.0.0.0 libvlc_vdpau.so; }; })
-    ----------------------------------------------------------------------
-    libtool:   error: error: relink 'libvdpau_instance_plugin.la' with the above command before installing it
-    libtool: install: /usr/bin/install -c .libs/libvlc_vdpau.lai /builds/videolan/vlc/vlc-4.0.0-dev/_inst/lib/vlc/libvlc_vdpau.la
-    make[6]: *** [Makefile:15527: install-vdpauLTLIBRARIES] Error 1
-
-Here, with the thread number, we have:
- - (1) doltlibtool installing the pkglibs (install-exec-am).
- - (2) in parallel, libtool relinking the vdpau instance plugin.
- - (1) libtool starts to be called for "relinking" (which is only
-       installing there) with version 0.0.0.
- - (2) libtool tried to run the linker but it failed because
-       libvlc_vdpau.so doesn't exist yet on the target prefix.
- - (1) libtool .0.0.0 links to the major version shortcut .0 for
-       libvlc_vdpau.
- - (1) libtool .0.0.0 links to the unversioned shortcut for
-       libvlc_vdpau.
-
-So the pkglibs were not installed before installing the plugins linking
-them and it was racy whether automake succeeded in installing vlc_vdpau
-before or not. This could apply to any pkglib being used from plugins.
-
-This patch ensure the pkglibs are installed before relinking the plugins
-for vpdau, same must be done for each other pkglib usage location.
-
-Note that install-vdpauLTLIBRARIES itself will install each target from
-vdpau_LTLIBRARIES serially in the order they are defined, so there would
-be no race inside the same LTLIBRARIES variables, but the different
-LTLIBRARIES variables are processed in parallel themselves.
-
-Fixes #28374
----
- modules/Makefile.am              | 1 +
- modules/audio_output/Makefile.am | 3 +++
- modules/hw/vdpau/Makefile.am     | 4 ++++
- modules/video_output/Makefile.am | 3 +++
- 4 files changed, 11 insertions(+)
-
-diff --git a/modules/Makefile.am b/modules/Makefile.am
-index d9940f95cbc8..3a41a6bbe456 100644
---- a/modules/Makefile.am
-+++ b/modules/Makefile.am
-@@ -1,3 +1,4 @@
-+
- noinst_LTLIBRARIES =
- check_LTLIBRARIES =
- pkglib_LTLIBRARIES =
-diff --git a/modules/audio_output/Makefile.am b/modules/audio_output/Makefile.am
-index 4c7957cdd153..8d48003e20b5 100644
---- a/modules/audio_output/Makefile.am
-+++ b/modules/audio_output/Makefile.am
-@@ -1,5 +1,8 @@
- aoutdir = $(pluginsdir)/audio_output
- aout_LTLIBRARIES =
-+# Install the pkglib/pkglibexec first before relinking the modules.
-+# This ensures libtool re-linking is not racy.
-+install-aoutLTLIBRARIES: install-pkglibLTLIBRARIES
- 
- libvlc_android_audioformat_jni_la_SOURCES = \
- 	audio_output/android/audioformat_jni.c \
-diff --git a/modules/hw/vdpau/Makefile.am b/modules/hw/vdpau/Makefile.am
-index ef3601209314..f195f712310b 100644
---- a/modules/hw/vdpau/Makefile.am
-+++ b/modules/hw/vdpau/Makefile.am
-@@ -1,4 +1,8 @@
- vdpaudir = $(pluginsdir)/vdpau
-+# Install the pkglib/pkglibexec first before relinking the modules.
-+# This ensures libtool re-linking is not racy.
-+install-vpdauLTLIBRARIES: install-pkglibLTLIBRARIES
-+
- 
- libvlc_vdpau_la_SOURCES = hw/vdpau/vlc_vdpau.c hw/vdpau/vlc_vdpau.h
- libvlc_vdpau_la_CFLAGS = $(VDPAU_CFLAGS)
-diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am
-index ad959bc45ed5..bcbb892c4c93 100644
---- a/modules/video_output/Makefile.am
-+++ b/modules/video_output/Makefile.am
-@@ -1,5 +1,8 @@
- voutdir = $(pluginsdir)/video_output
- vout_LTLIBRARIES =
-+# Install the pkglib/pkglibexec first before relinking the modules.
-+# This ensures libtool re-linking is not racy.
-+install-voutLTLIBRARIES: install-pkglibLTLIBRARIES
- 
- EXTRA_DIST += video_output/README
- 
--- 
-GitLab
-
-From 0b9f3f836f1c678e6d101f62545a8edaba16dcd0 Mon Sep 17 00:00:00 2001
-From: Alexandre Janniaux <ajanni@videolabs.io>
-Date: Sun, 8 Dec 2024 22:43:37 +0100
-Subject: [PATCH] Makefile.am: fix installation regression
-
-Automake doesn't generate automatic rules when a rule already exist in
-the file, except if it cannot detect it. Adding the
-`install-fooLTLIBRARIES: install-pkglibLTLIBRARIES` rule for audio
-outputs, video outputs and vdpau broke the installation.
-
-Adding `$(install-fooLTLIBRARIES): install-pkglibLTLIBRARIES` also makes
-automake unhappy because of the variable name looking suspiciously close
-to the target it generates, so a version without the dash is used for
-the variable name in the rule. With this, the install target is
-preserved but the dependency also exists in the output.
----
- modules/audio_output/Makefile.am | 3 ++-
- modules/hw/vdpau/Makefile.am     | 3 ++-
- modules/video_output/Makefile.am | 3 ++-
- 3 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/modules/audio_output/Makefile.am b/modules/audio_output/Makefile.am
-index 8d48003e20b..c045a892c10 100644
---- a/modules/audio_output/Makefile.am
-+++ b/modules/audio_output/Makefile.am
-@@ -2,7 +2,8 @@ aoutdir = $(pluginsdir)/audio_output
- aout_LTLIBRARIES =
- # Install the pkglib/pkglibexec first before relinking the modules.
- # This ensures libtool re-linking is not racy.
--install-aoutLTLIBRARIES: install-pkglibLTLIBRARIES
-+installaoutLTLIBRARIES = install-aoutLTLIBRARIES
-+$(installaoutLTLIBRARIES): install-pkglibLTLIBRARIES
- 
- libvlc_android_audioformat_jni_la_SOURCES = \
- 	audio_output/android/audioformat_jni.c \
-diff --git a/modules/hw/vdpau/Makefile.am b/modules/hw/vdpau/Makefile.am
-index f195f712310..1abdfa21a9b 100644
---- a/modules/hw/vdpau/Makefile.am
-+++ b/modules/hw/vdpau/Makefile.am
-@@ -1,7 +1,8 @@
- vdpaudir = $(pluginsdir)/vdpau
- # Install the pkglib/pkglibexec first before relinking the modules.
- # This ensures libtool re-linking is not racy.
--install-vpdauLTLIBRARIES: install-pkglibLTLIBRARIES
-+installvpdauLTLIBRARIES = install-vdpauLTLIBRARIES
-+$(installvpdauLTLIBRARIES): install-pkglibLTLIBRARIES
- 
- 
- libvlc_vdpau_la_SOURCES = hw/vdpau/vlc_vdpau.c hw/vdpau/vlc_vdpau.h
-diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am
-index bcbb892c4c9..844b0dd01c8 100644
---- a/modules/video_output/Makefile.am
-+++ b/modules/video_output/Makefile.am
-@@ -2,7 +2,8 @@ voutdir = $(pluginsdir)/video_output
- vout_LTLIBRARIES =
- # Install the pkglib/pkglibexec first before relinking the modules.
- # This ensures libtool re-linking is not racy.
--install-voutLTLIBRARIES: install-pkglibLTLIBRARIES
-+installvoutLTLIBRARIES = install-voutLTLIBRARIES
-+$(installvoutLTLIBRARIES): install-pkglibLTLIBRARIES
- 
- EXTRA_DIST += video_output/README
- 
--- 
-GitLab

diff --git a/media-video/vlc/files/vlc-3.0.21-vaapi-w-ffmpeg5.patch b/media-video/vlc/files/vlc-3.0.21-vaapi-w-ffmpeg5.patch
deleted file mode 100644
index 322818b348b7..000000000000
--- a/media-video/vlc/files/vlc-3.0.21-vaapi-w-ffmpeg5.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-From ba5dc03aecc1d96f81b76838f845ebde7348cf62 Mon Sep 17 00:00:00 2001
-From: David Rosca <nowrep@gmail.com>
-Date: Fri, 20 Dec 2024 20:24:36 +0100
-Subject: [PATCH] avcodec: vaapi: Support VAAPI with latest FFmpeg
-
----
- configure.ac                            | 20 +------------
- modules/codec/Makefile.am               |  2 +-
- modules/codec/avcodec/avcommon_compat.h |  3 ++
- modules/codec/avcodec/vaapi.c           | 38 +++++++++++++++++++++++--
- 4 files changed, 41 insertions(+), 22 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 00afb063c455..089339e10e0b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2550,25 +2550,7 @@ AM_CONDITIONAL([HAVE_VAAPI], [test "${have_vaapi}" = "yes"])
- AM_CONDITIONAL([HAVE_VAAPI_DRM], [test "${have_vaapi_drm}" = "yes"])
- AM_CONDITIONAL([HAVE_VAAPI_X11], [test "${have_vaapi_x11}" = "yes"])
- AM_CONDITIONAL([HAVE_VAAPI_WL], [test "${have_vaapi_wl}" = "yes"])
--
--have_avcodec_vaapi="no"
--AS_IF([test "${have_vaapi}" = "yes" -a "${have_avcodec}" = "yes"], [
--  VLC_SAVE_FLAGS
--  CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
--  CFLAGS="${CFLAGS} ${AVCODEC_CFLAGS}"
--  AC_CHECK_HEADERS([libavcodec/vaapi.h], [
--    AC_MSG_NOTICE([VA API acceleration activated])
--    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 ])
--    ])
--  ])
--  VLC_RESTORE_FLAGS
--])
--AM_CONDITIONAL([HAVE_AVCODEC_VAAPI], [test "${have_avcodec_vaapi}" = "yes"])
-+AM_CONDITIONAL([HAVE_AVCODEC_VAAPI], [test "${have_vaapi}" = "yes" -a "${have_avcodec}" = "yes"])
- 
- dnl
- dnl dxva2 needs avcodec
-diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am
-index 6d9465fdaef9..dd04391c1bf7 100644
---- a/modules/codec/Makefile.am
-+++ b/modules/codec/Makefile.am
-@@ -416,7 +416,7 @@ libvaapi_plugin_la_SOURCES = \
- 	codec/avcodec/vaapi.c hw/vaapi/vlc_vaapi.c hw/vaapi/vlc_vaapi.h
- libvaapi_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
- libvaapi_plugin_la_CFLAGS = $(AM_CFLAGS) $(AVCODEC_CFLAGS)
--libvaapi_plugin_la_LIBADD = $(LIBVA_LIBS)
-+libvaapi_plugin_la_LIBADD = $(LIBVA_LIBS) $(AVCODEC_LIBS)
- if HAVE_AVCODEC_VAAPI
- if HAVE_VAAPI_DRM
- codec_LTLIBRARIES += libvaapi_drm_plugin.la
-diff --git a/modules/codec/avcodec/avcommon_compat.h b/modules/codec/avcodec/avcommon_compat.h
-index ac02c06d2339..8ab6910f3250 100644
---- a/modules/codec/avcodec/avcommon_compat.h
-+++ b/modules/codec/avcodec/avcommon_compat.h
-@@ -84,6 +84,9 @@
- #ifndef FF_API_AVIO_WRITE_NONCONST // removed in ffmpeg 7
- # define FF_API_AVIO_WRITE_NONCONST (LIBAVFORMAT_VERSION_MAJOR < 61)
- #endif
-+#ifndef FF_API_STRUCT_VAAPI_CONTEXT
-+# define FF_API_STRUCT_VAAPI_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 59)
-+#endif
- 
- #endif /* HAVE_LIBAVCODEC_AVCODEC_H */
- 
-diff --git a/modules/codec/avcodec/vaapi.c b/modules/codec/avcodec/vaapi.c
-index c83269e43f30..e203baaf9ee2 100644
---- a/modules/codec/avcodec/vaapi.c
-+++ b/modules/codec/avcodec/vaapi.c
-@@ -42,12 +42,25 @@
- # include <va/va_drm.h>
- #endif
- #include <libavcodec/avcodec.h>
-+#if FF_API_STRUCT_VAAPI_CONTEXT
- #include <libavcodec/vaapi.h>
-+#else
-+#include <libavutil/hwcontext_vaapi.h>
-+#endif
- 
- #include "avcodec.h"
- #include "va.h"
- #include "../../hw/vaapi/vlc_vaapi.h"
- 
-+#if !FF_API_STRUCT_VAAPI_CONTEXT
-+struct vaapi_context
-+{
-+    VADisplay display;
-+    VAConfigID config_id;
-+    VAContextID context_id;
-+};
-+#endif
-+
- struct vlc_va_sys_t
- {
-     struct vlc_vaapi_instance *va_inst;
-@@ -145,8 +158,10 @@ static void Delete(vlc_va_t *va, void **hwctx)
- 
-     (void) hwctx;
- 
--    vlc_vaapi_DestroyContext(o, sys->hw_ctx.display, sys->hw_ctx.context_id);
--    vlc_vaapi_DestroyConfig(o, sys->hw_ctx.display, sys->hw_ctx.config_id);
-+    if (sys->hw_ctx.context_id != VA_INVALID_ID)
-+        vlc_vaapi_DestroyContext(o, sys->hw_ctx.display, sys->hw_ctx.context_id);
-+    if (sys->hw_ctx.config_id != VA_INVALID_ID)
-+        vlc_vaapi_DestroyConfig(o, sys->hw_ctx.display, sys->hw_ctx.config_id);
-     vlc_vaapi_ReleaseInstance(sys->va_inst);
-     free(sys);
- }
-@@ -196,6 +211,7 @@ static int Create(vlc_va_t *va, AVCodecContext *ctx, const AVPixFmtDescriptor *d
-     sys->hw_ctx.config_id = VA_INVALID_ID;
-     sys->hw_ctx.context_id = VA_INVALID_ID;
- 
-+#if FF_API_STRUCT_VAAPI_CONTEXT
-     sys->hw_ctx.config_id =
-         vlc_vaapi_CreateConfigChecked(o, sys->hw_ctx.display, i_profile,
-                                       VAEntrypointVLD, i_vlc_chroma);
-@@ -211,6 +227,24 @@ static int Create(vlc_va_t *va, AVCodecContext *ctx, const AVPixFmtDescriptor *d
-         goto error;
- 
-     ctx->hwaccel_context = &sys->hw_ctx;
-+#else
-+    AVBufferRef *hwdev_ref = av_hwdevice_ctx_alloc(AV_HWDEVICE_TYPE_VAAPI);
-+    if (hwdev_ref == NULL)
-+        goto error;
-+
-+    AVHWDeviceContext *hwdev_ctx = (void *) hwdev_ref->data;
-+    AVVAAPIDeviceContext *vadev_ctx = hwdev_ctx->hwctx;
-+    vadev_ctx->display = va_dpy;
-+
-+    if (av_hwdevice_ctx_init(hwdev_ref) < 0)
-+    {
-+        av_buffer_unref(&hwdev_ref);
-+        goto error;
-+    }
-+
-+    ctx->hw_device_ctx = hwdev_ref;
-+#endif
-+
-     va->sys = sys;
-     va->description = vaQueryVendorString(sys->hw_ctx.display);
-     va->get = Get;
--- 
-GitLab
-

diff --git a/media-video/vlc/vlc-3.0.21-r3.ebuild b/media-video/vlc/vlc-3.0.21-r3.ebuild
deleted file mode 100644
index ec6e25339207..000000000000
--- a/media-video/vlc/vlc-3.0.21-r3.ebuild
+++ /dev/null
@@ -1,500 +0,0 @@
-# Copyright 2000-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..2} )
-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://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz
-	https://dev.gentoo.org/~asturm/distfiles/${P}-taglib2.tar.xz"
-
-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
-	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 )
-"
-# <media-plugins/live-2024.11.28: https://github.com/gentoo/gentoo/pull/40610#issuecomment-2664870395
-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-2024.11.28:= )
-	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:= )
-	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-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
-	"${WORKDIR}"/${P}-taglib2 # bug 938946, in 3.0.x branch
-	"${FILESDIR}"/${PN}-3.0.2.1-vdpau.patch # bug 946178
-	"${FILESDIR}"/${P}-vaapi-w-ffmpeg5.patch # bug 864721, in 3.0.x branch
-)
-
-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
-}