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

[Andreas Sturmlechner]

commit:     94e3126e49cc20de51c1249ae26085d9de993259
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 19 19:57:05 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 19 20:04:12 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94e3126e

media-video/vlc: add 3.0.22, drop patches applied to 3.0.x branch

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

 media-video/vlc/Manifest                                   | 1 +
 media-video/vlc/{vlc-3.0.9999.ebuild => vlc-3.0.22.ebuild} | 4 ++--
 media-video/vlc/vlc-3.0.9999.ebuild                        | 3 ---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 0992140ee66b..89cf3f521b14 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1 +1,2 @@
 DIST vlc-3.0.22-rc2.tar.xz 26426204 BLAKE2B 
a75ec346e047e951494b3a2df21493117ac4533f55e54629759c9a666dcb1a319b21482af2583b65fd2fe0006d044c1127bc08076620373c841670d32410da32
 SHA512 
52cd274ddab0d8f7eb247a32c26cc311ae86d53c205fbee30f0958788e8340bed79a5dce15d121b47fd5638b5999802a9c9d314e7bf91d79aa33141cef801927
+DIST vlc-3.0.22.tar.xz 26427084 BLAKE2B 
38921563d8c708633483f37b424dd9f6cff4893e19f6611df4be899e6c0dc2413079e54492e0284dd2e59b6a845a56c050a81fc080292d3496905382e26c8ac1
 SHA512 
f60926fae508cb5b3b99d32910ea0f83372dd46497c60aa0c601dfd3b5b467c9c6cc628ab0a3a8541559739f77fc8a00de909a2c9b92d700d5b48830e8b3e409

diff --git a/media-video/vlc/vlc-3.0.9999.ebuild 
b/media-video/vlc/vlc-3.0.22.ebuild
similarity index 98%
copy from media-video/vlc/vlc-3.0.9999.ebuild
copy to media-video/vlc/vlc-3.0.22.ebuild
index c6ffe5224e9e..5343eaebd64f 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.22.ebuild
@@ -245,8 +245,8 @@ PATCHES=(
        "${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
        "${FILESDIR}"/${PN}-3.0.18-drop-minizip-dep.patch
        # bug 961436
-       "${FILESDIR}"/${P}-ffmpeg8-1.patch # upstream git master backport
-       "${FILESDIR}"/${P}-ffmpeg8-2.patch # downstream
+       "${FILESDIR}"/${PN}-3.0.22_rc2-ffmpeg8-1.patch # upstream git master 
backport
+       "${FILESDIR}"/${PN}-3.0.22_rc2-ffmpeg8-2.patch # downstream
 )
 
 pkg_setup() {

diff --git a/media-video/vlc/vlc-3.0.9999.ebuild 
b/media-video/vlc/vlc-3.0.9999.ebuild
index c6ffe5224e9e..09de0c8ac5e7 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -244,9 +244,6 @@ PATCHES=(
        "${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
-       # bug 961436
-       "${FILESDIR}"/${P}-ffmpeg8-1.patch # upstream git master backport
-       "${FILESDIR}"/${P}-ffmpeg8-2.patch # downstream
 )
 
 pkg_setup() {