From 0122119a447251af096242e19f4eafc258fdfc56fbd9a18bb669310aba55e576 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 29 Mar 2021 06:24:42 +0000 Subject: [PATCH 1/2] Accepting request 881584 from home:dirkmueller:Factory - 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/881584 OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=556 --- ImageMagick-7.0.11-3.tar.bz2 | 3 --- ImageMagick-7.0.11-3.tar.bz2.asc | 16 ---------------- ImageMagick-7.0.11-4.tar.bz2 | 3 +++ ImageMagick-7.0.11-4.tar.bz2.asc | 16 ++++++++++++++++ ImageMagick.changes | 7 +++++++ ImageMagick.spec | 9 ++++----- 6 files changed, 30 insertions(+), 24 deletions(-) delete mode 100644 ImageMagick-7.0.11-3.tar.bz2 delete mode 100644 ImageMagick-7.0.11-3.tar.bz2.asc create mode 100644 ImageMagick-7.0.11-4.tar.bz2 create mode 100644 ImageMagick-7.0.11-4.tar.bz2.asc diff --git a/ImageMagick-7.0.11-3.tar.bz2 b/ImageMagick-7.0.11-3.tar.bz2 deleted file mode 100644 index e880e82..0000000 --- a/ImageMagick-7.0.11-3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:666c42a6958642e6d4fd03fbeff2e73bb1d6c52740a0b00502fc978d144e1a60 -size 12483681 diff --git a/ImageMagick-7.0.11-3.tar.bz2.asc b/ImageMagick-7.0.11-3.tar.bz2.asc deleted file mode 100644 index b524b5b..0000000 --- a/ImageMagick-7.0.11-3.tar.bz2.asc +++ /dev/null @@ -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----- diff --git a/ImageMagick-7.0.11-4.tar.bz2 b/ImageMagick-7.0.11-4.tar.bz2 new file mode 100644 index 0000000..f34d187 --- /dev/null +++ b/ImageMagick-7.0.11-4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:53dc0e7e2c3cd0c59b246a41a8ce46f9ca862c617070989b9142ab4f10bb78e6 +size 12479517 diff --git a/ImageMagick-7.0.11-4.tar.bz2.asc b/ImageMagick-7.0.11-4.tar.bz2.asc new file mode 100644 index 0000000..884692a --- /dev/null +++ b/ImageMagick-7.0.11-4.tar.bz2.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEE2Ccu9R2iI+TQW0Zpiatj1IJ3N3oFAmBWYFsACgkQiatj1IJ3 +N3qXSQ//Sp27KmyBiBJU4X4qdPL1x2k5YYliiyFqE76bRorkyZIPO2TpaeRSPblJ +JmF+fXphtNeSES3DNGguGz2Ne4oTb+zODdzusp/xLXs3l+UwsX7CubRmjI7luei3 +3ZHcyai6kHWor9Kon2e+40nD3Js160taeJO+dGYECi7F4oNuBkcif/w8rJqLpkUb +cINuHb5GlVb8epZ3ekGGl7v0HpdDc0EMk+NtKvXxy68e1hCD0hVKJccWtfZFfi05 +THxaRqZngwD/IHYz8XR1VU95xJVQQgiyzeD5RcOhy6m6r7nrs7HoZO7xy/JtPZCd +CbwCNxXjPZEljxhyA9chjtziokmp2oZ10RsXuheiqKgoTEi/tPq1k7j24j/jUpeN +44UtALpkM4NQKhr1eRXFJ3vJ7+bO3IXsA5RQDrJhbnvg1VsGEQhgVUYudPGfqX4W +7nAPQDSzhsA5/2ub5ccrV9jak0oJ2S6/x7bXFO13yx8YqRiELUeI9Oq/Uzv6f6fT +GR/A4wjwNChTbEqIALDkS9l0CgUacZ25XbTerYNvfQWXL3kRPRNNmsM1GV9oat/w +KhIJffnA526Kk1K1KwYbCcDL0adq6mtWo9DjcUbSDqMoj4HJL3moeVGyeoY6q7Eu +V2s35W8fLu2RiMvhTcUUQxEYCLvJOK21GdncTpprsrs+9ePxY5g= +=kq45 +-----END PGP SIGNATURE----- diff --git a/ImageMagick.changes b/ImageMagick.changes index 63a7433..73ce25a 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Mar 27 00:52:45 UTC 2021 - Dirk Müller + +- 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 diff --git a/ImageMagick.spec b/ImageMagick.spec index a5271e9..8e9ce02 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -20,7 +20,7 @@ %define asan_build 0 %define maj 7 %define mfr_version %{maj}.0.11 -%define mfr_revision 3 +%define mfr_revision 4 %define quantum_depth 16 %define source_version %{mfr_version}-%{mfr_revision} %define clibver 9 @@ -207,14 +207,14 @@ Summary: Upstream Configuration Files Group: Development/Libraries/C and C++ Provides: imagick-%{config_spec} Requires(post): update-alternatives -Requires(postun): update-alternatives +Requires(postun):update-alternatives %package %{config_spec}-SUSE Summary: Upstream Configuration Files Group: Development/Libraries/C and C++ Provides: imagick-%{config_spec} Requires(post): update-alternatives -Requires(postun): update-alternatives +Requires(postun):update-alternatives %description 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 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 inadvertently. Configuration can be subject of change by future version and maintenance updates and system changes will not be preserved. - %prep %setup -q -n ImageMagick-%{source_version} %patch2 -p1 From 27c8ddcc8f35d1cfcf2cc1c6b332a145d9d52907b1d0b4c74b7edd71f0a8723f Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Wed, 31 Mar 2021 08:51:39 +0000 Subject: [PATCH 2/2] - 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) OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=557 --- ImageMagick-7.0.11-4.tar.bz2 | 3 --- ImageMagick-7.0.11-4.tar.bz2.asc | 16 ---------------- ImageMagick-7.0.11-5.tar.bz2 | 3 +++ ImageMagick-7.0.11-5.tar.bz2.asc | 16 ++++++++++++++++ ...eMagick-library-installable-in-parallel.patch | 8 ++++---- ImageMagick.changes | 9 +++++++++ ImageMagick.spec | 2 +- 7 files changed, 33 insertions(+), 24 deletions(-) delete mode 100644 ImageMagick-7.0.11-4.tar.bz2 delete mode 100644 ImageMagick-7.0.11-4.tar.bz2.asc create mode 100644 ImageMagick-7.0.11-5.tar.bz2 create mode 100644 ImageMagick-7.0.11-5.tar.bz2.asc diff --git a/ImageMagick-7.0.11-4.tar.bz2 b/ImageMagick-7.0.11-4.tar.bz2 deleted file mode 100644 index f34d187..0000000 --- a/ImageMagick-7.0.11-4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:53dc0e7e2c3cd0c59b246a41a8ce46f9ca862c617070989b9142ab4f10bb78e6 -size 12479517 diff --git a/ImageMagick-7.0.11-4.tar.bz2.asc b/ImageMagick-7.0.11-4.tar.bz2.asc deleted file mode 100644 index 884692a..0000000 --- a/ImageMagick-7.0.11-4.tar.bz2.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEE2Ccu9R2iI+TQW0Zpiatj1IJ3N3oFAmBWYFsACgkQiatj1IJ3 -N3qXSQ//Sp27KmyBiBJU4X4qdPL1x2k5YYliiyFqE76bRorkyZIPO2TpaeRSPblJ -JmF+fXphtNeSES3DNGguGz2Ne4oTb+zODdzusp/xLXs3l+UwsX7CubRmjI7luei3 -3ZHcyai6kHWor9Kon2e+40nD3Js160taeJO+dGYECi7F4oNuBkcif/w8rJqLpkUb -cINuHb5GlVb8epZ3ekGGl7v0HpdDc0EMk+NtKvXxy68e1hCD0hVKJccWtfZFfi05 -THxaRqZngwD/IHYz8XR1VU95xJVQQgiyzeD5RcOhy6m6r7nrs7HoZO7xy/JtPZCd -CbwCNxXjPZEljxhyA9chjtziokmp2oZ10RsXuheiqKgoTEi/tPq1k7j24j/jUpeN -44UtALpkM4NQKhr1eRXFJ3vJ7+bO3IXsA5RQDrJhbnvg1VsGEQhgVUYudPGfqX4W -7nAPQDSzhsA5/2ub5ccrV9jak0oJ2S6/x7bXFO13yx8YqRiELUeI9Oq/Uzv6f6fT -GR/A4wjwNChTbEqIALDkS9l0CgUacZ25XbTerYNvfQWXL3kRPRNNmsM1GV9oat/w -KhIJffnA526Kk1K1KwYbCcDL0adq6mtWo9DjcUbSDqMoj4HJL3moeVGyeoY6q7Eu -V2s35W8fLu2RiMvhTcUUQxEYCLvJOK21GdncTpprsrs+9ePxY5g= -=kq45 ------END PGP SIGNATURE----- diff --git a/ImageMagick-7.0.11-5.tar.bz2 b/ImageMagick-7.0.11-5.tar.bz2 new file mode 100644 index 0000000..d14100f --- /dev/null +++ b/ImageMagick-7.0.11-5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:036dda4fcdf8a61cb9b9fba820d52b72af6ab8c8164a513df6f51b01699cafe6 +size 12458168 diff --git a/ImageMagick-7.0.11-5.tar.bz2.asc b/ImageMagick-7.0.11-5.tar.bz2.asc new file mode 100644 index 0000000..c2a0973 --- /dev/null +++ b/ImageMagick-7.0.11-5.tar.bz2.asc @@ -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----- diff --git a/ImageMagick-library-installable-in-parallel.patch b/ImageMagick-library-installable-in-parallel.patch index 41a5cc4..98b00d4 100644 --- a/ImageMagick-library-installable-in-parallel.patch +++ b/ImageMagick-library-installable-in-parallel.patch @@ -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.6-7/configure 2017-08-28 16:56:48.177815147 +0200 -@@ -34903,7 +34903,9 @@ fi +--- ImageMagick-7.0.11-5.orig/configure 2021-03-28 17:25:01.000000000 +0200 ++++ ImageMagick-7.0.11-5/configure 2021-03-31 10:43:15.013707778 +0200 +@@ -33198,7 +33198,9 @@ fi # Subdirectory to place architecture-dependent configuration files diff --git a/ImageMagick.changes b/ImageMagick.changes index 73ce25a..1e10fdc 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +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 diff --git a/ImageMagick.spec b/ImageMagick.spec index 8e9ce02..dfc61c6 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -20,7 +20,7 @@ %define asan_build 0 %define maj 7 %define mfr_version %{maj}.0.11 -%define mfr_revision 4 +%define mfr_revision 5 %define quantum_depth 16 %define source_version %{mfr_version}-%{mfr_revision} %define clibver 9