Accepting request 882313 from graphics

- version update to 7.0.11.5
  * OpenCL will be disable by default, use the environment variable
    MAGICK_OCL_DEVICE to turn it on or select the device to use.
- modified patches
  % ImageMagick-library-installable-in-parallel.patch (refreshed)

- update to 7.0.11.4:
  * support caption:split define (reference
  * avoid an omp deadlock with policy string

OBS-URL: https://build.opensuse.org/request/show/882313
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ImageMagick?expand=0&rev=228
This commit is contained in:
Richard Brown 2021-04-01 12:16:26 +00:00 committed by Git OBS Bridge
commit e870d9ba40
7 changed files with 43 additions and 28 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:666c42a6958642e6d4fd03fbeff2e73bb1d6c52740a0b00502fc978d144e1a60
size 12483681

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEE2Ccu9R2iI+TQW0Zpiatj1IJ3N3oFAmBE3cEACgkQiatj1IJ3
N3rj8g//eg61/J6//EFiIt7e992NkZg6pupXIDA48RLQ0dtkOgwgf0TI2/BcwZpv
6FC8d1MPQ78RobHL7iiSlRTPmSispo0CxSNCeCbLBR5agxlQSr/5zx558XOt5gNs
tTNvUsu57roKuzF2BceC7+ryHdTHxeYmoJOiSKbKZbCfZDxiWTmNirgCN+1AKNQ6
PnKGswQrSQ+oCj1PdKLH9AndPrkpsz8+Y6nxSjTYraC8Bn8A4N43GQBxJJlKMNFj
xFhJGWFnMITsGEPMri2g9sab0DM0VRWMBOM3kwDPx14QZo204PIu1Fb7fkCHD85w
bKS9MaAo1owKk/3Fg33aukq5+59Qzmd3DLfLjvZ+qDppOGzqikZB8hvrEKbIsIWe
zfPrncDpo241/kZNPivG+rSV1GDEShmdZTcTJOGHFU6/ZHbkqmtecyNhWjz0E4g7
hnaCv7rBPVCcD+PuhQFYefKGXXR8AqznM48FTPwLByakTW2z601A8GRSh9NXpyvr
LOKwpbzrv/kSxMhraqMTpIw1ItddySs7rR2iEKJXDeH4nn7nIgoCehojVAT2dzX+
OX0c6Vl4cu49XKJJXWu06MM8O0RefeDhhaXRW/YDoNY2nAWnJjU8PpeA6c4j69eY
zM6I2TvXLjgDyIFWyyyIOiwVJ7Xs8Hpr6+0ZOV32+B+6a+Ff4WY=
=Jzac
-----END PGP SIGNATURE-----

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:036dda4fcdf8a61cb9b9fba820d52b72af6ab8c8164a513df6f51b01699cafe6
size 12458168

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEE2Ccu9R2iI+TQW0Zpiatj1IJ3N3oFAmBgwR8ACgkQiatj1IJ3
N3rZCBAAjMYsmlgO7o/gZjCHeMIhPc57Ck6D8JUUrBNaW40rVWvF0R5cPk/DORCU
FIxR6+LO4SUiizqbmYsmpYhcE8D18wq3HhN7CNWw3rGFamFornyIWNPQyL+kO/qs
5ycV0yp8lq/Hi9JDKlHN1I1vaL/LUsXMeDHYcck9aMcwGmS23TOOmEgDV56JgQH6
uQpwS0CvMByhclMSDeiMK5S3LUsi6P183DedUysmMx2BB2L8QAdS94x5XKQe/yMY
0M2q4QE0XOPjAJMlmy0VRe0B1atl7gkF1zYNekXfEzqF9GMLqvR2LRiK9BTmxPIN
oIkWaV4FtK1Un24gHbZcp3AxWuWGYCcNWMUlo+XCDqEModNHedUM2j2zbeHld+xi
FT1v4tOqeV5ab3cvMjuzgyQ8dicM02lhHWOUmHhwsMEc9jKmXGewNsYtTrXdH2gv
dH/3bg0HtXTEgnhYRlsegi5xLpbsNHo0fw5a7Oo9pfN7eRtd+jNyUehqNBMqDDmv
PIMqeYaRwvn9MyQbOK2BS+RRl7hxOZwn+X3WySKp3fGJ5mjcCQbpT3m6VrWSjpir
XATPo1HL0ReNHKNPYiv2a+DB+d/UovYb+Z0oUlOuul8o+arqiJYifyG9PwY7H5em
3chm7F8QPKIqVkbb1yhhZdHAVf+nzanq3pq12Y7mL9UvEdo+g58=
=BwzK
-----END PGP SIGNATURE-----

View File

@ -1,8 +1,8 @@
Index: ImageMagick-7.0.6-7/configure Index: ImageMagick-7.0.11-5/configure
=================================================================== ===================================================================
--- ImageMagick-7.0.6-7.orig/configure 2017-08-12 15:28:32.000000000 +0200 --- ImageMagick-7.0.11-5.orig/configure 2021-03-28 17:25:01.000000000 +0200
+++ ImageMagick-7.0.6-7/configure 2017-08-28 16:56:48.177815147 +0200 +++ ImageMagick-7.0.11-5/configure 2021-03-31 10:43:15.013707778 +0200
@@ -34903,7 +34903,9 @@ fi @@ -33198,7 +33198,9 @@ fi
# Subdirectory to place architecture-dependent configuration files # Subdirectory to place architecture-dependent configuration files

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Wed Mar 31 08:44:15 UTC 2021 - pgajdos@suse.com
- version update to 7.0.11.5
* OpenCL will be disable by default, use the environment variable
MAGICK_OCL_DEVICE to turn it on or select the device to use.
- modified patches
% ImageMagick-library-installable-in-parallel.patch (refreshed)
-------------------------------------------------------------------
Sat Mar 27 00:52:45 UTC 2021 - Dirk Müller <dmueller@suse.com>
- update to 7.0.11.4:
* support caption:split define (reference
* avoid an omp deadlock with policy string
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Mar 14 20:49:18 UTC 2021 - Dirk Müller <dmueller@suse.com> Sun Mar 14 20:49:18 UTC 2021 - Dirk Müller <dmueller@suse.com>

View File

@ -20,7 +20,7 @@
%define asan_build 0 %define asan_build 0
%define maj 7 %define maj 7
%define mfr_version %{maj}.0.11 %define mfr_version %{maj}.0.11
%define mfr_revision 3 %define mfr_revision 5
%define quantum_depth 16 %define quantum_depth 16
%define source_version %{mfr_version}-%{mfr_revision} %define source_version %{mfr_version}-%{mfr_revision}
%define clibver 9 %define clibver 9
@ -207,14 +207,14 @@ Summary: Upstream Configuration Files
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Provides: imagick-%{config_spec} Provides: imagick-%{config_spec}
Requires(post): update-alternatives Requires(post): update-alternatives
Requires(postun): update-alternatives Requires(postun):update-alternatives
%package %{config_spec}-SUSE %package %{config_spec}-SUSE
Summary: Upstream Configuration Files Summary: Upstream Configuration Files
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Provides: imagick-%{config_spec} Provides: imagick-%{config_spec}
Requires(post): update-alternatives Requires(post): update-alternatives
Requires(postun): update-alternatives Requires(postun):update-alternatives
%description %description
ImageMagick is a robust collection of tools and libraries to read, ImageMagick is a robust collection of tools and libraries to read,
@ -323,13 +323,12 @@ will not overwrite user changes in system configuration.
%description %{config_spec}-SUSE %description %{config_spec}-SUSE
ImageMagick configuration as provide by SUSE. It is more security ImageMagick configuration as provide by SUSE. It is more security
aware than config-upstream variant. It does disable some coders, aware than config-upstream variant. It does disable some coders,
that are insecure by design to prevent user to use them that are insecure by design to prevent user to use them
inadvertently. Configuration can be subject of change by future inadvertently. Configuration can be subject of change by future
version and maintenance updates and system changes will not be version and maintenance updates and system changes will not be
preserved. preserved.
%prep %prep
%setup -q -n ImageMagick-%{source_version} %setup -q -n ImageMagick-%{source_version}
%patch2 -p1 %patch2 -p1