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