gentoo auto-resync : 09:01:2025 - 06:41:15

7 files changed, 184 insertions, 7 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index cef8b4da8b3e..e7e2f901d8cc 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/qmplay2/Manifest b/media-video/qmplay2/Manifest
index 58bd79126382..cb7af168713e 100644
--- a/media-video/qmplay2/Manifest
+++ b/media-video/qmplay2/Manifest
@@ -5,6 +5,6 @@ DIST QMPlay2-src-24.12.28.tar.xz 2070576 BLAKE2B ce7197617b61807f86707cf1ae91981
 EBUILD qmplay2-24.06.16.ebuild 3377 BLAKE2B 0a1decfcdf7c00665f4886f5b027649d071341a373b186328b094eba94411a40cabb60ed6a7027636a619486305b1c74a53fcae426a4944a690bcf2a34cc47dd SHA512 cf9a7cc2bc5d1aa92e12d31954ffec60dd70d5c76eb0bfadc8edd83149f90b437f9f5f863b616608239e5302fdb7032bea50b4f4c6d05ccdec9fca2f0d534e29
 EBUILD qmplay2-24.12.06.ebuild 3378 BLAKE2B 6cc5773edb049423e62502ea823991428a07d737d46a90f1a470ab3214cf7d82212f3706eef61a9981c0c8fa9405b7fcf95101f44cd4019d9c285da38da855f6 SHA512 c6d941954a4887457264c06fec0721b4ae152731bc344923fc77443b35bc38b71c8dc0e5852e7031ad5894359b880762abec56c5c1ebeea4e0bc683827c95c5a
 EBUILD qmplay2-24.12.23-r1.ebuild 3380 BLAKE2B 9134114136cc761234c9c9cd23edca9ec9b5efaa73a3746113956b85288c5b692ba34786d01ec8562b9aeb33b8bacb87c337794a004d4a2395f17ec55bc4678b SHA512 f1d1fcfcec96d737fe5cda773b994252164d7d44508ed82b0cf2d4f6870874e830dc6cd664326b5653a7a9c43786c9fde05e35abd643d3590ad9c6c17fdaeb74
-EBUILD qmplay2-24.12.28.ebuild 3085 BLAKE2B fdd456b35279670bf6dfdbdf634eeefc29be372d6c9c2d2953da2f1de137b8b2008604cae0c7a56794d15bb22cd9722ee67fa4cb1710888283d1a1f682a49d87 SHA512 65d1c0bc289414278d0294397e02200547874316b867430f1381345b3d1eb3a2eff96453281afe721d862e9a33a9b5e2076a591fd88bb665f52c3d3b46f39025
+EBUILD qmplay2-24.12.28.ebuild 3084 BLAKE2B 432ee95d1ff99cae367069a3baa626473da799aa4791fe1f2c8e514a51de42ef15ea16373dc72fd60349d17a131c050ea80889be87cc0b7b2da088b82d31be30 SHA512 8f109dcba277c063c8a5350d1654183186e6ef0d998690cc1bd681a1bb0716ada59d7c56e0213de31443cd5e0ff140465b8a159f35a76d92d7a68c0942d809a5
 EBUILD qmplay2-9999.ebuild 3085 BLAKE2B fdd456b35279670bf6dfdbdf634eeefc29be372d6c9c2d2953da2f1de137b8b2008604cae0c7a56794d15bb22cd9722ee67fa4cb1710888283d1a1f682a49d87 SHA512 65d1c0bc289414278d0294397e02200547874316b867430f1381345b3d1eb3a2eff96453281afe721d862e9a33a9b5e2076a591fd88bb665f52c3d3b46f39025
 MISC metadata.xml 1225 BLAKE2B 9fc74ea3d0319bc8822e0ff56968efcbe4ab40b758bfeca900883ed4dbbe80608a6954ffe95a1f61d0dd988ae88afd29d2c4485f3d62b2b839b9fea289fe3b72 SHA512 94f8b05578de759be210af0eb26f15d48e15112b07e586b6336737bd9cb3dd768c7dbefc3b667753239c10bdb1fa6ebdd39d5abe234742ead51f189bf63f8173
diff --git a/media-video/qmplay2/qmplay2-24.12.28.ebuild b/media-video/qmplay2/qmplay2-24.12.28.ebuild
index 389e940a75d0..6c13763ed45a 100644
--- a/media-video/qmplay2/qmplay2-24.12.28.ebuild
+++ b/media-video/qmplay2/qmplay2-24.12.28.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://github.com/zaps166/QMPlay2/releases/download/${PV}/QMPlay2-src-${PV}.tar.xz"
 	S="${WORKDIR}/QMPlay2-src-${PV}"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 LICENSE="LGPL-3"
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 24d0d307e759..74ba75bf2341 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -2,6 +2,7 @@ AUX vlc-2.1.0-fix-libtremor-libs.patch 453 BLAKE2B 526934642617384224faee8d26c0a
 AUX vlc-2.2.8-libupnp-slot-1.8.patch 725 BLAKE2B eb217ef57f0709fa1d0bdf1644610588f373e17d18c2642ee6489ca00311772307d8fc67a07ecc8d29810b80aa8f14c40298285c3319d8ddede2552d28d2837e SHA512 890b91405cbf6105c932566fd7799fdccd1b27f1e0df0c6dae1511aeead2c28eb5fea7642b01af1abbcf546aae0559408c0ddf2ec82c92809f3b02d1d477bb51
 AUX vlc-3.0.11.1-configure_lua_version.patch 1598 BLAKE2B 589c90d0c805ff516b7957e9b9fc6931674bc23a8aac15eb27351e9bae00aa55bffb3e62a87813714d8f0d64effa16c06680f10d00ecbe4207d5b26d37c4e5ac SHA512 0f24f54add360164417e01b2899ead07cc9f37cdc872387c7a9c350890f55c6fbec35f99e1e85a96309d7154359ffb99bc2ab7c8151adb080bb1531f88d987e6
 AUX vlc-3.0.18-drop-minizip-dep.patch 1024 BLAKE2B f00df51fe46743b760785151fdc4b770347331b80fcb4208860b4cf99555504e634959384c236a3539c9235547d5eb54c0a1b18e0183b0864e0c4fc070359e15 SHA512 5911e0e64d07fd23a67b142adaec684c581125f06295a64dee9aade31e780b6010538007c7477ea9ef69e4e7b4aeb1cc30891dd22bf273c18407f694111a66f8
+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-without-ffmpeg4.patch 692 BLAKE2B 6e9194d387e5b4643fb90d06fed809834e3a2c8e8f7e8a43b4d0866b73d5c2bf479181b83ae6e1b0a3b7971494fb478577a4385870c559be44961bed0d5bc9df SHA512 709450c0f51000618a7341cca7e4ffe6eac42a76a4cb7092ed197fbe28a6d6502c6bb234d6b0579ca3eb69bd918d1217a691ad2aa2aa7869c383ca77939ae83f
 AUX vlc-3.0.6-fdk-aac-2.0.0.patch 3436 BLAKE2B 022201ed10fef189feeb36f44ab4194ab7994e4fdd8bad922070b54688d34d051fac28177a0e648d55670e0b9f0c6b45f9a05650476b0ae12ebfe759dd561e28 SHA512 68964adda04cd88e80b586984f1af0cfdccff5dbf8529070d5ab985b23402dfb7380b5d39eacfea433c1ba03434139e4f394c1c25d6b426489883d3a42cb7b5b
@@ -10,8 +11,8 @@ AUX vlc-9999-fix-libtremor-libs.patch 480 BLAKE2B 86102dc088705f546185023b2f9415
 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 13629 BLAKE2B 03472183e65e7dec763e22d7d5295a62415d2bf65ccc15ce15db112b2eeb76363986c24b6b6e805942e9b7ac2debc3411ed3f29318a7ce394e845b72d72a6d80 SHA512 531d60a6f135409c92620b0d34f38cabab23c248bca895a54dc07fd6683424eb2822d68bd90a21535da0a5d91565d1974cc7098fbbb0cd90b56eb0f3141979d9
-EBUILD vlc-3.0.21-r2.ebuild 13349 BLAKE2B 6dcb15c0b5fe7376dbcc15d775899e320c7ef65cc0106a21334c2d8141fa7c5420068d659fad4c3c342504354668d556742b8f1bd31be331a00db1da6bcb8887 SHA512 987753bcd54d3b7fb558d14946298e023115d007820147053398dcd25d344d4ca42dd1e8e5867d157f3e42093da9e7fe00e7d479d386186346152ad843255d27
+EBUILD vlc-3.0.21-r1.ebuild 13683 BLAKE2B 37f55aac807012f5bbafdb2c0fae98340aea5aa4104f284c54973033050542ab5cce4a67da274535cb91d33aa0352c5dfd3732f726b3679f1e79351604bf77f1 SHA512 0dff4e8db522228dc975dcb027bd08581dbcb351da4707eff414f7525b2d7fd0204c2f85e41612ba3ef6448e4a26a6ce66516985fb8d89282bc1901db060b29f
+EBUILD vlc-3.0.21-r2.ebuild 13403 BLAKE2B 275bb566d9a7f36d5c2d99060c992813c1884aaa020dcc29bde9c9cc7b997a452f820a0b9ac70bb43f6cbd62bb86d3da7e35f20e7863fc0d31c1bcb442ba0a0f SHA512 59a2c042b54366e44548d0bc37a0cb7721602fba7e8b2d2ba6e5508db41305996186bb8fef32da15d6f48dda9b19168ef064f99087933e1b4ec6aee767d90d86
 EBUILD vlc-3.0.21.ebuild 13632 BLAKE2B cdf1b077440ba3400b7504018eb5d3af65f2cd18232a2c12072331dedd81ee5a0ddf245145cc55915807c297c07681485cf785361e0dc371261652a0467a3a46 SHA512 ef40a8bc248737c874527774e29107d8d89d36d5cc251ada4ea65c12b7194db850c207a06f982eca2df3982c37f7ac2dc3aca5615be335bfe0ef3a18f93de768
 EBUILD vlc-3.0.9999.ebuild 13633 BLAKE2B 07cd75c7c8e2e56c9645f6a8ce76093fb530ecee3c26461a7e7da1e2ca12ad932ed5e00e6932c8fc59692d36c874e45e34d3c55e09dbe64b08fd00239ed4ff9f SHA512 5c61bb142c7ad909320819989cf30a6464ce700c25ecc94acf4f725841495324b5969b0a88fe21d2c08744958cee85bf5d5f45dab548eca272e78f6e9dd8a8fe
 EBUILD vlc-9999.ebuild 13528 BLAKE2B 6f2b1d1b5a708565c66d13b0e519bddfdc51ead8b4f28cb9e62fdbc7d6496c817fa413d488a86f21a84915e1b60bfaf10f0ec22c44744d625b40659dea70a362 SHA512 baa9aaf6056b6b62942804dc10ab9074bc9ad48200b9d6f92d8ace9b23f7791fce5658ca86d9bff61419a1205262449d7f08ed31ab3da7687d13dc8ad2cda61c
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
new file mode 100644
index 000000000000..884c1fcd1eb2
--- /dev/null
+++ b/media-video/vlc/files/vlc-3.0.2.1-vdpau.patch
@@ -0,0 +1,174 @@
+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/libcompat.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/vlc-3.0.21-r1.ebuild b/media-video/vlc/vlc-3.0.21-r1.ebuild
index 9ca438fed821..d34fc239251f 100644
--- a/media-video/vlc/vlc-3.0.21-r1.ebuild
+++ b/media-video/vlc/vlc-3.0.21-r1.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
@@ -234,6 +234,7 @@ PATCHES=(
 	"${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 )
diff --git a/media-video/vlc/vlc-3.0.21-r2.ebuild b/media-video/vlc/vlc-3.0.21-r2.ebuild
index c675966604da..cc8ff0f5e827 100644
--- a/media-video/vlc/vlc-3.0.21-r2.ebuild
+++ b/media-video/vlc/vlc-3.0.21-r2.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
@@ -219,6 +219,7 @@ PATCHES=(
 	"${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.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 )