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