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 5746C139578 for ; Wed, 7 Dec 2016 19:59:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 86C11E0E82; Wed, 7 Dec 2016 19:59:06 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 56B59E0E80 for ; Wed, 7 Dec 2016 19:59:06 +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 1D66B341616 for ; Wed, 7 Dec 2016 19:59:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 849534A6 for ; Wed, 7 Dec 2016 19:59:03 +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: <1481140731.4483a7e702cf80e91abb7b2aba3814f160d43c58.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: 4483a7e702cf80e91abb7b2aba3814f160d43c58 X-VCS-Branch: master Date: Wed, 7 Dec 2016 19:59:03 +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: 3e0f5fb2-9f8a-4c9c-8470-5c765c063570 X-Archives-Hash: 68c2302b9092ff3d01db546859b95561 commit: 4483a7e702cf80e91abb7b2aba3814f160d43c58 Author: David Seifert gentoo org> AuthorDate: Wed Dec 7 19:35:12 2016 +0000 Commit: David Seifert gentoo org> CommitDate: Wed Dec 7 19:58:51 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4483a7e7 media-libs/jasper: Update live ebuild Package-Manager: portage-2.3.3 media-libs/jasper/jasper-9999.ebuild | 46 ++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/media-libs/jasper/jasper-9999.ebuild b/media-libs/jasper/jasper-9999.ebuild index 7c007cd..3ce95c9 100644 --- a/media-libs/jasper/jasper-9999.ebuild +++ b/media-libs/jasper/jasper-9999.ebuild @@ -4,7 +4,7 @@ EAPI=6 -inherit autotools multilib-minimal +inherit cmake-multilib DESCRIPTION="Implementation of the codec specified in the JPEG-2000 Part-1 standard" HOMEPAGE="http://www.ece.uvic.ca/~mdadams/jasper/" @@ -24,36 +24,36 @@ fi : ${JASPER_MEM_LIMIT:=134217728} LICENSE="JasPer2.0" -SLOT="0/1" -IUSE="jpeg opengl static-libs" +SLOT="0" +IUSE="doc jpeg opengl" RDEPEND=" jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] ) opengl? ( >=virtual/opengl-7.0-r1:0[${MULTILIB_USEDEP}] >=media-libs/freeglut-2.8.1:0[${MULTILIB_USEDEP}] - virtual/glu + virtual/glu[${MULTILIB_USEDEP}] + x11-libs/libXi[${MULTILIB_USEDEP}] + x11-libs/libXmu[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} - app-arch/unzip" - -src_prepare() { - default - eautoreconf -} + doc? ( app-doc/doxygen )" multilib_src_configure() { - ECONF_SOURCE="${S}" econf \ - $(use_enable jpeg libjpeg) \ - $(use_enable opengl) \ - $(use_enable static-libs static) \ - --enable-memory-limit="${JASPER_MEM_LIMIT}" -} - -multilib_src_install_all() { - einstalldocs - dodoc -r doc/. - - # package provides .pc files - find "${D}" -name '*.la' -delete || die + local mycmakeargs=( + -DJAS_ENABLE_AUTOMATIC_DEPENDENCIES=OFF + -DALLOW_IN_SOURCE_BUILD=OFF + -DBASH_PROGRAM="${EPREFIX}"/bin/bash + -DJAS_ENABLE_ASAN=OFF + -DJAS_ENABLE_LIBJPEG=$(usex jpeg) + -DJAS_ENABLE_LSAN=OFF + -DJAS_ENABLE_MSAN=OFF + -DJAS_ENABLE_OPENGL=$(usex opengl) + -DJAS_ENABLE_SHARED=ON + -DJAS_ENABLE_STRICT=ON + -DJAS_ENABLE_USAN=OFF + -DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF} + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(multilib_native_usex doc OFF ON) + ) + cmake-utils_src_configure }