From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1380033-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 9402115808C
for <garchives@archives.gentoo.org>; Sun, 27 Mar 2022 00:24:25 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id D9B95E0869;
Sun, 27 Mar 2022 00:24:24 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id BB25EE0869
for <gentoo-commits@lists.gentoo.org>; Sun, 27 Mar 2022 00:24:24 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id CE9313433B0
for <gentoo-commits@lists.gentoo.org>; Sun, 27 Mar 2022 00:24:23 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 51568335
for <gentoo-commits@lists.gentoo.org>; Sun, 27 Mar 2022 00:24:22 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
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" <sam@gentoo.org>
Message-ID: <1648340649.809d96b4c6ed7975726e1ce1b94e8ac1147a0473.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/graphicsmagick/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
X-VCS-Directories: media-gfx/graphicsmagick/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 809d96b4c6ed7975726e1ce1b94e8ac1147a0473
X-VCS-Branch: master
Date: Sun, 27 Mar 2022 00:24:22 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 7e985f0e-e3d8-45d1-82cf-39cca962e928
X-Archives-Hash: dda83734eed2f32c65143da47fea4b93
commit: 809d96b4c6ed7975726e1ce1b94e8ac1147a0473
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 27 00:19:57 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 00:24:09 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=809d96b4
media-gfx/graphicsmagick: sync live ebuild
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../graphicsmagick/graphicsmagick-9999.ebuild | 39 +++++++++++++++-------
1 file changed, 27 insertions(+), 12 deletions(-)
diff --git a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
index 06f0f8f71c40..c640b1b4cc74 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
@@ -9,10 +9,11 @@ MY_P=${P/graphicsm/GraphicsM}
DESCRIPTION="Collection of tools and libraries for many image formats"
HOMEPAGE="http://www.graphicsmagick.org/ http://hg.code.sf.net/p/graphicsmagick/code/"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == 9999 ]] ; then
inherit mercurial
EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
else
+ VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bobfriesenhahn.asc
inherit verify-sig
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
SRC_URI+=" verify-sig? ( mirror://sourceforge/${PN}/${MY_P}.tar.xz.sig )"
@@ -26,23 +27,25 @@ fi
LICENSE="MIT"
SLOT="0/${PV%.*}"
-IUSE="bzip2 +cxx debug dynamic-loading fpx imagemagick jbig jpeg lcms lzma"
+IUSE="bzip2 +cxx debug dynamic-loading fpx heif imagemagick jbig jpeg jpegxl lcms lzma"
IUSE+=" openmp perl png postscript q16 q32 static-libs svg threads tiff truetype"
IUSE+=" webp wmf X zlib"
-RDEPEND="dev-libs/libltdl:0
+RDEPEND="dev-libs/libltdl
bzip2? ( app-arch/bzip2 )
fpx? ( media-libs/libfpx )
+ heif? ( media-libs/libheif:= )
imagemagick? ( !media-gfx/imagemagick )
jbig? ( media-libs/jbigkit )
- jpeg? ( virtual/jpeg:0 )
+ jpeg? ( virtual/jpeg )
+ jpegxl? ( media-libs/libjxl:= )
lcms? ( media-libs/lcms:2 )
lzma? ( app-arch/xz-utils )
perl? ( dev-lang/perl:= )
- png? ( media-libs/libpng:0= )
+ png? ( media-libs/libpng:= )
postscript? ( app-text/ghostscript-gpl )
svg? ( dev-libs/libxml2 )
- tiff? ( media-libs/tiff:0 )
+ tiff? ( media-libs/tiff )
truetype? (
media-fonts/urw-fonts
>=media-libs/freetype-2
@@ -61,6 +64,14 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.3.19-perl.patch
)
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
src_prepare() {
default
@@ -69,16 +80,11 @@ src_prepare() {
src_configure() {
local depth=8
+
use q16 && depth=16
use q32 && depth=32
- local openmp=disable
- if use openmp && tc-has-openmp ; then
- openmp=enable
- fi
-
local myeconfargs=(
- --${openmp}-openmp
--enable-largefile
--enable-shared
$(use_enable static-libs static)
@@ -90,6 +96,8 @@ src_configure() {
--with-quantum-depth=${depth}
--without-frozenpaths
$(use_with cxx magick-plus-plus)
+ $(use_with heif)
+ $(use_with jpegxl jxl)
$(use_with perl)
--with-perl-options=INSTALLDIRS=vendor
$(use_with bzip2 bzlib)
@@ -113,6 +121,12 @@ src_configure() {
$(use_with X x)
)
+ if use openmp && tc-has-openmp ; then
+ myeconfargs+=( --enable-openmp )
+ else
+ myeconfargs+=( --disable-openmp )
+ fi
+
econf "${myeconfargs[@]}"
}
@@ -133,6 +147,7 @@ src_install() {
if use perl ; then
emake -C PerlMagick DESTDIR="${D}" install
+
find "${ED}" -type f -name perllocal.pod -exec rm -f {} + || die
find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + || die
fi