Skip to content

Commit

Permalink
media-gfx/imagemagick: Bump to v6.9.9-26 / v7.0.7-14
Browse files Browse the repository at this point in the history
Package-Manager: Portage-2.3.16, Repoman-2.3.6
  • Loading branch information
Whissi committed Dec 7, 2017
1 parent 34706e4 commit 5ffe755
Show file tree
Hide file tree
Showing 3 changed files with 372 additions and 0 deletions.
2 changes: 2 additions & 0 deletions media-gfx/imagemagick/Manifest
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ DIST ImageMagick-6.9.9-0.tar.xz 8780640 BLAKE2B eaab6af1ed0471b148736d23ad53d334
DIST ImageMagick-6.9.9-18.tar.xz 8797460 SHA256 121dd50d051488e908306d7d1ba624781f5ec9532d30a2281b4a2bf6f26ee0b4 SHA512 b18733e01c3f41a221a691ceb992bb2e7ecabbdd1b4765c5dd46f00c2047db8534acee9659aed55786baa00062946353bd02ac60b0609caf21f87fb34a40d290 WHIRLPOOL 9077ece10f3ab8be3334816589640523bed69eef1a3cb789653cb9b260caef6721ef941010f806b00a65f8bd5a9bafa87578163b2b92888f488cdabc49218408
DIST ImageMagick-6.9.9-20.tar.xz 8994128 BLAKE2B fb52396956b6e34320e82f34f83273550af3a55f0d23af87a791b3a8ae4002d27d3726e1caae1822bfe2f697de6ec76a975156a305eef5233cdb60006e32314f SHA512 36c241490ee41de5cd72e5bc297ac2353a0d4574337776445798b0c5823f491304c3f3a728d420d03f66b652eafcdb68ec2992347321ac3919c1d72c0afdb849
DIST ImageMagick-6.9.9-23.tar.xz 8795632 BLAKE2B c3a2ece7897961b191b1090384c0872422af80903d0447a0b67f06d45062d60f12903a30a00d28bedc33a6c0b74f38bfe043a113613f0bfb5b1608b972ce8e2a SHA512 9160e0f6606c6ea011e9e47a11f092735456be60d6d039b9cf73c055c046ce89f05d096bdc3d37f87e2d6e36cd8dc9adf233b42bb9ad7d14aa03f13c7a1b6c03
DIST ImageMagick-6.9.9-26.tar.xz 8799740 BLAKE2B 6d781ef8b0285390cfef0544b26c8b4779a7bfdfb18ba9064eaa1b47edc19e98080e53ea073fe95f11dde52b910ecdff7c3a27efe6163a4b4855cc8db358a66c SHA512 e132deae4d14ccc179300841681c1ec83f90fe9ac8e2ce1f07af5642497be44ce017ec1e007964d307c32ecb733081bd2172e4f3113e5acea31c5783b1126e89
DIST ImageMagick-6.9.9-9.tar.xz 8797832 SHA256 59eed394d295d651e49ec0f3cfe3f0bb7aeccc28bd7a32360db9f8fc4bf9f25c SHA512 d024f753e1bf234e38736935f38a9bf82969ca77130059383f9d1871a39f68d7678a546d2786d57d602744e2008909df3f2ab08e1207b4c97c0952e7b03876d8 WHIRLPOOL f56279a778c81b6a1b61b7e47f24de25b4758c6d46fabf1f63c6847dac151297ec6bd76e390b3f21b0521963b254771ad9779ed3b4e62f0d77e94f225ec595ef
DIST ImageMagick-7.0.6-9.tar.xz 8550004 BLAKE2B 2ca6cb995bdbdb16188c8cfa1fe328cccfe604341331413dc35950bc115f8a76af21f2f07cc3384da460a03d3de97484e1293507d30fea4571ee8f064f536757 SHA512 5756d2605cbfbd876765372e954aeefdcdf60f1ee364ce40c3302f8958c510e6f0ecf47a3ee3c264eaaade1504bdae068118eb2cb96d418237f7f53da94a6c11
DIST ImageMagick-7.0.7-11.tar.xz 8626180 BLAKE2B cb43c167227632dbcb96575d2f4845cb80a40f4490be240aa8020993033e23f42ba9f600ba37751cce66dc51237b209be965115fbed20329f046a8ca014accdf SHA512 089c8516ca66845c6b8e6b365815ef1806fc97c785f75c06ed62241d7b6255387ee8f9004b1bcc0a6d03b7aa397d8e25131ca2aadc9255cc1e2368d73f774551
DIST ImageMagick-7.0.7-14.tar.xz 8617500 BLAKE2B 72d6a1319ec299e9717b68cef29c08817999dd9f2fffa5ee80aded6cb03c87c17859dc6d74cc48a63205c28f27ae5781cf55589a07bdda3b54528b489141f05f SHA512 c4b15ffe64bddb8da8e1ab04e6c41c46c9120d224a09225e76f5624250b31aea84bff37c712ad5cdea3faa8f2242054bfa3f33456468d68e14e7f4d85a88de6f
DIST ImageMagick-7.0.7-6.tar.xz 8556160 BLAKE2B 3450c4c7e3804b0dcf7659a7ca0f11f6d1225c577b33216e10f6feeaa817412839ce613fdcae2175beace4cf844f880379899c1ad4914ff6df25fe2817fd0572 SHA512 9dff09a29b94f0de8ede82473820860f812edf3fc8edb0d1f8daa21c127d3e7831047f33ab22c407f2803a03561b690a52525672da837bbab1a1255156b4e6ff
DIST ImageMagick-7.0.7-8.tar.xz 8797060 BLAKE2B a1a4278c375047fed7e59fdb9fa2a9526e2fc14136a669a0d148f78e5b308244de0ddd5c4b79e8e2214e4c91d39ae25531581868a2832ad91189a34460b5b5ad SHA512 0852df3bc996032a713ce6dc274cc36c3818c1c8304223de391e58bce8230aa12ac9778b4b28278c0ab4e42f2a7b4094052a5e4e6e4208329848948237fb41d2
185 changes: 185 additions & 0 deletions media-gfx/imagemagick/imagemagick-6.9.9.26.ebuild
Original file line number Diff line number Diff line change
@@ -0,0 +1,185 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2

EAPI=6

inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator

MY_P=ImageMagick-$(replace_version_separator 3 '-')

DESCRIPTION="A collection of tools and libraries for many image formats"
HOMEPAGE="http://www.imagemagick.org/"
SRC_URI="mirror://${PN}/${MY_P}.tar.xz"

LICENSE="imagemagick"
SLOT="0/${PV}"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"

RESTRICT="perl? ( userpriv )"

RDEPEND="
dev-libs/libltdl:0
bzip2? ( app-arch/bzip2 )
corefonts? ( media-fonts/corefonts )
djvu? ( app-text/djvu )
fftw? ( sci-libs/fftw:3.0 )
fontconfig? ( media-libs/fontconfig )
fpx? ( >=media-libs/libfpx-1.3.0-r1 )
graphviz? ( media-gfx/graphviz )
jbig? ( >=media-libs/jbigkit-2:= )
jpeg? ( virtual/jpeg:0 )
jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
lcms? ( media-libs/lcms:2= )
lqr? ( media-libs/liblqr )
opencl? ( virtual/opencl )
openexr? ( media-libs/openexr:0= )
pango? ( x11-libs/pango )
perl? ( >=dev-lang/perl-5.8.8:0= )
png? ( media-libs/libpng:0= )
postscript? ( app-text/ghostscript-gpl )
raw? ( media-gfx/ufraw )
svg? ( gnome-base/librsvg )
tiff? ( media-libs/tiff:0= )
truetype? (
media-fonts/urw-fonts
>=media-libs/freetype-2
)
webp? ( media-libs/libwebp:0= )
wmf? ( media-libs/libwmf )
X? (
x11-libs/libICE
x11-libs/libSM
x11-libs/libXext
x11-libs/libXt
)
xml? ( dev-libs/libxml2:= )
lzma? ( app-arch/xz-utils )
zlib? ( sys-libs/zlib:= )"
DEPEND="${RDEPEND}
!media-gfx/graphicsmagick[imagemagick]
virtual/pkgconfig
X? ( x11-proto/xextproto )"

REQUIRED_USE="corefonts? ( truetype )
test? ( corefonts )"

S=${WORKDIR}/${MY_P}

src_prepare() {
local mesa_cards ati_cards nvidia_cards render_cards
default

elibtoolize # for Darwin modules

# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
shopt -s nullglob
ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
if test -n "${ati_cards}"; then
addpredict "${ati_cards}"
fi
mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
if test -n "${mesa_cards}"; then
addpredict "${mesa_cards}"
fi
nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
if test -n "${nvidia_cards}"; then
addpredict "${nvidia_cards}"
fi
render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
if test -n "${render_cards}"; then
addpredict "${render_cards}"
fi
shopt -u nullglob
addpredict /dev/nvidiactl
}

src_configure() {
local depth=16
use q8 && depth=8
use q32 && depth=32

local openmp=disable
use openmp && { tc-has-openmp && openmp=enable; }

[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket

local myeconfargs=(
$(use_enable static-libs static)
$(use_enable hdri)
$(use_enable opencl)
--with-threads
--with-modules
--with-quantum-depth=${depth}
$(use_with cxx magick-plus-plus)
$(use_with perl)
--with-perl-options='INSTALLDIRS=vendor'
--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
$(use_with bzip2 bzlib)
$(use_with X x)
$(use_with zlib)
--without-autotrace
$(use_with postscript dps)
$(use_with djvu)
--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
$(use_with fftw)
$(use_with fpx)
$(use_with fontconfig)
$(use_with truetype freetype)
$(use_with postscript gslib)
$(use_with graphviz gvc)
$(use_with jbig)
$(use_with jpeg)
$(use_with jpeg2k openjp2)
$(use_with lcms)
$(use_with lqr)
$(use_with lzma)
$(use_with openexr)
$(use_with pango)
$(use_with png)
$(use_with svg rsvg)
$(use_with tiff)
$(use_with webp)
$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
$(use_with wmf)
$(use_with xml)
--${openmp}-openmp
--with-gcc-arch=no-automagic
)
CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
}

src_test() {
LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
emake check
}

src_install() {
# Ensure documentation installation files and paths with each release!
emake \
DESTDIR="${D}" \
DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
install

rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
dodoc {AUTHORS,README}.txt ChangeLog

if use perl; then
find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
fi

find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +

if use opencl; then
cat <<-EOF > "${T}"/99${PN}
SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
EOF

insinto /etc/sandbox.d
doins "${T}"/99${PN} #472766
fi

insinto /usr/share/${PN}
doins config/*icm
}
185 changes: 185 additions & 0 deletions media-gfx/imagemagick/imagemagick-7.0.7.14.ebuild
Original file line number Diff line number Diff line change
@@ -0,0 +1,185 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2

EAPI=6

inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator

MY_P=ImageMagick-$(replace_version_separator 3 '-')

DESCRIPTION="A collection of tools and libraries for many image formats"
HOMEPAGE="http://www.imagemagick.org/"
SRC_URI="mirror://${PN}/${MY_P}.tar.xz"

LICENSE="imagemagick"
SLOT="0/${PV}"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"

RESTRICT="perl? ( userpriv )"

RDEPEND="
dev-libs/libltdl:0
bzip2? ( app-arch/bzip2 )
corefonts? ( media-fonts/corefonts )
djvu? ( app-text/djvu )
fftw? ( sci-libs/fftw:3.0 )
fontconfig? ( media-libs/fontconfig )
fpx? ( >=media-libs/libfpx-1.3.0-r1 )
graphviz? ( media-gfx/graphviz )
jbig? ( >=media-libs/jbigkit-2:= )
jpeg? ( virtual/jpeg:0 )
jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
lcms? ( media-libs/lcms:2= )
lqr? ( media-libs/liblqr )
opencl? ( virtual/opencl )
openexr? ( media-libs/openexr:0= )
pango? ( x11-libs/pango )
perl? ( >=dev-lang/perl-5.8.8:0= )
png? ( media-libs/libpng:0= )
postscript? ( app-text/ghostscript-gpl )
raw? ( media-gfx/ufraw )
svg? ( gnome-base/librsvg )
tiff? ( media-libs/tiff:0= )
truetype? (
media-fonts/urw-fonts
>=media-libs/freetype-2
)
webp? ( media-libs/libwebp:0= )
wmf? ( media-libs/libwmf )
X? (
x11-libs/libICE
x11-libs/libSM
x11-libs/libXext
x11-libs/libXt
)
xml? ( dev-libs/libxml2:= )
lzma? ( app-arch/xz-utils )
zlib? ( sys-libs/zlib:= )"
DEPEND="${RDEPEND}
!media-gfx/graphicsmagick[imagemagick]
virtual/pkgconfig
X? ( x11-proto/xextproto )"

REQUIRED_USE="corefonts? ( truetype )
test? ( corefonts )"

S=${WORKDIR}/${MY_P}

src_prepare() {
local ati_cards mesa_cards nvidia_cards render_cards
default

elibtoolize # for Darwin modules

# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
shopt -s nullglob
ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
if test -n "${ati_cards}"; then
addpredict "${ati_cards}"
fi
mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
if test -n "${mesa_cards}"; then
addpredict "${mesa_cards}"
fi
nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
if test -n "${nvidia_cards}"; then
addpredict "${nvidia_cards}"
fi
render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
if test -n "${render_cards}"; then
addpredict "${render_cards}"
fi
shopt -u nullglob
addpredict /dev/nvidiactl
}

src_configure() {
local depth=16
use q8 && depth=8
use q32 && depth=32

local openmp=disable
use openmp && { tc-has-openmp && openmp=enable; }

[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket

local myeconfargs=(
$(use_enable static-libs static)
$(use_enable hdri)
$(use_enable opencl)
--with-threads
--with-modules
--with-quantum-depth=${depth}
$(use_with cxx magick-plus-plus)
$(use_with perl)
--with-perl-options='INSTALLDIRS=vendor'
--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
$(use_with bzip2 bzlib)
$(use_with X x)
$(use_with zlib)
--without-autotrace
$(use_with postscript dps)
$(use_with djvu)
--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
$(use_with fftw)
$(use_with fpx)
$(use_with fontconfig)
$(use_with truetype freetype)
$(use_with postscript gslib)
$(use_with graphviz gvc)
$(use_with jbig)
$(use_with jpeg)
$(use_with jpeg2k openjp2)
$(use_with lcms)
$(use_with lqr)
$(use_with lzma)
$(use_with openexr)
$(use_with pango)
$(use_with png)
$(use_with svg rsvg)
$(use_with tiff)
$(use_with webp)
$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
$(use_with wmf)
$(use_with xml)
--${openmp}-openmp
--with-gcc-arch=no-automagic
)
CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
}

src_test() {
LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
emake check
}

src_install() {
# Ensure documentation installation files and paths with each release!
emake \
DESTDIR="${D}" \
DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
install

rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
dodoc {AUTHORS,README}.txt ChangeLog

if use perl; then
find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
fi

find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +

if use opencl; then
cat <<-EOF > "${T}"/99${PN}
SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
EOF

insinto /etc/sandbox.d
doins "${T}"/99${PN} #472766
fi

insinto /usr/share/${PN}
doins config/*icm
}

0 comments on commit 5ffe755

Please sign in to comment.