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 7E9F7138359 for ; Tue, 8 Sep 2020 22:43:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5ED97E0891; Tue, 8 Sep 2020 22:43:02 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 493C5E0891 for ; Tue, 8 Sep 2020 22:43:02 +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 45730340F2B for ; Tue, 8 Sep 2020 22:43:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C66C133F for ; Tue, 8 Sep 2020 22:42:59 +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: <1599604966.4c9fe03abb52a89c250d488d78013f1b64ea0ad5.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/gpac/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/gpac/gpac-9999.ebuild X-VCS-Directories: media-video/gpac/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4c9fe03abb52a89c250d488d78013f1b64ea0ad5 X-VCS-Branch: master Date: Tue, 8 Sep 2020 22:42:59 +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: e4dec5a2-50aa-4228-bb0f-e64269e2143d X-Archives-Hash: d87ad3a6925db0fdac0f5092429eb33f commit: 4c9fe03abb52a89c250d488d78013f1b64ea0ad5 Author: Sam James gentoo org> AuthorDate: Tue Sep 8 22:34:10 2020 +0000 Commit: Sam James gentoo org> CommitDate: Tue Sep 8 22:42:46 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c9fe03a media-video/gpac: sync live ebuild Package-Manager: Portage-3.0.6, Repoman-3.0.1 Signed-off-by: Sam James gentoo.org> media-video/gpac/gpac-9999.ebuild | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/media-video/gpac/gpac-9999.ebuild b/media-video/gpac/gpac-9999.ebuild index 37ed1edce4a..1fcbfe48c82 100644 --- a/media-video/gpac/gpac-9999.ebuild +++ b/media-video/gpac/gpac-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 if [[ ${PV} == *9999 ]] ; then SCM="git-r3" @@ -22,6 +22,7 @@ SLOT="0/10" IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libressl mad opengl oss png pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X" +BDEPEND="virtual/pkgconfig" RDEPEND=" media-libs/libogg a52? ( media-libs/a52dec ) @@ -30,7 +31,7 @@ RDEPEND=" ffmpeg? ( media-video/ffmpeg:0= ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( media-libs/openjpeg:0 ) + jpeg2k? ( media-libs/openjpeg:2 ) mad? ( media-libs/libmad ) opengl? ( media-libs/freeglut @@ -53,15 +54,18 @@ RDEPEND=" x11-libs/libXv x11-libs/libXext ) - xml? ( dev-libs/libxml2:2 ) + xml? ( dev-libs/libxml2:2= ) xvid? ( media-libs/xvid ) " -DEPEND="${RDEPEND} - virtual/pkgconfig +DEPEND=" + ${RDEPEND} dvb? ( sys-kernel/linux-headers ) " -PATCHES=( "${FILESDIR}/${PN}-0.8.1-configure.patch" "${FILESDIR}/zlib.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-0.8.1-configure.patch" + "${FILESDIR}/zlib.patch" +) DOCS=( share/doc/CODING_STYLE @@ -72,6 +76,7 @@ DOCS=( Changelog README.md ) + HTML_DOCS="share/doc/*.html" my_use() { @@ -94,7 +99,7 @@ src_configure() { local myeconfargs=( --extra-cflags="${CFLAGS}" --cc="$(tc-getCC)" - --libdir="/$(get_libdir)" + --libdir="$(get_libdir)" --verbose --enable-pic --enable-svg @@ -133,6 +138,6 @@ src_configure() { src_install() { einstalldocs - emake STRIP="true" DESTDIR="${D}" install - emake STRIP="true" DESTDIR="${D}" install-lib + emake STRIP="true" DESTDIR="${ED}" install + emake STRIP="true" DESTDIR="${ED}" install-lib }