From 27b0740bf48a0a181090a49d20f368ac8474e90b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 30 Jul 2022 15:10:23 +0100 Subject: gentoo auto-resync : 30:07:2022 - 15:10:23 --- media-gfx/Manifest.gz | Bin 38318 -> 38315 bytes media-gfx/graphicsmagick/Manifest | 4 +- .../graphicsmagick-1.3.38-configure-bashism.patch | 34 +++++ .../graphicsmagick/graphicsmagick-1.3.38-r2.ebuild | 161 +++++++++++++++++++++ .../graphicsmagick/graphicsmagick-9999.ebuild | 19 ++- 5 files changed, 212 insertions(+), 6 deletions(-) create mode 100644 media-gfx/graphicsmagick/files/graphicsmagick-1.3.38-configure-bashism.patch create mode 100644 media-gfx/graphicsmagick/graphicsmagick-1.3.38-r2.ebuild (limited to 'media-gfx') diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz index 2ca518660bc1..4de19519c1d6 100644 Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest index 9c8bc3bda562..dcb6311bda50 100644 --- a/media-gfx/graphicsmagick/Manifest +++ b/media-gfx/graphicsmagick/Manifest @@ -1,9 +1,11 @@ AUX graphicsmagick-1.3.19-perl.patch 491 BLAKE2B 6a6465162d9a4d7d09b1edb425cc7114cd4e0fc65e48f15c8c2a854fe835fd1fe94c56611c6d2744d9e26884c57b1f67353bfd32abe2f25a145dd7abbf5479f0 SHA512 da114b891ec923253048d90ee14f136742072bcb70e512e8d2838bbcac57b5fe6ea580cdccfd1bba5156777623c43e946ce2a8661f88612d4c24849bef0fb865 AUX graphicsmagick-1.3.36-flags.patch 2009 BLAKE2B 1d58f03cfeac9be92e2e85a2b6274ec22e3cb2c65d62e3095f2bb3da8f817ae52fdd6fe70e5da30bb8110202ec8c8268ffef7069c34d55ef7f7ccc3e53785418 SHA512 205694ea04e7b65c5519c564bbfa1ebd33ef4fa7800aec1a91439ed90794629dd54ab42c1c7f4f2f5ce3b7b078b3fffe76ce37c61643087f5cca244931b5bd3a +AUX graphicsmagick-1.3.38-configure-bashism.patch 1203 BLAKE2B 0aa4a6cccd1f7e392446db33446b706df0e5a82b77abba3901ea7e8190ed592a4ce17b0544f08b59900cd48b3e57e029862ef94120ceca75536959fba15b9f7f SHA512 e45bc482381e4c58cd854d9d28b8a3a7bf83bc707f5d3a6290f28b1b333c84778c5e185f0a637348a2fbaac56790d6b9ddee1f2ee660ba67912300039d872330 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 EBUILD graphicsmagick-1.3.37.ebuild 3284 BLAKE2B a961ae6eeac3513f8b9055e1c896858d8ff2bdd001c98c400c71d39bd93301e38cad2d0df90f90523720dcd7272f3a4b78eba76c29aa182bc97e31ef6f6362ee SHA512 5ea8bb429f5a918aa6e1e7d83357b225014ba04573202cd23026f5dc09681e9cb7684248a706b1133c0cbf2d061ec2b5e3e4c6b902685f62590cdc13cfe2c3ee +EBUILD graphicsmagick-1.3.38-r2.ebuild 3907 BLAKE2B c7b3391ca4bb71d891de01108ad5431f95599475711cf72583347e3507d30c57ecc7264617f5a9d8d26553d385cc6410777a51f4f73f1ec04a4290e46f41b601 SHA512 25847bc68b3bfc6f7cc5454f1f362cb62ebe6b0b1872a34291f80de68c2210760a78f6cdb8152cc5050a0ee9ad97b9080958eef173840cc629a2fcc0ef4ac41c EBUILD graphicsmagick-1.3.38.ebuild 3639 BLAKE2B 37d8033cf07602e6ae965fdef03971a54508a103ba8e7144f450689e935abd5e3855a1a60d64cc9e9003a47df4f66a76f260f183a3c05ea4e26b6bffeaf3a9d7 SHA512 1d8fc182978b53d90748c3949e95e89f505146d7eb9fa5b5fe69134b57ab932f125c950b20e7947fe3007c7d4185d83f8e0f8f151d9cf728ccbec3331c221443 -EBUILD graphicsmagick-9999.ebuild 3646 BLAKE2B b5be39db9d65ec3e352ef6460b02956cc39f4ee5f6dba26cce943cf8a111fe8a12acc3050613ccaeacb19d4f41bb9414f03d0f3144fbcd11555895720976a2db SHA512 6af712e90a7227a8c6aff690a2d0d5fb36a68c1ba6c27b5730cf15c238a736cfd0fbdf83173a7564854e3a8d65292ada670c1a7653c3b4cfe451b0dc0b33b291 +EBUILD graphicsmagick-9999.ebuild 3863 BLAKE2B de21652d2106509ffd3ba88039f2a8eb71d33a5dab2a8b7a715bed7c9c15fc1c8577a8eb2749c15a39421cd0f7a61635e9c0a601084f00a427300b3756c4a046 SHA512 7ed019f0b6991cd17bd64ac9df5af809b2a0f1381a5fbf965ef3982b17d87974829dce568ac633b1cf9337ee87082b11a0e9c458c9bc1ac7b70734625cdb8693 MISC metadata.xml 1354 BLAKE2B 06f26407c7bbdbea6bb6ed510c3f497960a3ce8bf2ec296d3ff69eea8377774b7f7a1b37cb43eb63f7e7a31c4f74d978bb1ef863db9f87dba8d769aeca5e80c5 SHA512 9caa2359b6b15b397ce6108ebe941fd029e6b3d371c779a7bb3df5e0276b681067502aa10d12f5ab3eb427679818fdaa525dfdfba09c1fccf2511e23156aef7c diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.38-configure-bashism.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.38-configure-bashism.patch new file mode 100644 index 000000000000..69d5fd50a1bf --- /dev/null +++ b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.38-configure-bashism.patch @@ -0,0 +1,34 @@ +# HG changeset patch +# User Sam James +# Date 1659168362 -3600 +# Sat Jul 30 09:06:02 2022 +0100 +# Node ID aa77bc8461ee15501a0298dafd53c97447aa30d0 +# Parent 0a06f497d58839e4100b3be46bbdcd14d8147d75 +configure: fix bashism + +configure scripts need to be runnable with a POSIX-compliant /bin/sh. + +On many (but not all!) systems, /bin/sh is provided by Bash, so errors +like this aren't spotted. Notably Debian defaults to /bin/sh provided +by dash which doesn't tolerate such bashisms as '=='. + +This retains compatibility with bash. + +Fixes configure warnings/errors like: +``` +checking for gs... /usr/sbin/gs +./configure: 31719: test: #: unexpected operator +checking for Windows fonts directory (location of arial.ttf)... /usr/share/fonts/corefonts/ +``` + +--- a/configure.ac ++++ b/configure.ac +@@ -3148,7 +3148,7 @@ have_ralcgm='no' ; if test "$CGMDecodeD + AM_CONDITIONAL([HasPSDelegate],[test "$have_gs" = 'yes']) + + # Tests for programs only used while in maintainer mode +-if test "$MAINT" == '' ; then ++if test "$MAINT" = '' ; then + # Test for optional rst2html.py utility and define automake conditional HasRST2HTML if found. + AC_CHECK_PROGS([RST2HTML],[rst2html.py rst2html]) + diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.38-r2.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.38-r2.ebuild new file mode 100644 index 000000000000..b206d3380cfd --- /dev/null +++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.38-r2.ebuild @@ -0,0 +1,161 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools toolchain-funcs + +MY_P=${P/graphicsm/GraphicsM} +DESCRIPTION="Collection of tools and libraries for many image formats" +HOMEPAGE="http://www.graphicsmagick.org/ https://hg.osdn.net/view/graphicsmagick/GM" + +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 ~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" +SLOT="0/${PV%.*}" + +IUSE="bzip2 +cxx debug dynamic-loading fpx heif imagemagick jbig jpeg jpegxl lcms lzma" +IUSE+=" openmp perl png postscript q16 q32 static-libs svg tcmalloc threads tiff truetype" +IUSE+=" webp wmf X zlib zstd" + +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? ( media-libs/libjpeg-turbo:= ) + jpegxl? ( media-libs/libjxl:= ) + lcms? ( media-libs/lcms:2 ) + lzma? ( app-arch/xz-utils ) + perl? ( dev-lang/perl:= ) + png? ( media-libs/libpng:= ) + postscript? ( app-text/ghostscript-gpl ) + svg? ( dev-libs/libxml2 ) + tcmalloc? ( dev-util/google-perftools:= ) + tiff? ( media-libs/tiff ) + truetype? ( + media-fonts/urw-fonts + >=media-libs/freetype-2 + ) + webp? ( media-libs/libwebp:= ) + wmf? ( media-libs/libwmf ) + X? ( + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXext + ) + zlib? ( sys-libs/zlib ) + zstd? ( app-arch/zstd:= ) +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.3.36-flags.patch + "${FILESDIR}"/${PN}-1.3.19-perl.patch + "${FILESDIR}"/${P}-configure-bashism.patch +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + local depth=8 + + use q16 && depth=16 + use q32 && depth=32 + + local myeconfargs=( + --enable-largefile + --enable-shared + $(use_enable static-libs static) + $(use_enable debug prof) + $(use_enable debug gcov) + $(use_enable imagemagick magick-compat) + $(use_enable openmp) + $(use_with threads) + $(use_with dynamic-loading modules) + --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) + $(use_with postscript dps) + $(use_with fpx) + $(use_with jbig) + $(use_with webp) + $(use_with jpeg) + # Needs last-rited/unpackaged jasper + --without-jp2 + $(use_with lcms lcms2) + $(use_with lzma) + $(use_with png) + $(use_with tcmalloc) + $(use_with tiff) + --without-trio + $(use_with truetype ttf) + $(use_with wmf) + --with-fontpath="${EPREFIX}"/usr/share/fonts + --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts + --with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts + $(use_with svg xml) + $(use_with zlib) + $(use_with zstd) + $(use_with X x) + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + default + + use perl && emake perl-build +} + +src_test() { + unset DISPLAY # some perl tests fail when DISPLAY is set + + default +} + +src_install() { + default + + 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 + + find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + || die +} diff --git a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild index ed7baccc45e1..889ce23dc4ff 100644 --- a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild +++ b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild @@ -28,16 +28,17 @@ LICENSE="MIT" SLOT="0/${PV%.*}" 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" +IUSE+=" openmp perl png postscript q16 q32 static-libs svg tcmalloc threads tiff truetype" +IUSE+=" webp wmf X zlib zstd" -RDEPEND="dev-libs/libltdl +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 ) + jpeg? ( media-libs/libjpeg-turbo:= ) jpegxl? ( media-libs/libjxl:= ) lcms? ( media-libs/lcms:2 ) lzma? ( app-arch/xz-utils ) @@ -45,6 +46,7 @@ RDEPEND="dev-libs/libltdl png? ( media-libs/libpng:= ) postscript? ( app-text/ghostscript-gpl ) svg? ( dev-libs/libxml2 ) + tcmalloc? ( dev-util/google-perftools:= ) tiff? ( media-libs/tiff ) truetype? ( media-fonts/urw-fonts @@ -54,9 +56,12 @@ RDEPEND="dev-libs/libltdl wmf? ( media-libs/libwmf ) X? ( x11-libs/libSM + x11-libs/libX11 x11-libs/libXext ) - zlib? ( sys-libs/zlib )" + zlib? ( sys-libs/zlib ) + zstd? ( app-arch/zstd:= ) +" DEPEND="${RDEPEND}" PATCHES=( @@ -107,11 +112,14 @@ src_configure() { $(use_with jbig) $(use_with webp) $(use_with jpeg) + # Needs last-rited/unpackaged jasper --without-jp2 $(use_with lcms lcms2) $(use_with lzma) $(use_with png) + $(use_with tcmalloc) $(use_with tiff) + --without-trio $(use_with truetype ttf) $(use_with wmf) --with-fontpath="${EPREFIX}"/usr/share/fonts @@ -119,6 +127,7 @@ src_configure() { --with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts $(use_with svg xml) $(use_with zlib) + $(use_with zstd) $(use_with X x) ) -- cgit v1.2.3