Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/
Date: Thu, 01 Dec 2022 18:03:33
Message-Id: 1669917558.83e11a2f0e71b2c8ccdfae67f3a401ab6969db80.sam@gentoo
1 commit: 83e11a2f0e71b2c8ccdfae67f3a401ab6969db80
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 1 17:48:18 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 1 17:59:18 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83e11a2f
7
8 media-video/vlc: add 3.0.18
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 media-video/vlc/Manifest | 1 +
13 media-video/vlc/{vlc-3.0.9999.ebuild => vlc-3.0.18.ebuild} | 9 ++++++---
14 media-video/vlc/vlc-3.0.9999.ebuild | 7 +++++--
15 media-video/vlc/vlc-9999.ebuild | 7 +++++--
16 4 files changed, 17 insertions(+), 7 deletions(-)
17
18 diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
19 index 38144ceb38e2..61a718d4d063 100644
20 --- a/media-video/vlc/Manifest
21 +++ b/media-video/vlc/Manifest
22 @@ -1 +1,2 @@
23 DIST vlc-3.0.17.4.tar.xz 26567148 BLAKE2B 4f36e7a9695d9e839fbebe92ec85c9411fa5b980b18332caf3dacfe51c6fea30cae71ee4cb0dad8b5536dd7d9b8801987f87a3c978eec17e444eaeacda603881 SHA512 dac14c6586603c064294672eb878253e52b3a7bef431fb10303345e5400591b5c1f2d452a2af03f503db0ca186582a84be06fdf05ab011c33f7b0bd5389c51fb
24 +DIST vlc-3.0.18.tar.xz 26631372 BLAKE2B 73d80615d5b4789ca980bd631db248e74de13d466e5f19b66a170ca785b46f281a1a242c6fdf14686cfb224aba3ddfeda16ffce11edbef3255c4bbdff36c517d SHA512 6fc8fdaa7e8862ad7133d69b3dab99ab9cd3945846a6ce5e2379b7f68ee9accd385c53b8573fc7c82f732c24678b4932b1154d2ad8accf06305f2f578d6fcd8e
25
26 diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.18.ebuild
27 similarity index 99%
28 copy from media-video/vlc/vlc-3.0.9999.ebuild
29 copy to media-video/vlc/vlc-3.0.18.ebuild
30 index 1bb332e0e8d1..796b615311cc 100644
31 --- a/media-video/vlc/vlc-3.0.9999.ebuild
32 +++ b/media-video/vlc/vlc-3.0.18.ebuild
33 @@ -1,7 +1,7 @@
34 # Copyright 2000-2022 Gentoo Authors
35 # Distributed under the terms of the GNU General Public License v2
36
37 -EAPI=7
38 +EAPI=8
39
40 LUA_COMPAT=( lua5-{1..2} )
41
42 @@ -20,7 +20,7 @@ else
43 else
44 SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
45 fi
46 - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 -sparc ~x86"
47 + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv -sparc ~x86"
48 fi
49 inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
50
51 @@ -243,7 +243,10 @@ pkg_setup() {
52 }
53
54 src_prepare() {
55 - xdg_src_prepare # bug 608256
56 + default
57 +
58 + # bug 608256
59 + xdg_environment_reset
60
61 has_version 'net-libs/libupnp:1.8' && \
62 eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
63
64 diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
65 index 1bb332e0e8d1..ceca1a3dae1d 100644
66 --- a/media-video/vlc/vlc-3.0.9999.ebuild
67 +++ b/media-video/vlc/vlc-3.0.9999.ebuild
68 @@ -1,7 +1,7 @@
69 # Copyright 2000-2022 Gentoo Authors
70 # Distributed under the terms of the GNU General Public License v2
71
72 -EAPI=7
73 +EAPI=8
74
75 LUA_COMPAT=( lua5-{1..2} )
76
77 @@ -243,7 +243,10 @@ pkg_setup() {
78 }
79
80 src_prepare() {
81 - xdg_src_prepare # bug 608256
82 + default
83 +
84 + # bug 608256
85 + xdg_environment_reset
86
87 has_version 'net-libs/libupnp:1.8' && \
88 eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
89
90 diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
91 index 04d660284ef4..2485c8f18d35 100644
92 --- a/media-video/vlc/vlc-9999.ebuild
93 +++ b/media-video/vlc/vlc-9999.ebuild
94 @@ -1,7 +1,7 @@
95 # Copyright 2000-2022 Gentoo Authors
96 # Distributed under the terms of the GNU General Public License v2
97
98 -EAPI=7
99 +EAPI=8
100
101 LUA_COMPAT=( lua5-{1..2} )
102
103 @@ -246,7 +246,10 @@ pkg_setup() {
104 }
105
106 src_prepare() {
107 - xdg_src_prepare # bug 608256
108 + default
109 +
110 + # bug 608256
111 + xdg_environment_reset
112
113 has_version 'net-libs/libupnp:1.8' && \
114 eapply "${FILESDIR}"/${P}-libupnp-slot-1.8.patch