From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 860B91382C5 for ; Tue, 12 Jan 2021 19:56:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8F5C5E0AC4; Tue, 12 Jan 2021 19:56:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7227FE0AC4 for ; Tue, 12 Jan 2021 19:56:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D887433BF02 for ; Tue, 12 Jan 2021 19:56:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 352A64C for ; Tue, 12 Jan 2021 19:56:36 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1610481345.e8483eadf1ce425f0b7510f856022cec166a26ad.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/vlc/vlc-3.0.12.1-r100.ebuild X-VCS-Directories: media-video/vlc/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: e8483eadf1ce425f0b7510f856022cec166a26ad X-VCS-Branch: master Date: Tue, 12 Jan 2021 19:56:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b9a67eaf-8eb1-4409-a6d8-8a2db68267a7 X-Archives-Hash: b8f48a187d554c6780e222bc7ae0f590 commit: e8483eadf1ce425f0b7510f856022cec166a26ad Author: Lars Wendler gentoo org> AuthorDate: Tue Jan 12 19:55:30 2021 +0000 Commit: Lars Wendler gentoo org> CommitDate: Tue Jan 12 19:55:45 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8483ead media-video/vlc: Several crucial ebuild fixes - Fixed ${S} - Removed one superfluous patch - commented failing "rm" call - Added "${EROOT}" to elog message Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Lars Wendler gentoo.org> media-video/vlc/vlc-3.0.12.1-r100.ebuild | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/media-video/vlc/vlc-3.0.12.1-r100.ebuild b/media-video/vlc/vlc-3.0.12.1-r100.ebuild index f2ce233b2ec..86bdf686f59 100644 --- a/media-video/vlc/vlc-3.0.12.1-r100.ebuild +++ b/media-video/vlc/vlc-3.0.12.1-r100.ebuild @@ -17,6 +17,7 @@ if [[ ${PV} = *9999 ]] ; then inherit git-r3 else SRC_URI="https://code.videolan.org/videolan/vlc-$(ver_cut 1-2)/-/archive/${PV}/vlc-$(ver_cut 1-2)-${PV}.tar.gz" + S="${WORKDIR}/${PN}-$(ver_cut 1-2)-${PV}" #if [[ ${MY_P} = ${P} ]] ; then # SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz" #else @@ -233,15 +234,12 @@ PATCHES=( "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system "${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164 "${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290 - "${FILESDIR}"/${PN}-3.0.8-qt-5.15.patch # TODO: upstream "${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch "${FILESDIR}"/${PN}-3.0.11.1-srt-1.4.2.patch # bug 758062 ) DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt ) -S="${WORKDIR}/${MY_P}" - pkg_setup() { if use lua; then lua-single_pkg_setup @@ -260,7 +258,7 @@ src_prepare() { fi # Make it build with libtool 1.5 - rm m4/lt* m4/libtool.m4 || die + #rm m4/lt* m4/libtool.m4 || die # We are not in a real git checkout due to the absence of a .git directory. touch src/revision.txt || die @@ -495,7 +493,7 @@ pkg_postinst() { "${EROOT}/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 ${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen manually" ewarn "If you do not do it, vlc will take a long time to load." fi