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 CC6DC1392E6 for ; Wed, 26 Oct 2016 20:16:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1228B21C07C; Wed, 26 Oct 2016 20:16:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EEE8721C07C for ; Wed, 26 Oct 2016 20:16:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 161073412F9 for ; Wed, 26 Oct 2016 20:16:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D627D24A4 for ; Wed, 26 Oct 2016 20:16:33 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1477512987.ed1f940dedfc29c889b889d2638e619e1b8abc69.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/jasper/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/jasper/jasper-9999.ebuild X-VCS-Directories: media-libs/jasper/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: ed1f940dedfc29c889b889d2638e619e1b8abc69 X-VCS-Branch: master Date: Wed, 26 Oct 2016 20:16:33 +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-Archives-Salt: a997819b-7051-497a-a02d-b29900e6627d X-Archives-Hash: ba192c996fec0ba4214389e4af40fc7c commit: ed1f940dedfc29c889b889d2638e619e1b8abc69 Author: David Seifert gentoo org> AuthorDate: Wed Oct 26 20:05:39 2016 +0000 Commit: David Seifert gentoo org> CommitDate: Wed Oct 26 20:16:27 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed1f940d media-libs/jasper: Update live ebuild * Add option to limit maximum memory by default Package-Manager: portage-2.3.2 media-libs/jasper/jasper-9999.ebuild | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/media-libs/jasper/jasper-9999.ebuild b/media-libs/jasper/jasper-9999.ebuild index 10f690f..7c007cd 100644 --- a/media-libs/jasper/jasper-9999.ebuild +++ b/media-libs/jasper/jasper-9999.ebuild @@ -4,15 +4,27 @@ EAPI=6 -inherit autotools git-r3 multilib-minimal +inherit autotools multilib-minimal DESCRIPTION="Implementation of the codec specified in the JPEG-2000 Part-1 standard" HOMEPAGE="http://www.ece.uvic.ca/~mdadams/jasper/" -EGIT_REPO_URI="https://github.com/mdadams/jasper.git" + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/mdadams/jasper.git" +else + inherit vcs-snapshot + SRC_URI="https://github.com/mdadams/${PN}/archive/version-${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 \ + ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux \ + ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +fi + +# We limit memory usage to 128 MiB by default, specified in bytes +: ${JASPER_MEM_LIMIT:=134217728} LICENSE="JasPer2.0" SLOT="0/1" -KEYWORDS="" IUSE="jpeg opengl static-libs" RDEPEND=" @@ -21,7 +33,7 @@ RDEPEND=" >=virtual/opengl-7.0-r1:0[${MULTILIB_USEDEP}] >=media-libs/freeglut-2.8.1:0[${MULTILIB_USEDEP}] virtual/glu - )" + )" DEPEND="${RDEPEND} app-arch/unzip" @@ -34,7 +46,8 @@ multilib_src_configure() { ECONF_SOURCE="${S}" econf \ $(use_enable jpeg libjpeg) \ $(use_enable opengl) \ - $(use_enable static-libs static) + $(use_enable static-libs static) \ + --enable-memory-limit="${JASPER_MEM_LIMIT}" } multilib_src_install_all() {