Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Andreas K. Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/files/, media-gfx/imagemagick/
Date: Fri, 04 Mar 2022 00:25:15
Message-Id: 1646353496.3d49930d33bbd53473777618cf33d1d36682e5ed.dilfridge@gentoo
1 commit: 3d49930d33bbd53473777618cf33d1d36682e5ed
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Fri Mar 4 00:24:36 2022 +0000
4 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Fri Mar 4 00:24:56 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d49930d
7
8 media-gfx/imagemagick: Patch out cpu-tuning magic
9
10 Closes: https://bugs.gentoo.org/678454
11 Package-Manager: Portage-3.0.30, Repoman-3.0.3
12 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
13
14 .../files/imagemagick-9999-nocputuning.patch | 14 +++++++++
15 ...9999.ebuild => imagemagick-6.9.12.35-r1.ebuild} | 33 ++++++++++------------
16 ...-9999.ebuild => imagemagick-7.1.0.20-r1.ebuild} | 12 +++++---
17 media-gfx/imagemagick/imagemagick-9999.ebuild | 12 +++++---
18 4 files changed, 45 insertions(+), 26 deletions(-)
19
20 diff --git a/media-gfx/imagemagick/files/imagemagick-9999-nocputuning.patch b/media-gfx/imagemagick/files/imagemagick-9999-nocputuning.patch
21 new file mode 100644
22 index 000000000000..4a946dacc939
23 --- /dev/null
24 +++ b/media-gfx/imagemagick/files/imagemagick-9999-nocputuning.patch
25 @@ -0,0 +1,14 @@
26 +See https://bugs.gentoo.org/678454
27 +
28 +diff --git a/configure.ac b/configure.ac
29 +index 5e7fb5875..b288327c8 100644
30 +--- a/configure.ac
31 ++++ b/configure.ac
32 +@@ -285,7 +285,6 @@ AC_PROG_AWK
33 + AC_PROG_MKDIR_P
34 + AM_WITH_DMALLOC
35 + AX_C___ATTRIBUTE__
36 +-AX_GCC_ARCHFLAG([yes])
37 + PKG_PROG_PKG_CONFIG([0.20])
38 + AC_CANONICAL_BUILD
39 + AC_CANONICAL_HOST
40
41 diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.35-r1.ebuild
42 similarity index 88%
43 copy from media-gfx/imagemagick/imagemagick-9999.ebuild
44 copy to media-gfx/imagemagick/imagemagick-6.9.12.35-r1.ebuild
45 index d47b238fb192..5dfd56472f4f 100644
46 --- a/media-gfx/imagemagick/imagemagick-9999.ebuild
47 +++ b/media-gfx/imagemagick/imagemagick-6.9.12.35-r1.ebuild
48 @@ -1,27 +1,27 @@
49 -# Copyright 1999-2021 Gentoo Authors
50 +# Copyright 1999-2022 Gentoo Authors
51 # Distributed under the terms of the GNU General Public License v2
52
53 EAPI="8"
54
55 -inherit flag-o-matic libtool perl-functions toolchain-funcs
56 +inherit autotools flag-o-matic libtool perl-functions toolchain-funcs
57
58 if [[ ${PV} == "9999" ]] ; then
59 - EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
60 + EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git"
61 inherit git-r3
62 MY_P="imagemagick-9999"
63 else
64 MY_PV="$(ver_rs 3 '-')"
65 MY_P="ImageMagick-${MY_PV}"
66 SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
67 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
68 + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
69 fi
70
71 DESCRIPTION="A collection of tools and libraries for many image formats"
72 HOMEPAGE="https://www.imagemagick.org/"
73
74 LICENSE="imagemagick"
75 -SLOT="0/7.1.0-0"
76 -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 zip zlib"
77 +SLOT="0/6.9.11-60"
78 +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"
79
80 REQUIRED_USE="corefonts? ( truetype )
81 svg? ( xml )
82 @@ -72,17 +72,21 @@ RDEPEND="
83 )
84 xml? ( dev-libs/libxml2:= )
85 lzma? ( app-arch/xz-utils )
86 - zip? ( dev-libs/libzip:= )
87 zlib? ( sys-libs/zlib:= )"
88
89 DEPEND="${RDEPEND}
90 !media-gfx/graphicsmagick[imagemagick]
91 X? ( x11-base/xorg-proto )"
92
93 +PATCHES=(
94 + "${FILESDIR}/${PN}-9999-nocputuning.patch"
95 +)
96 +
97 S="${WORKDIR}/${MY_P}"
98
99 src_prepare() {
100 default
101 + eautoreconf
102
103 # Apply hardening #664236
104 cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
105 @@ -144,7 +148,6 @@ src_configure() {
106 --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
107 $(use_with bzip2 bzlib)
108 $(use_with X x)
109 - $(use_with zip)
110 $(use_with zlib)
111 --without-autotrace
112 $(use_with postscript dps)
113 @@ -160,7 +163,6 @@ src_configure() {
114 $(use_with jbig)
115 $(use_with jpeg)
116 $(use_with jpeg2k openjp2)
117 - --without-jxl
118 $(use_with lcms)
119 $(use_with lqr)
120 $(use_with lzma)
121 @@ -175,7 +177,6 @@ src_configure() {
122 $(use_with wmf)
123 $(use_with xml)
124 --${openmp}-openmp
125 - --with-gcc-arch=no-automagic
126 )
127 CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
128 }
129 @@ -189,12 +190,8 @@ src_test() {
130 die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
131
132 local im_command= IM_COMMANDS=()
133 - if [[ ${PV} == "9999" ]] ; then
134 - IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
135 - else
136 - IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
137 - fi
138 - IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
139 + IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
140 + IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
141 IM_COMMANDS+=( "emake check" ) # Run tests
142
143 for im_command in "${IM_COMMANDS[@]}"; do
144 @@ -245,7 +242,7 @@ pkg_postinst() {
145 else
146 local v
147 for v in ${REPLACING_VERSIONS}; do
148 - if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
149 + if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
150 # This is an upgrade
151 _show_policy_xml_notice=yes
152
153 @@ -256,7 +253,7 @@ pkg_postinst() {
154 fi
155
156 if [[ -n "${_show_policy_xml_notice}" ]]; then
157 - elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
158 + elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
159 elog "which will prevent the usage of the following coders by default:"
160 elog ""
161 elog " - PS"
162
163 diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-7.1.0.20-r1.ebuild
164 similarity index 95%
165 copy from media-gfx/imagemagick/imagemagick-9999.ebuild
166 copy to media-gfx/imagemagick/imagemagick-7.1.0.20-r1.ebuild
167 index d47b238fb192..ce2194dd3355 100644
168 --- a/media-gfx/imagemagick/imagemagick-9999.ebuild
169 +++ b/media-gfx/imagemagick/imagemagick-7.1.0.20-r1.ebuild
170 @@ -1,9 +1,9 @@
171 -# Copyright 1999-2021 Gentoo Authors
172 +# Copyright 1999-2022 Gentoo Authors
173 # Distributed under the terms of the GNU General Public License v2
174
175 EAPI="8"
176
177 -inherit flag-o-matic libtool perl-functions toolchain-funcs
178 +inherit autotools flag-o-matic libtool perl-functions toolchain-funcs
179
180 if [[ ${PV} == "9999" ]] ; then
181 EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
182 @@ -13,7 +13,7 @@ else
183 MY_PV="$(ver_rs 3 '-')"
184 MY_P="ImageMagick-${MY_PV}"
185 SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
186 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
187 + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
188 fi
189
190 DESCRIPTION="A collection of tools and libraries for many image formats"
191 @@ -79,10 +79,15 @@ DEPEND="${RDEPEND}
192 !media-gfx/graphicsmagick[imagemagick]
193 X? ( x11-base/xorg-proto )"
194
195 +PATCHES=(
196 + "${FILESDIR}/${PN}-9999-nocputuning.patch"
197 +)
198 +
199 S="${WORKDIR}/${MY_P}"
200
201 src_prepare() {
202 default
203 + eautoreconf
204
205 # Apply hardening #664236
206 cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
207 @@ -175,7 +180,6 @@ src_configure() {
208 $(use_with wmf)
209 $(use_with xml)
210 --${openmp}-openmp
211 - --with-gcc-arch=no-automagic
212 )
213 CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
214 }
215
216 diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild
217 index d47b238fb192..ce2194dd3355 100644
218 --- a/media-gfx/imagemagick/imagemagick-9999.ebuild
219 +++ b/media-gfx/imagemagick/imagemagick-9999.ebuild
220 @@ -1,9 +1,9 @@
221 -# Copyright 1999-2021 Gentoo Authors
222 +# Copyright 1999-2022 Gentoo Authors
223 # Distributed under the terms of the GNU General Public License v2
224
225 EAPI="8"
226
227 -inherit flag-o-matic libtool perl-functions toolchain-funcs
228 +inherit autotools flag-o-matic libtool perl-functions toolchain-funcs
229
230 if [[ ${PV} == "9999" ]] ; then
231 EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
232 @@ -13,7 +13,7 @@ else
233 MY_PV="$(ver_rs 3 '-')"
234 MY_P="ImageMagick-${MY_PV}"
235 SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
236 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
237 + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
238 fi
239
240 DESCRIPTION="A collection of tools and libraries for many image formats"
241 @@ -79,10 +79,15 @@ DEPEND="${RDEPEND}
242 !media-gfx/graphicsmagick[imagemagick]
243 X? ( x11-base/xorg-proto )"
244
245 +PATCHES=(
246 + "${FILESDIR}/${PN}-9999-nocputuning.patch"
247 +)
248 +
249 S="${WORKDIR}/${MY_P}"
250
251 src_prepare() {
252 default
253 + eautoreconf
254
255 # Apply hardening #664236
256 cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
257 @@ -175,7 +180,6 @@ src_configure() {
258 $(use_with wmf)
259 $(use_with xml)
260 --${openmp}-openmp
261 - --with-gcc-arch=no-automagic
262 )
263 CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
264 }
Report Message
Find on MARC Find on Google Groups