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 A062D138359 for ; Fri, 21 Aug 2020 00:12:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B278AE0A10; Fri, 21 Aug 2020 00:12:44 +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 95AF6E0A10 for ; Fri, 21 Aug 2020 00:12:44 +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 36CE033BE14 for ; Fri, 21 Aug 2020 00:12:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ABFA930A for ; Fri, 21 Aug 2020 00:12:41 +0000 (UTC) From: "Jory Pratt" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" Message-ID: <1597968720.39bb953ab3b80b797d58c2398fba8fca03987e44.anarchy@gentoo> Subject: [gentoo-commits] proj/musl:master commit in: media-video/guvcview/ X-VCS-Repository: proj/musl X-VCS-Files: media-video/guvcview/guvcview-2.0.6-r1.ebuild media-video/guvcview/guvcview-2.0.6.ebuild X-VCS-Directories: media-video/guvcview/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: 39bb953ab3b80b797d58c2398fba8fca03987e44 X-VCS-Branch: master Date: Fri, 21 Aug 2020 00:12:41 +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: b5250719-a7e6-484f-97e5-0bc60082ea44 X-Archives-Hash: 26ae8cf1d9003e204870bcc6d2bc7d98 commit: 39bb953ab3b80b797d58c2398fba8fca03987e44 Author: Jory Pratt gentoo org> AuthorDate: Fri Aug 21 00:12:00 2020 +0000 Commit: Jory Pratt gentoo org> CommitDate: Fri Aug 21 00:12:00 2020 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=39bb953a media-video/guvcview: Sync with ::gentoo Package-Manager: Portage-3.0.4, Repoman-2.3.23 Signed-off-by: Jory Pratt gentoo.org> ...cview-2.0.6.ebuild => guvcview-2.0.6-r1.ebuild} | 32 +++++++++++----------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/media-video/guvcview/guvcview-2.0.6.ebuild b/media-video/guvcview/guvcview-2.0.6-r1.ebuild similarity index 84% rename from media-video/guvcview/guvcview-2.0.6.ebuild rename to media-video/guvcview/guvcview-2.0.6-r1.ebuild index 1b2304c..e6a8e86 100644 --- a/media-video/guvcview/guvcview-2.0.6.ebuild +++ b/media-video/guvcview/guvcview-2.0.6-r1.ebuild @@ -1,11 +1,10 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 - -inherit autotools flag-o-matic qmake-utils toolchain-funcs +EAPI=7 MY_P=${PN}-src-${PV} +inherit autotools flag-o-matic qmake-utils toolchain-funcs DESCRIPTION="Simple Qt5 or GTK+3 interface for capturing and viewing video from v4l2 devices" HOMEPAGE="http://guvcview.sourceforge.net/" @@ -14,20 +13,24 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="amd64 x86" -IUSE="gsl libav pulseaudio qt5" +IUSE="gsl pulseaudio qt5" +BDEPEND=" + dev-util/intltool + sys-devel/autoconf-archive + sys-devel/gettext + virtual/pkgconfig +" RDEPEND=" >=dev-libs/glib-2.10 media-libs/libpng:0= media-libs/libsdl2 media-libs/libv4l >=media-libs/portaudio-19_pre - virtual/ffmpeg + >=media-video/ffmpeg-2.8:0= virtual/libusb:1 virtual/udev gsl? ( >=sci-libs/gsl-1.15 ) - !libav? ( >=media-video/ffmpeg-2.8:0= ) - libav? ( media-video/libav:= ) pulseaudio? ( >=media-sound/pulseaudio-0.9.15 ) qt5? ( dev-qt/qtcore:5 @@ -38,21 +41,18 @@ RDEPEND=" " # linux-headers: bug 448260 DEPEND="${RDEPEND} - dev-util/intltool - sys-devel/autoconf-archive - sys-devel/gettext >=sys-kernel/linux-headers-3.4-r2 virtual/os-headers - virtual/pkgconfig " +PATCHES=( + "${FILESDIR}/${PN}-2.0.4-musl.patch" +) + S="${WORKDIR}/${MY_P}" src_prepare() { default - # Fix for MUSL - epatch "${FILESDIR}/${PN}-2.0.4-musl.patch" - sed -i '/^docdir/,/^$/d' Makefile.am || die echo "guvcview/gui_qt5_audioctrls.cpp" >> po/POTFILES.skip || die # bug 630984 eautoreconf @@ -77,5 +77,5 @@ src_configure() { src_install() { default - find "${D}" -name '*.la' -delete || die + find "${D}" -name '*.la' -type f -delete || die }