commit: 83e11a2f0e71b2c8ccdfae67f3a401ab6969db80
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 1 17:48:18 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 1 17:59:18 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83e11a2f
media-video/vlc: add 3.0.18
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/vlc/Manifest | 1 +
media-video/vlc/{vlc-3.0.9999.ebuild => vlc-3.0.18.ebuild} | 9 ++++++---
media-video/vlc/vlc-3.0.9999.ebuild | 7 +++++--
media-video/vlc/vlc-9999.ebuild | 7 +++++--
4 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 38144ceb38e2..61a718d4d063 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1 +1,2 @@
DIST vlc-3.0.17.4.tar.xz 26567148 BLAKE2B
4f36e7a9695d9e839fbebe92ec85c9411fa5b980b18332caf3dacfe51c6fea30cae71ee4cb0dad8b5536dd7d9b8801987f87a3c978eec17e444eaeacda603881
SHA512
dac14c6586603c064294672eb878253e52b3a7bef431fb10303345e5400591b5c1f2d452a2af03f503db0ca186582a84be06fdf05ab011c33f7b0bd5389c51fb
+DIST vlc-3.0.18.tar.xz 26631372 BLAKE2B
73d80615d5b4789ca980bd631db248e74de13d466e5f19b66a170ca785b46f281a1a242c6fdf14686cfb224aba3ddfeda16ffce11edbef3255c4bbdff36c517d
SHA512
6fc8fdaa7e8862ad7133d69b3dab99ab9cd3945846a6ce5e2379b7f68ee9accd385c53b8573fc7c82f732c24678b4932b1154d2ad8accf06305f2f578d6fcd8e
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild
b/media-video/vlc/vlc-3.0.18.ebuild
similarity index 99%
copy from media-video/vlc/vlc-3.0.9999.ebuild
copy to media-video/vlc/vlc-3.0.18.ebuild
index 1bb332e0e8d1..796b615311cc 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.18.ebuild
@@ -1,7 +1,7 @@
# Copyright 2000-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
LUA_COMPAT=( lua5-{1..2} )
@@ -20,7 +20,7 @@ else
else
SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz";
fi
- KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 -sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv -sparc ~x86"
fi
inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
@@ -243,7 +243,10 @@ pkg_setup() {
}
src_prepare() {
- xdg_src_prepare # bug 608256
+ default
+
+ # bug 608256
+ xdg_environment_reset
has_version 'net-libs/libupnp:1.8' && \
eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild
b/media-video/vlc/vlc-3.0.9999.ebuild
index 1bb332e0e8d1..ceca1a3dae1d 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 2000-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
LUA_COMPAT=( lua5-{1..2} )
@@ -243,7 +243,10 @@ pkg_setup() {
}
src_prepare() {
- xdg_src_prepare # bug 608256
+ default
+
+ # bug 608256
+ xdg_environment_reset
has_version 'net-libs/libupnp:1.8' && \
eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 04d660284ef4..2485c8f18d35 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 2000-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
LUA_COMPAT=( lua5-{1..2} )
@@ -246,7 +246,10 @@ pkg_setup() {
}
src_prepare() {
- xdg_src_prepare # bug 608256
+ default
+
+ # bug 608256
+ xdg_environment_reset
has_version 'net-libs/libupnp:1.8' && \
eapply "${FILESDIR}"/${P}-libupnp-slot-1.8.patch
