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 6B1141382C5 for ; Tue, 12 Jan 2021 18:13:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 98236E0AAD; Tue, 12 Jan 2021 18:13:55 +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 6D7C2E0AAC for ; Tue, 12 Jan 2021 18:13:55 +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 01018340DEC for ; Tue, 12 Jan 2021 18:13:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6C071496 for ; Tue, 12 Jan 2021 18:13:51 +0000 (UTC) From: "Sam James" 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" Message-ID: <1610475226.deb5110fe8a54a1ba5513bc193dbe320e0e0c639.sam@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-r1.ebuild media-video/vlc/vlc-3.0.12.1-r101.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: deb5110fe8a54a1ba5513bc193dbe320e0e0c639 X-VCS-Branch: master Date: Tue, 12 Jan 2021 18:13:51 +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: 875fc896-e6cb-401f-8be0-ba82f5e9a5dc X-Archives-Hash: a5350b73100cd02c0dc240e60cf2deb4 commit: deb5110fe8a54a1ba5513bc193dbe320e0e0c639 Author: Sam James gentoo org> AuthorDate: Tue Jan 12 18:04:55 2021 +0000 Commit: Sam James gentoo org> CommitDate: Tue Jan 12 18:13:46 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=deb5110f media-video/vlc: sync live Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> media-video/vlc/vlc-3.0.12.1-r1.ebuild | 18 +++++++++--------- media-video/vlc/vlc-3.0.12.1-r101.ebuild | 22 ++++++++++++++-------- media-video/vlc/vlc-3.0.9999.ebuild | 26 ++++++++++++++++---------- media-video/vlc/vlc-9999.ebuild | 28 +++++++++++++++++----------- 4 files changed, 56 insertions(+), 38 deletions(-) diff --git a/media-video/vlc/vlc-3.0.12.1-r1.ebuild b/media-video/vlc/vlc-3.0.12.1-r1.ebuild index 207ed0edaca..c696533f688 100644 --- a/media-video/vlc/vlc-3.0.12.1-r1.ebuild +++ b/media-video/vlc/vlc-3.0.12.1-r1.ebuild @@ -83,7 +83,7 @@ RDEPEND=" chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= - >=net-libs/libmicrodns-0.0.9:= + >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) @@ -474,16 +474,16 @@ src_test() { src_install() { default - find "${D}" -name '*.la' -delete || die + find "${ED}" -name '*.la' -delete || die } pkg_postinst() { - if [[ -z ${ROOT} ]] && [[ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then - einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/" - "/usr/$(get_libdir)/vlc/vlc-cache-gen" "/usr/$(get_libdir)/vlc/plugins/" + if [[ -z "${EROOT}" ]] && [[ -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/" else - ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)" - ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually" + ewarn "We cannot run vlc-cache-gen (most likely ROOT != /)" + 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 @@ -491,8 +491,8 @@ pkg_postinst() { } pkg_postrm() { - if [[ -e /usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then - rm /usr/$(get_libdir)/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 diff --git a/media-video/vlc/vlc-3.0.12.1-r101.ebuild b/media-video/vlc/vlc-3.0.12.1-r101.ebuild index f5a0f44b795..f2ce233b2ec 100644 --- a/media-video/vlc/vlc-3.0.12.1-r101.ebuild +++ b/media-video/vlc/vlc-3.0.12.1-r101.ebuild @@ -85,7 +85,7 @@ RDEPEND=" chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= - >=net-libs/libmicrodns-0.0.9:= + >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) @@ -447,6 +447,12 @@ src_configure() { # VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8 append-cxxflags -std=c++11 + if use omxil; then + # bug #723006 + # https://trac.videolan.org/vlc/ticket/24617 + append-cflags -fcommon + fi + # FIXME: Needs libresid-builder from libsidplay:2 which is in another directory... append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/" @@ -480,15 +486,15 @@ src_test() { src_install() { default - find "${D}" -name '*.la' -delete || die + find "${ED}" -name '*.la' -delete || die } pkg_postinst() { - if [[ -z ${ROOT} ]] && [[ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then - einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/" - "/usr/$(get_libdir)/vlc/vlc-cache-gen" "/usr/$(get_libdir)/vlc/plugins/" + if [[ -z "${EROOT}" ]] && [[ -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/" else - ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)" + ewarn "We cannot run vlc-cache-gen (most likely ROOT != /)" ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually" ewarn "If you do not do it, vlc will take a long time to load." fi @@ -497,8 +503,8 @@ pkg_postinst() { } pkg_postrm() { - if [[ -e /usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then - rm /usr/$(get_libdir)/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 diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild index eeb60b76f41..d002ba6334e 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-2020 Gentoo Authors +# Copyright 2000-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -183,7 +183,7 @@ RDEPEND=" >=media-libs/speex-1.2.0 media-libs/speexdsp ) - srt? ( net-libs/srt ) + srt? ( >=net-libs/srt-1.4.2 ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 @@ -199,7 +199,7 @@ RDEPEND=" ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) - upnp? ( net-libs/libupnp:= ) + upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) @@ -442,6 +442,12 @@ src_configure() { # VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8 append-cxxflags -std=c++11 + if use omxil; then + # bug #723006 + # https://trac.videolan.org/vlc/ticket/24617 + append-cflags -fcommon + fi + # FIXME: Needs libresid-builder from libsidplay:2 which is in another directory... append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/" @@ -475,15 +481,15 @@ src_test() { src_install() { default - find "${D}" -name '*.la' -delete || die + find "${ED}" -name '*.la' -delete || die } pkg_postinst() { - if [[ -z ${ROOT} ]] && [[ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then - einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/" - "/usr/$(get_libdir)/vlc/vlc-cache-gen" "/usr/$(get_libdir)/vlc/plugins/" + if [[ -z "${EROOT}" ]] && [[ -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/" else - ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)" + ewarn "We cannot run vlc-cache-gen (most likely ROOT != /)" ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually" ewarn "If you do not do it, vlc will take a long time to load." fi @@ -492,8 +498,8 @@ pkg_postinst() { } pkg_postrm() { - if [[ -e /usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then - rm /usr/$(get_libdir)/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 diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index 97191e56c23..b1f7df19374 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2000-2020 Gentoo Authors +# Copyright 2000-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -185,7 +185,7 @@ RDEPEND=" >=media-libs/speex-1.2.0 media-libs/speexdsp ) - srt? ( >=net-libs/srt-1.3.0 ) + srt? ( >=net-libs/srt-1.4.2 ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 @@ -201,7 +201,7 @@ RDEPEND=" ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) - upnp? ( net-libs/libupnp:= ) + upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) @@ -442,6 +442,12 @@ src_configure() { # VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8 append-cxxflags -std=c++11 + if use omxil; then + # bug #723006 + # https://trac.videolan.org/vlc/ticket/24617 + append-cflags -fcommon + fi + # FIXME: Needs libresid-builder from libsidplay:2 which is in another directory... append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/" @@ -475,16 +481,16 @@ src_test() { src_install() { default - find "${D}" -name '*.la' -delete || die + find "${ED}" -name '*.la' -delete || die } pkg_postinst() { - if [[ -z ${ROOT} ]] && [[ -x "/usr/libexec/vlc/vlc-cache-gen" ]] ; then - einfo "Running /usr/libexec/vlc/vlc-cache-gen on /usr/libexec/vlc/plugins/" - "/usr/libexec/vlc/vlc-cache-gen" "/usr/libexec/vlc/plugins/" + if [[ -z "${EROOT}" ]] && [[ -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/" else - ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)" - ewarn "Please run /usr/libexec/vlc/vlc-cache-gen manually" + ewarn "We cannot run vlc-cache-gen (most likely ROOT != /)" + ewarn "Please run ${EROOT}/usr/libexec/vlc/vlc-cache-gen manually" ewarn "If you do not do it, vlc will take a long time to load." fi @@ -492,8 +498,8 @@ pkg_postinst() { } pkg_postrm() { - if [[ -e /usr/libexec/vlc/plugins/plugins.dat ]]; then - rm /usr/libexec/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat" + if [[ -e "${EROOT}"/usr/libexec/vlc/plugins/plugins.dat ]]; then + rm "${EROOT}"/usr/libexec/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat" fi xdg_pkg_postrm