commit: a87c2bdae3bd45c690d36955d515c545abd9aa94
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 20:40:05 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 21:21:36 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a87c2bda
media-gfx/graphicsmagick: add 1.3.38
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/graphicsmagick/Manifest | 2 +
...ck-9999.ebuild => graphicsmagick-1.3.38.ebuild} | 49 +++++++++++++++-------
.../graphicsmagick/graphicsmagick-9999.ebuild | 10 +++--
media-gfx/graphicsmagick/metadata.xml | 2 +
profiles/arch/alpha/package.use.mask | 5 +++
profiles/arch/hppa/package.use.mask | 5 +++
profiles/arch/ia64/package.use.mask | 2 +
profiles/arch/powerpc/ppc32/package.use.mask | 1 +
profiles/arch/sparc/package.use.mask | 1 +
9 files changed, 59 insertions(+), 18 deletions(-)
diff --git a/media-gfx/graphicsmagick/Manifest
b/media-gfx/graphicsmagick/Manifest
index 4a582fed0167..a1d6982715fd 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -1 +1,3 @@
DIST GraphicsMagick-1.3.37.tar.xz 5623688 BLAKE2B
d6d5c8a07ec2aa2e60399887fa788751104c6917af295bb5a7bb1281d4a547462dd76cdde98f09cc00322bc3d7c89258dcd9d50506cfcec47a606efd90163b2a
SHA512
971e05480a65eb99ff3c0d874675bcbffc24eafec1cacd03f5ef410ae014f82329f3590393100927f753feb183be1105fe0cfc5b0f775a30b0e6dc0c6b8a77af
+DIST GraphicsMagick-1.3.38.tar.xz 5958352 BLAKE2B
132c8b2303690dbe84b0e9ab33db0c0861845ef0260915e33197912dbcae02ae70c27bce634cfe0ab6b739ef6f3e828cbea9043fc90be993fb2c4a5e33e20ee9
SHA512
478f9e2907d4cb1099b0cbd1a73e4ab58aef94edf6cb1636ce48a378084ec1671599fd4f369455e5af898e94d1386f7149f6933b7c668027a6f6952bc763ec3a
+DIST GraphicsMagick-1.3.38.tar.xz.sig 119 BLAKE2B
166b7bb6de30af22d1f2317812f76dee43dd69c5557613deea35de3767624466c07001fe029ec9d33d0c61ed2fe5ca3f48bf435853374c722963a1293bfaa7a1
SHA512
c6dfee7e4b63b646460f9045ca5c8f3105d1a761ec3cd3471b53293178ed9a963884539c8026d934ce1915654d517a9b30232d7260a13f6d7dbeb5a592485b09
diff --git a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
b/media-gfx/graphicsmagick/graphicsmagick-1.3.38.ebuild
similarity index 74%
copy from media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
copy to media-gfx/graphicsmagick/graphicsmagick-1.3.38.ebuild
index 903411326261..42ffd6c74653 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.38.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit autotools toolchain-funcs
@@ -9,36 +9,43 @@ 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
)"
S="${WORKDIR}/${MY_P}"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+ KEYWORDS="~alpha ~amd64 ~hppa ~m68k ~x86 ~amd64-linux ~x86-linux
~ppc-macos ~x64-macos"
+
+ BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bobfriesenhahn )"
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
@@ -57,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
@@ -65,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)
@@ -86,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)
@@ -109,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[@]}"
}
@@ -129,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
diff --git a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
index 903411326261..06f0f8f71c40 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit autotools toolchain-funcs
@@ -13,10 +13,14 @@ if [[ ${PV} == "9999" ]] ; then
inherit mercurial
EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code";
else
+ inherit verify-sig
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
+ SRC_URI+=" verify-sig? ( mirror://sourceforge/${PN}/${MY_P}.tar.xz.sig
)"
S="${WORKDIR}/${MY_P}"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64
~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+ BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bobfriesenhahn )"
fi
LICENSE="MIT"
diff --git a/media-gfx/graphicsmagick/metadata.xml
b/media-gfx/graphicsmagick/metadata.xml
index 42c327ea7848..270526b3183b 100644
--- a/media-gfx/graphicsmagick/metadata.xml
+++ b/media-gfx/graphicsmagick/metadata.xml
@@ -22,6 +22,8 @@
<flag name="fpx">Enable FlashPix support with
<pkg>media-libs/libfpx</pkg></flag>
<flag name="dynamic-loading">Compile graphicsmagick with dynamically
loadable modules</flag>
+ <flag name="heif">Add HEIF/HEIC image support</flag>
+ <flag name="jpegxl">Enable support for JPEG XL image format</flag>
<flag name="q16">Set storage quantum size to 16 (~2*memory)</flag>
<flag name="q32">Set storage quantum size to 32 (~5*memory)</flag>
</use>
diff --git a/profiles/arch/alpha/package.use.mask
b/profiles/arch/alpha/package.use.mask
index 2e5f02e30f5d..66e36c0276d8 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,6 +1,10 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Sam James <[email protected]> (2022-03-26)
+# media-libs/libjxl not keyworded here
+media-gfx/graphicsmagick jpegxl
+
# Adel Kara Slimane <[email protected]> (2022-03-14)
# Untested useflag on other arches, needs keywording
media-video/ffmpeg vmaf
@@ -72,6 +76,7 @@ media-libs/rubberband jni
# media-libs/libheif isn't keyworded here
# media-libs/libavif isn't keyworded here
media-libs/gd avif heif
+media-gfx/graphicsmagick heif
# Sam James <[email protected]> (2021-02-26)
# dev-libs/efl not keyworded here
diff --git a/profiles/arch/hppa/package.use.mask
b/profiles/arch/hppa/package.use.mask
index 46e1880d9eeb..040f1b4b8fe3 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -4,6 +4,10 @@
# NOTE: When masking a USE flag due to missing keywords, please file a keyword
# request bug for the hppa arch.
+# Sam James <[email protected]> (2022-03-26)
+# media-libs/libjxl not keyworded here
+media-gfx/graphicsmagick jpegxl
+
# Sam James <[email protected]> (2022-03-22)
# media-libs/dav1d not keyworded here
media-libs/xine-lib dav1d
@@ -95,6 +99,7 @@ media-libs/rubberband jni
# media-libs/libheif isn't keyworded here
# media-libs/libavif isn't keyworded here
media-libs/gd avif heif
+media-gfx/graphicsmagick heif
# Georgy Yakovlev <[email protected]> (2021-01-19)
# uchardet not stable/keyworded yet on this arch
diff --git a/profiles/arch/ia64/package.use.mask
b/profiles/arch/ia64/package.use.mask
index 3357f48e719b..5a2852e34989 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -47,6 +47,7 @@ media-libs/libsdl2 pipewire
# Sam James <[email protected]> (2021-10-17)
# media-libs/libheif not keyworded here
sci-libs/gdal heif
+media-gfx/graphicsmagick heif
# Sam James <[email protected]> (2021-09-14)
# JACK2 isn't keyworded here
@@ -85,6 +86,7 @@ media-libs/rubberband jni
# media-libs/libheif isn't keyworded here
# media-libs/libavif isn't keyworded here
media-libs/gd avif heif
+media-gfx/graphicsmagick heif
# Akinori Hattori <[email protected]> (2021-03-03)
# dev-lang/ruby is not keyworded
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask
b/profiles/arch/powerpc/ppc32/package.use.mask
index 0a39a66b91e8..3c91f44e912b 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -53,6 +53,7 @@ app-i18n/uim kde
# Sam James <[email protected]> (2021-10-17)
# media-libs/libheif not keyworded here
sci-libs/gdal heif
+media-gfx/graphicsmagick heif
# Matt Turner <[email protected]> (2021-07-25)
# gdm requires gnome-shell requires rustified librsvg.
diff --git a/profiles/arch/sparc/package.use.mask
b/profiles/arch/sparc/package.use.mask
index 019950a35230..fd0f0bec16dc 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -79,6 +79,7 @@ media-libs/rubberband jni
# media-libs/libavif isn't keyworded here
media-libs/gd avif heif
net-libs/webkit-gtk avif
+media-gfx/graphicsmagick heif
# Sam James <[email protected]> (2021-02-26)
# dev-libs/efl not keyworded here
