From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1374960-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id B6B4015808B
for <garchives@archives.gentoo.org>; Sun, 13 Mar 2022 05:28:31 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 8C925E0849;
Sun, 13 Mar 2022 05:28:27 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 60171E0849
for <gentoo-commits@lists.gentoo.org>; Sun, 13 Mar 2022 05:28:25 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id B300534327F
for <gentoo-commits@lists.gentoo.org>; Sun, 13 Mar 2022 05:28:18 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 64A06287
for <gentoo-commits@lists.gentoo.org>; Sun, 13 Mar 2022 05:28:16 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1647149268.c9055c0868328389fa2b85c8f222acd465cad890.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-video/vlc/Manifest media-video/vlc/vlc-3.0.17.3.ebuild media-video/vlc/vlc-3.0.9999.ebuild media-video/vlc/vlc-9999.ebuild
X-VCS-Directories: media-video/vlc/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: c9055c0868328389fa2b85c8f222acd465cad890
X-VCS-Branch: master
Date: Sun, 13 Mar 2022 05:28:16 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 1f840b0a-e068-4d57-bf38-311069358be0
X-Archives-Hash: bc9ab5d8eb25eb52d12cfce87d2a9cea
commit: c9055c0868328389fa2b85c8f222acd465cad890
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 13 02:40:39 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 13 05:27:48 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9055c08
media-video/vlc: add 3.0.17.3
Closes: https://bugs.gentoo.org/834418
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/vlc/Manifest | 1 +
.../{vlc-3.0.9999.ebuild => vlc-3.0.17.3.ebuild} | 17 +++++++++++------
media-video/vlc/vlc-3.0.9999.ebuild | 15 ++++++++++-----
media-video/vlc/vlc-9999.ebuild | 21 +++++++++++++--------
4 files changed, 35 insertions(+), 19 deletions(-)
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index fecc89d899f4..738543e5e5db 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1 +1,2 @@
DIST vlc-3.0.16.tar.xz 26439328 BLAKE2B 1971b88f3faf6d3b019c3fcb83108242bb218f1472dc3c1763a8eaa996befcb36a685a75beb8c2513e3365e77a9df6623d194ef511b5271e3114f2f46588e1ff SHA512 35cdf191071224d0cf1b5a83c00773ff87b9e5bfcf0f5523f7edd53f75b23eda6b27bb49ffa97d69a1d176b8fe4786d959aeeb00d4380beab71c9f7e6b7c7298
+DIST vlc-3.0.17.3.tar.xz 26393440 BLAKE2B 5079caa779335647394eb4af631ae89098b22545531ecf95ed81f9551f7004b8469a6e44de08f512e381164dc64e011d42be14d675d20c09ab043a00348f6b83 SHA512 99095b39ed600c3a89ebc0d377a2fc2522b3623a56b0f6de2df50a3c6e0148c67c28c0f2d8dec28bbdf5c62cf29b3579429a79ed00440570643778a9871022b6
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.17.3.ebuild
similarity index 96%
copy from media-video/vlc/vlc-3.0.9999.ebuild
copy to media-video/vlc/vlc-3.0.17.3.ebuild
index 0f61491ae7b1..1aa1edac3295 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.17.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2000-2021 Gentoo Authors
+# Copyright 2000-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 ~ppc ~ppc64 -sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv -sparc ~x86"
fi
inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
@@ -451,7 +451,12 @@ src_configure() {
fi
# FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
- append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
+ 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 )
@@ -488,11 +493,11 @@ src_install() {
pkg_postinst() {
if [[ -z "${ROOT}" ]] && [[ -x "${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
- einfo "Running ${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen on ${EROOT}/usr/$(get_libdir)/vlc/plugins/"
- "${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" "${EROOT}/usr/$(get_libdir)/vlc/plugins/"
+ 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 /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
+ 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
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index 0f61491ae7b1..da3784db8aee 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2000-2021 Gentoo Authors
+# Copyright 2000-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -451,7 +451,12 @@ src_configure() {
fi
# FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
- append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
+ 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 )
@@ -488,11 +493,11 @@ src_install() {
pkg_postinst() {
if [[ -z "${ROOT}" ]] && [[ -x "${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
- einfo "Running ${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen on ${EROOT}/usr/$(get_libdir)/vlc/plugins/"
- "${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" "${EROOT}/usr/$(get_libdir)/vlc/plugins/"
+ 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 /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
+ 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
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 29ca66497185..68cc07eff6bc 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2000-2021 Gentoo Authors
+# Copyright 2000-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -451,7 +451,12 @@ src_configure() {
fi
# FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
- append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
+ 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 )
@@ -487,12 +492,12 @@ src_install() {
}
pkg_postinst() {
- if [[ -z "${ROOT}" ]] && [[ -x "${EROOT}/usr/libexec/vlc/vlc-cache-gen" ]] ; then
- einfo "Running ${EROOT}/usr/libexec/vlc/vlc-cache-gen on ${EROOT}/usr/libexec/vlc/plugins/"
- "${EROOT}/usr/libexec/vlc/vlc-cache-gen" "${EROOT}/usr/libexec/vlc/plugins/"
+ 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 ${EROOT}/usr/libexec/vlc/vlc-cache-gen manually"
+ 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
@@ -500,8 +505,8 @@ pkg_postinst() {
}
pkg_postrm() {
- if [[ -e "${EROOT}"/usr/libexec/vlc/plugins/plugins.dat ]]; then
- rm "${EROOT}"/usr/libexec/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
+ 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