summaryrefslogtreecommitdiff
path: root/media-gfx/graphicsmagick
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-01-01 21:06:00 +0000
committerV3n3RiX <venerix@redcorelinux.org>2021-01-01 21:06:00 +0000
commit129160ec854dca4c3fedb5bcfbcb56930371da0f (patch)
tree53bf797418ac5e9b99c41ca0382c87b82421e5de /media-gfx/graphicsmagick
parent441d1370330332b7d78f238d2f5e13f7aed5e4e0 (diff)
gentoo new year resync : 01.01.2021
Diffstat (limited to 'media-gfx/graphicsmagick')
-rw-r--r--media-gfx/graphicsmagick/Manifest5
-rw-r--r--media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-flags.patch59
-rw-r--r--media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild131
-rw-r--r--media-gfx/graphicsmagick/graphicsmagick-9999.ebuild13
4 files changed, 200 insertions, 8 deletions
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 8d2494c9efc6..f21555bad55b 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -3,7 +3,10 @@ AUX graphicsmagick-1.3.19-perl.patch 491 BLAKE2B 6a6465162d9a4d7d09b1edb425cc711
AUX graphicsmagick-1.3.35-CVE-2020-12672.patch 2753 BLAKE2B 864a77b650f5cec350d83bc5eec289736171a141e8609c41d4c66f49a58b2d332cb2ab343f557879a547e6a291665d16c5707ab7573bf48263a838ba24940475 SHA512 57387a3f1e2e07fdf4617b0fc73106b4f00fe1a7dc0d88919b39490213d42180a4617653b48e54749f7d2807dca4d1b052f14389c30b7a059f841c012ca2b1a6
AUX graphicsmagick-1.3.35-oss-fuzz-20045-20318-21956.patch 988 BLAKE2B 4906fffe43150ef209c4d2f87d433cf78cd5e3c03a9db22426e3c3455028a5ff63c189ace1f46f47e1fa04fe8d78388b76dcabc288a9a75e57b7ebbb68f8c90d SHA512 95776534891eed617b09873fd70af020c6d6370a6765ba7aaf8185268e8b73b774ce2aeb1b284641fb12260ca0047c4543b17a18ed4ef28db725b75f988c7215
AUX graphicsmagick-1.3.35-oss-fuzz-23042.patch 1350 BLAKE2B 415bd540a7aa194235ce1e6482035dd9b8ee4d4f5192f4d898e178875d453fd8b481efcbe139db602d411f788e3067a95106ba128ab14af63d3848f92c035405 SHA512 d345b54570e3396db81f0f60980633e139f90a54b579ad953a36aa5e16c1edfe7a5186b4e2d5a2e02f759544b372981278b06d2b688324e6b091c841a5bae133
+AUX graphicsmagick-1.3.36-flags.patch 2009 BLAKE2B 1d58f03cfeac9be92e2e85a2b6274ec22e3cb2c65d62e3095f2bb3da8f817ae52fdd6fe70e5da30bb8110202ec8c8268ffef7069c34d55ef7f7ccc3e53785418 SHA512 205694ea04e7b65c5519c564bbfa1ebd33ef4fa7800aec1a91439ed90794629dd54ab42c1c7f4f2f5ce3b7b078b3fffe76ce37c61643087f5cca244931b5bd3a
DIST GraphicsMagick-1.3.35.tar.xz 5543224 BLAKE2B 8a284d85341c10939fdece5c565d5b881276afb9b4c5dfb2221b780a01b99f78ee62761722c372baf9155c63f7ef176b67310aeedcab0368f4f26f5b0150bcce SHA512 baae92089d52147ef961f93495abc8a9d8b1a963af61d87a650c1ab105d46816aa38c83f654edcb5a0e1b7f07ccc06eaeaa443b9bde3a63a0b9bfb45f3ae144c
+DIST GraphicsMagick-1.3.36.tar.xz 5600712 BLAKE2B 069ab4f9bb5beea3321860bf8e43c8a1b51ab102054e92486375209a86fd3c1c1fb44d4b2c43a65c78f36e9f37e09316fe77b4f261bfb0af3b2c2a86ff8b5aa5 SHA512 27ed5fcbfb0303436bdcb0f11d18257a967d471251b51e633e2c655b0a7e5ed01f61a61f9702cc7d4c02714e005ac18ca9ba0f690c0580e41d07947a03c5cbb4
EBUILD graphicsmagick-1.3.35-r1.ebuild 3244 BLAKE2B 20a05ba460b52292328b8152c8b8991653bc5478dde0768085df9b1ed53e16aa74d485a6b49054d97fc4c30eadc7d8be959519711023c495208537d3387bf099 SHA512 a9f44ee9b36fc6859c30a46f6d61338ce5d4d5819508cb2c59e042fab00fbbcccab25219e292413536376e1a7fed734268c50cd1afa1ef68b0ef285a2543cf85
-EBUILD graphicsmagick-9999.ebuild 3103 BLAKE2B 89b885a1437aa55f10d47fe2485125fd3ec625b07afd0b9c1bc1ff59a927a035abfba5fc49f51e5259d5b12c261af0d3a79db8bcd4da6abc85afe62019d29821 SHA512 bffe1fa515705df9286a0c3aaf434e6e5950de445864da5ad9ece8ed4178d080c985b5f0ccdc08216f9c337ed71750c36452f2b64f4c22b9855fff6a33858e01
+EBUILD graphicsmagick-1.3.36.ebuild 3126 BLAKE2B 4ae429e70dcb36ac4aa03bc6dd0dc21f5540751faeb531e962cad24402e0ff1aa078193e3f9c2cd34d09858215041d4b03f61245636b43c1909e79eefbf43a84 SHA512 6a53a3861721ae9d305dee052da5637fc570c1ffe9c1f7588701a0f9c612740f1e75b3c6d931414f08ca2332b5b2ab8dd13c93e8570f41bc32490a23b9f861d0
+EBUILD graphicsmagick-9999.ebuild 3126 BLAKE2B 4ae429e70dcb36ac4aa03bc6dd0dc21f5540751faeb531e962cad24402e0ff1aa078193e3f9c2cd34d09858215041d4b03f61245636b43c1909e79eefbf43a84 SHA512 6a53a3861721ae9d305dee052da5637fc570c1ffe9c1f7588701a0f9c612740f1e75b3c6d931414f08ca2332b5b2ab8dd13c93e8570f41bc32490a23b9f861d0
MISC metadata.xml 1071 BLAKE2B 899c521ae7916dc5702bada0b782b3020084f84397f0ab62aa4ac15d14d74045ee3dca8b9c9c98591481502694a59e33fcfd8467b7da836a8ee16fb16fbd4727 SHA512 50d6c48e7459d3772d0b804785f5b40cce16bc7a1ac6602a1d5475cd5616e725aa111385eab50a5347418073f1c7afc03f66aa4fd8959474835d899b22c9bca8
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-flags.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-flags.patch
new file mode 100644
index 000000000000..311cd7829258
--- /dev/null
+++ b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-flags.patch
@@ -0,0 +1,59 @@
+diff --git a/Magick++/bin/GraphicsMagick++-config.in b/Magick++/bin/GraphicsMagick++-config.in
+index 9733be2..4c49362 100755
+--- a/Magick++/bin/GraphicsMagick++-config.in
++++ b/Magick++/bin/GraphicsMagick++-config.in
+@@ -33,7 +33,7 @@ while test $# -gt 0; do
+ echo '@MAGICK_API_CPPFLAGS@'
+ ;;
+ --cxxflags)
+- echo '@CXXFLAGS@'
++ echo '@MAGICK_API_CXXFLAGS@'
+ ;;
+ --ldflags)
+ echo '@MAGICK_API_LDFLAGS@'
+diff --git a/configure.ac b/configure.ac
+index d6a30f6..2f5ff6c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -335,6 +335,7 @@ fi
+
+ AC_OPENMP([C])
+ CFLAGS="$OPENMP_CFLAGS $CFLAGS"
++MAGICK_API_CFLAGS="$MAGICK_API_CFLAGS $OPENMP_CFLAGS"
+ #CXXFLAGS="$OPENMP_CXXFLAGS $CXXFLAGS"
+ #LDFLAGS="$LDFLAGS $OPENMP_CFLAGS"
+ AC_SUBST([OPENMP_CFLAGS])
+@@ -3689,9 +3690,10 @@ MAGICK_DEP_LIBS=`echo $MAGICK_DEP_LIBS | sed -e 's/ */ /g'`
+ MAGICK_EXTRA_DEP_LIBS=`echo $MAGICK_EXTRA_DEP_LIBS | sed -e 's/ */ /g'`
+ #LIBS=`echo $LIBS | sed -e 's/ */ /g'`
+
+-MAGICK_API_CFLAGS=$CFLAGS
++MAGICK_API_CFLAGS=`echo $MAGICK_API_CFLAGS | sed -e 's/ */ /g'`
+ MAGICK_API_CPPFLAGS=`echo $MAGICK_API_CPPFLAGS | sed -e 's/ */ /g'`
+-MAGICK_API_LDFLAGS="-L$LIB_DIR $LDFLAGS"
++MAGICK_API_CXXFLAGS=""
++MAGICK_API_LDFLAGS="-L$LIB_DIR"
+ MAGICK_API_DEP_LIBS="$MAGICK_DEP_LIBS"
+ MAGICK_API_LIBS="-lGraphicsMagick $MAGICK_API_DEP_LIBS $MAGICK_EXTRA_DEP_LIBS"
+
+@@ -3721,6 +3723,7 @@ AC_SUBST([X_CFLAGS])
+
+ AC_SUBST([MAGICK_API_CFLAGS])
+ AC_SUBST([MAGICK_API_CPPFLAGS])
++AC_SUBST(MAGICK_API_CXXFLAGS)
+ AC_SUBST([MAGICK_API_PC_CPPFLAGS])
+ AC_SUBST([MAGICK_API_LDFLAGS])
+ AC_SUBST([MAGICK_API_LIBS])
+diff --git a/magick/GraphicsMagick-config.in b/magick/GraphicsMagick-config.in
+index 8b2f016..3f66ae3 100644
+--- a/magick/GraphicsMagick-config.in
++++ b/magick/GraphicsMagick-config.in
+@@ -30,7 +30,7 @@ while test $# -gt 0; do
+ echo @PACKAGE_VERSION@
+ ;;
+ --cflags)
+- echo '@CFLAGS@'
++ echo '@MAGICK_API_CFLAGS@'
+ ;;
+ --cppflags)
+ echo '@MAGICK_API_CPPFLAGS@'
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild
new file mode 100644
index 000000000000..9881f65ad846
--- /dev/null
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+MY_P=${P/graphicsm/GraphicsM}
+DESCRIPTION="Collection of tools and libraries for many image formats"
+HOMEPAGE="http://www.graphicsmagick.org/"
+LICENSE="MIT"
+SLOT="0/${PV%.*}"
+
+if [[ ${PV} == "9999" ]] ; then
+ inherit mercurial
+ EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
+else
+ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
+ S="${WORKDIR}/${MY_P}"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+fi
+
+IUSE="bzip2 +cxx debug dynamic-loading fpx imagemagick jbig jpeg lcms lzma
+ openmp perl png postscript q16 q32 static-libs svg threads tiff truetype
+ webp wmf X zlib"
+
+RDEPEND="dev-libs/libltdl:0
+ bzip2? ( app-arch/bzip2 )
+ fpx? ( media-libs/libfpx )
+ imagemagick? ( !media-gfx/imagemagick )
+ jbig? ( media-libs/jbigkit )
+ jpeg? ( virtual/jpeg:0 )
+ lcms? ( media-libs/lcms:2 )
+ lzma? ( app-arch/xz-utils )
+ perl? ( dev-lang/perl:= )
+ png? ( media-libs/libpng:0= )
+ postscript? ( app-text/ghostscript-gpl )
+ svg? ( dev-libs/libxml2 )
+ tiff? ( media-libs/tiff:0 )
+ truetype? (
+ media-fonts/urw-fonts
+ >=media-libs/freetype-2
+ )
+ webp? ( media-libs/libwebp:= )
+ wmf? ( media-libs/libwmf )
+ X? (
+ x11-libs/libSM
+ x11-libs/libXext
+ )
+ zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.3.36-flags.patch
+ "${FILESDIR}"/${PN}-1.3.19-perl.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+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)
+ $(use_enable debug prof)
+ $(use_enable debug gcov)
+ $(use_enable imagemagick magick-compat)
+ $(use_with threads)
+ $(use_with dynamic-loading modules)
+ --with-quantum-depth=${depth}
+ --without-frozenpaths
+ $(use_with cxx magick-plus-plus)
+ $(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)
+ --without-jp2
+ $(use_with lcms lcms2)
+ $(use_with lzma)
+ $(use_with png)
+ $(use_with tiff)
+ $(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 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 5cde9ca89391..9881f65ad846 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
@@ -2,10 +2,10 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
inherit autotools toolchain-funcs
MY_P=${P/graphicsm/GraphicsM}
-
DESCRIPTION="Collection of tools and libraries for many image formats"
HOMEPAGE="http://www.graphicsmagick.org/"
LICENSE="MIT"
@@ -16,7 +16,8 @@ if [[ ${PV} == "9999" ]] ; then
EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
else
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+ S="${WORKDIR}/${MY_P}"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
fi
IUSE="bzip2 +cxx debug dynamic-loading fpx imagemagick jbig jpeg lcms lzma
@@ -39,20 +40,18 @@ RDEPEND="dev-libs/libltdl:0
truetype? (
media-fonts/urw-fonts
>=media-libs/freetype-2
- )
+ )
webp? ( media-libs/libwebp:= )
wmf? ( media-libs/libwmf )
X? (
x11-libs/libSM
x11-libs/libXext
- )
+ )
zlib? ( sys-libs/zlib )"
DEPEND="${RDEPEND}"
-S=${WORKDIR}/${MY_P}
-
PATCHES=(
- "${FILESDIR}"/${PN}-1.3.19-flags.patch
+ "${FILESDIR}"/${PN}-1.3.36-flags.patch
"${FILESDIR}"/${PN}-1.3.19-perl.patch
)