| 1 |
commit: 292d5b4cae345ff5e2e05be60912411a60cb6f0e |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 1 16:29:14 2019 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 1 16:42:28 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=292d5b4c |
| 7 |
|
| 8 |
media-gfx/imagemagick: bump to v6.9.10-77 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.80, Repoman-2.3.19 |
| 11 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 12 |
|
| 13 |
media-gfx/imagemagick/Manifest | 1 + |
| 14 |
media-gfx/imagemagick/imagemagick-6.9.10.77.ebuild | 249 +++++++++++++++++++++ |
| 15 |
2 files changed, 250 insertions(+) |
| 16 |
|
| 17 |
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest |
| 18 |
index 5c59c6ab7d1..ddcd53ca066 100644 |
| 19 |
--- a/media-gfx/imagemagick/Manifest |
| 20 |
+++ b/media-gfx/imagemagick/Manifest |
| 21 |
@@ -1,2 +1,3 @@ |
| 22 |
DIST ImageMagick-6.9.10-74.tar.xz 9063472 BLAKE2B 11a57ab7f030dbea3d4875b079b131825180e25d4b7b796ae901b1f44edc66b2d6e3feb0271b3afcad67ae1f29fa70d993c8586b12612b53334754e0ccb2582f SHA512 eea3c0d95af431e1949faea95a15fd7a43db72eda8106a9af7994b9760a0f040301ba7e7cb365994fa31bbd3bb40d4624f4d3007366d2fee160eeb7242ed48f9 |
| 23 |
+DIST ImageMagick-6.9.10-77.tar.xz 9068384 BLAKE2B aafbb1debe10f6526a4cdf191381eb171cb9d887b20077313f40f2755e8bedc21c1c27fcd147a521d3c23a7ebf7494701ef20eefc1b1b7b2b861a870bff2bcf1 SHA512 4b6af2a0e28af33314c13f01b1a2b269cd04c5ba873fa8fda5a211dc942d28ad8f4a5e0f88b332e71d2d449d546df60886ebae15fe70e9162c5bf2881710f0d6 |
| 24 |
DIST ImageMagick-7.0.9-5.tar.xz 9468724 BLAKE2B 951a02f119941b8f0ef323aa748947535575e49935e22ff0ace9f716eb5c1ee60a0989877161a7fd97b4d893445f30e3d046317eb83ef4ed8105e1baa02aac83 SHA512 dffb67deaf38e7d4d532eed629a3e4c11be76e6ee32abbca80cf2bdd26e9a916c218ea30f99aebbc9fdcab595cd954757d56e723c1b7d22de3e4fb11c8a7975d |
| 25 |
|
| 26 |
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.77.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.77.ebuild |
| 27 |
new file mode 100644 |
| 28 |
index 00000000000..9f32b46a982 |
| 29 |
--- /dev/null |
| 30 |
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.77.ebuild |
| 31 |
@@ -0,0 +1,249 @@ |
| 32 |
+# Copyright 1999-2019 Gentoo Authors |
| 33 |
+# Distributed under the terms of the GNU General Public License v2 |
| 34 |
+ |
| 35 |
+EAPI="6" |
| 36 |
+ |
| 37 |
+inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib |
| 38 |
+ |
| 39 |
+MY_PV="$(ver_rs 3 '-')" |
| 40 |
+MY_P="ImageMagick-${MY_PV}" |
| 41 |
+ |
| 42 |
+DESCRIPTION="A collection of tools and libraries for many image formats" |
| 43 |
+HOMEPAGE="https://www.imagemagick.org/" |
| 44 |
+SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" |
| 45 |
+ |
| 46 |
+LICENSE="imagemagick" |
| 47 |
+SLOT="0/${PV}" |
| 48 |
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" |
| 49 |
+IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif 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" |
| 50 |
+ |
| 51 |
+REQUIRED_USE="corefonts? ( truetype ) |
| 52 |
+ test? ( corefonts )" |
| 53 |
+ |
| 54 |
+RESTRICT="perl? ( userpriv ) |
| 55 |
+ !test? ( test )" |
| 56 |
+ |
| 57 |
+RDEPEND=" |
| 58 |
+ dev-libs/libltdl:0 |
| 59 |
+ bzip2? ( app-arch/bzip2 ) |
| 60 |
+ corefonts? ( media-fonts/corefonts ) |
| 61 |
+ djvu? ( app-text/djvu ) |
| 62 |
+ fftw? ( sci-libs/fftw:3.0 ) |
| 63 |
+ fontconfig? ( media-libs/fontconfig ) |
| 64 |
+ fpx? ( >=media-libs/libfpx-1.3.0-r1 ) |
| 65 |
+ graphviz? ( media-gfx/graphviz ) |
| 66 |
+ heif? ( media-libs/libheif:= ) |
| 67 |
+ jbig? ( >=media-libs/jbigkit-2:= ) |
| 68 |
+ jpeg? ( virtual/jpeg:0 ) |
| 69 |
+ jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) |
| 70 |
+ lcms? ( media-libs/lcms:2= ) |
| 71 |
+ lqr? ( media-libs/liblqr ) |
| 72 |
+ opencl? ( virtual/opencl ) |
| 73 |
+ openexr? ( media-libs/openexr:0= ) |
| 74 |
+ pango? ( x11-libs/pango ) |
| 75 |
+ perl? ( >=dev-lang/perl-5.8.8:0= ) |
| 76 |
+ png? ( media-libs/libpng:0= ) |
| 77 |
+ postscript? ( app-text/ghostscript-gpl ) |
| 78 |
+ raw? ( media-libs/libraw:= ) |
| 79 |
+ svg? ( gnome-base/librsvg ) |
| 80 |
+ tiff? ( media-libs/tiff:0= ) |
| 81 |
+ truetype? ( |
| 82 |
+ media-fonts/urw-fonts |
| 83 |
+ >=media-libs/freetype-2 |
| 84 |
+ ) |
| 85 |
+ webp? ( media-libs/libwebp:0= ) |
| 86 |
+ wmf? ( media-libs/libwmf ) |
| 87 |
+ X? ( |
| 88 |
+ x11-libs/libICE |
| 89 |
+ x11-libs/libSM |
| 90 |
+ x11-libs/libXext |
| 91 |
+ x11-libs/libXt |
| 92 |
+ ) |
| 93 |
+ xml? ( dev-libs/libxml2:= ) |
| 94 |
+ lzma? ( app-arch/xz-utils ) |
| 95 |
+ zlib? ( sys-libs/zlib:= )" |
| 96 |
+DEPEND="${RDEPEND} |
| 97 |
+ !media-gfx/graphicsmagick[imagemagick] |
| 98 |
+ virtual/pkgconfig |
| 99 |
+ X? ( x11-base/xorg-proto )" |
| 100 |
+ |
| 101 |
+S="${WORKDIR}/${MY_P}" |
| 102 |
+ |
| 103 |
+src_prepare() { |
| 104 |
+ default |
| 105 |
+ |
| 106 |
+ # Apply hardening #664236 |
| 107 |
+ cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die |
| 108 |
+ sed -i -e '/^<policymap>$/ { |
| 109 |
+ r policy-hardening.snippet |
| 110 |
+ d |
| 111 |
+ }' \ |
| 112 |
+ config/policy.xml || \ |
| 113 |
+ die "Failed to apply hardening of policy.xml" |
| 114 |
+ einfo "policy.xml hardened" |
| 115 |
+ |
| 116 |
+ elibtoolize # for Darwin modules |
| 117 |
+ |
| 118 |
+ # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 |
| 119 |
+ local mesa_cards ati_cards nvidia_cards render_cards |
| 120 |
+ shopt -s nullglob |
| 121 |
+ ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') |
| 122 |
+ if test -n "${ati_cards}"; then |
| 123 |
+ addpredict "${ati_cards}" |
| 124 |
+ fi |
| 125 |
+ mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') |
| 126 |
+ if test -n "${mesa_cards}"; then |
| 127 |
+ addpredict "${mesa_cards}" |
| 128 |
+ fi |
| 129 |
+ nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g') |
| 130 |
+ if test -n "${nvidia_cards}"; then |
| 131 |
+ addpredict "${nvidia_cards}" |
| 132 |
+ fi |
| 133 |
+ render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') |
| 134 |
+ if test -n "${render_cards}"; then |
| 135 |
+ addpredict "${render_cards}" |
| 136 |
+ fi |
| 137 |
+ shopt -u nullglob |
| 138 |
+ addpredict /dev/nvidiactl |
| 139 |
+} |
| 140 |
+ |
| 141 |
+src_configure() { |
| 142 |
+ local depth=16 |
| 143 |
+ use q8 && depth=8 |
| 144 |
+ use q32 && depth=32 |
| 145 |
+ |
| 146 |
+ local openmp=disable |
| 147 |
+ use openmp && { tc-has-openmp && openmp=enable; } |
| 148 |
+ |
| 149 |
+ use perl && perl_check_env |
| 150 |
+ |
| 151 |
+ [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket |
| 152 |
+ |
| 153 |
+ local myeconfargs=( |
| 154 |
+ $(use_enable static-libs static) |
| 155 |
+ $(use_enable hdri) |
| 156 |
+ $(use_enable opencl) |
| 157 |
+ --with-threads |
| 158 |
+ --with-modules |
| 159 |
+ --with-quantum-depth=${depth} |
| 160 |
+ $(use_with cxx magick-plus-plus) |
| 161 |
+ $(use_with perl) |
| 162 |
+ --with-perl-options='INSTALLDIRS=vendor' |
| 163 |
+ --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts |
| 164 |
+ $(use_with bzip2 bzlib) |
| 165 |
+ $(use_with X x) |
| 166 |
+ $(use_with zlib) |
| 167 |
+ --without-autotrace |
| 168 |
+ $(use_with postscript dps) |
| 169 |
+ $(use_with djvu) |
| 170 |
+ --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu |
| 171 |
+ $(use_with fftw) |
| 172 |
+ $(use_with fpx) |
| 173 |
+ $(use_with fontconfig) |
| 174 |
+ $(use_with truetype freetype) |
| 175 |
+ $(use_with postscript gslib) |
| 176 |
+ $(use_with graphviz gvc) |
| 177 |
+ $(use_with heif heic) |
| 178 |
+ $(use_with jbig) |
| 179 |
+ $(use_with jpeg) |
| 180 |
+ $(use_with jpeg2k openjp2) |
| 181 |
+ $(use_with lcms) |
| 182 |
+ $(use_with lqr) |
| 183 |
+ $(use_with lzma) |
| 184 |
+ $(use_with openexr) |
| 185 |
+ $(use_with pango) |
| 186 |
+ $(use_with png) |
| 187 |
+ $(use_with raw) |
| 188 |
+ $(use_with svg rsvg) |
| 189 |
+ $(use_with tiff) |
| 190 |
+ $(use_with webp) |
| 191 |
+ $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) |
| 192 |
+ $(use_with wmf) |
| 193 |
+ $(use_with xml) |
| 194 |
+ --${openmp}-openmp |
| 195 |
+ --with-gcc-arch=no-automagic |
| 196 |
+ ) |
| 197 |
+ CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}" |
| 198 |
+} |
| 199 |
+ |
| 200 |
+src_test() { |
| 201 |
+ # Install default (unrestricted) policy in $HOME for test suite #664238 |
| 202 |
+ local _im_local_config_home="${HOME}/.config/ImageMagick" |
| 203 |
+ mkdir -p "${_im_local_config_home}" || \ |
| 204 |
+ die "Failed to create IM config dir in '${_im_local_config_home}'" |
| 205 |
+ cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ |
| 206 |
+ die "Failed to install default blank policy.xml in '${_im_local_config_home}'" |
| 207 |
+ |
| 208 |
+ local im_command= IM_COMMANDS=() |
| 209 |
+ IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built |
| 210 |
+ IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used |
| 211 |
+ IM_COMMANDS+=( "emake check" ) # Run tests |
| 212 |
+ |
| 213 |
+ for im_command in "${IM_COMMANDS[@]}"; do |
| 214 |
+ eval "${S}"/magick.sh \ |
| 215 |
+ ${im_command} || \ |
| 216 |
+ die "Failed to run \"${im_command}\"" |
| 217 |
+ done |
| 218 |
+} |
| 219 |
+ |
| 220 |
+src_install() { |
| 221 |
+ # Ensure documentation installation files and paths with each release! |
| 222 |
+ emake \ |
| 223 |
+ DESTDIR="${D}" \ |
| 224 |
+ DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ |
| 225 |
+ install |
| 226 |
+ |
| 227 |
+ rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} |
| 228 |
+ dodoc {AUTHORS,README}.txt ChangeLog |
| 229 |
+ |
| 230 |
+ if use perl; then |
| 231 |
+ find "${ED}" -type f -name perllocal.pod -exec rm -f {} + |
| 232 |
+ find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + |
| 233 |
+ fi |
| 234 |
+ |
| 235 |
+ find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + |
| 236 |
+ |
| 237 |
+ if use opencl; then |
| 238 |
+ cat <<-EOF > "${T}"/99${PN} |
| 239 |
+ SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128" |
| 240 |
+ EOF |
| 241 |
+ |
| 242 |
+ insinto /etc/sandbox.d |
| 243 |
+ doins "${T}"/99${PN} #472766 |
| 244 |
+ fi |
| 245 |
+ |
| 246 |
+ insinto /usr/share/${PN} |
| 247 |
+ doins config/*icm |
| 248 |
+} |
| 249 |
+ |
| 250 |
+pkg_postinst() { |
| 251 |
+ local _show_policy_xml_notice= |
| 252 |
+ |
| 253 |
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then |
| 254 |
+ # This is a new installation |
| 255 |
+ _show_policy_xml_notice=yes |
| 256 |
+ else |
| 257 |
+ local v |
| 258 |
+ for v in ${REPLACING_VERSIONS}; do |
| 259 |
+ if ! ver_test "${v}" -gt "6.9.10.10-r2"; then |
| 260 |
+ # This is an upgrade |
| 261 |
+ _show_policy_xml_notice=yes |
| 262 |
+ |
| 263 |
+ # Show this elog only once |
| 264 |
+ break |
| 265 |
+ fi |
| 266 |
+ done |
| 267 |
+ fi |
| 268 |
+ |
| 269 |
+ if [[ -n "${_show_policy_xml_notice}" ]]; then |
| 270 |
+ elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6" |
| 271 |
+ elog "which will prevent the usage of the following coders by default:" |
| 272 |
+ elog "" |
| 273 |
+ elog " - PS" |
| 274 |
+ elog " - PS2" |
| 275 |
+ elog " - PS3" |
| 276 |
+ elog " - EPS" |
| 277 |
+ elog " - PDF" |
| 278 |
+ elog " - XPS" |
| 279 |
+ fi |
| 280 |
+} |
Archives