From e4b914b684fe608ef28a26b002cb072d6ee1b300 Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Tue, 10 Sep 2024 09:27:44 -0400 Subject: [PATCH 1/4] ImageMagick: Update to 6.9.13-16 and 7.1.1-38 --- I/ImageMagick/ImageMagick@6/build_tarballs.jl | 4 ++-- I/ImageMagick/ImageMagick@7/build_tarballs.jl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/I/ImageMagick/ImageMagick@6/build_tarballs.jl b/I/ImageMagick/ImageMagick@6/build_tarballs.jl index b6701ee874a..c225cf0779a 100644 --- a/I/ImageMagick/ImageMagick@6/build_tarballs.jl +++ b/I/ImageMagick/ImageMagick@6/build_tarballs.jl @@ -2,13 +2,13 @@ # `julia build_tarballs.jl --help` to see a usage message. using BinaryBuilder name = "ImageMagick" -upstream_version = v"6.9.13-6" +upstream_version = v"6.9.13-16" version = VersionNumber(upstream_version.major, upstream_version.minor, upstream_version.patch) # Collection of sources required to build imagemagick sources = [ GitSource("https://github.com/ImageMagick/ImageMagick6", - "3da057d31756970cb50b1567922e9caf94d36d84"), + "d2fdaa61f1acf130a58381ffa09171b514db69ad"), DirectorySource("./bundled"), ] diff --git a/I/ImageMagick/ImageMagick@7/build_tarballs.jl b/I/ImageMagick/ImageMagick@7/build_tarballs.jl index 9f4c008ef24..5ec3b1078e5 100644 --- a/I/ImageMagick/ImageMagick@7/build_tarballs.jl +++ b/I/ImageMagick/ImageMagick@7/build_tarballs.jl @@ -2,13 +2,13 @@ # `julia build_tarballs.jl --help` to see a usage message. using BinaryBuilder name = "ImageMagick" -upstream_version = v"7.1.1-31" +upstream_version = v"7.1.1-38" version = VersionNumber(upstream_version.major, upstream_version.minor, upstream_version.patch) # Collection of sources required to build imagemagick sources = [ GitSource("https://github.com/ImageMagick/ImageMagick", - "2f6d2de838390a054af74822e80d74b7799633cb"), + "b0ab92265bab638e6ecd2f18b45977c38771c671"), DirectorySource("./bundled"), ] From a94f37447da20a9870e730dbcfb0a0581ee69ffb Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Tue, 10 Sep 2024 09:48:24 -0400 Subject: [PATCH 2/4] Relax compat version for Libtiff --- I/ImageMagick/ImageMagick@6/build_tarballs.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/I/ImageMagick/ImageMagick@6/build_tarballs.jl b/I/ImageMagick/ImageMagick@6/build_tarballs.jl index c225cf0779a..a941e6a0aa8 100644 --- a/I/ImageMagick/ImageMagick@6/build_tarballs.jl +++ b/I/ImageMagick/ImageMagick@6/build_tarballs.jl @@ -61,7 +61,7 @@ dependencies = [ Dependency("Zlib_jll"), Dependency("libpng_jll"), Dependency("JpegTurbo_jll"), - Dependency("Libtiff_jll"; compat="4.5.1"), + Dependency("Libtiff_jll"; compat="4.3.0"), Dependency("Ghostscript_jll"), Dependency("OpenJpeg_jll"), ] From 36c59d90e4fc55c613e861cf905217dc1cb498a1 Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Tue, 10 Sep 2024 09:57:47 -0400 Subject: [PATCH 3/4] Set compat bounds for Libtiff --- I/ImageMagick/ImageMagick@6/build_tarballs.jl | 2 +- I/ImageMagick/ImageMagick@7/build_tarballs.jl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/I/ImageMagick/ImageMagick@6/build_tarballs.jl b/I/ImageMagick/ImageMagick@6/build_tarballs.jl index a941e6a0aa8..c5c7435a1aa 100644 --- a/I/ImageMagick/ImageMagick@6/build_tarballs.jl +++ b/I/ImageMagick/ImageMagick@6/build_tarballs.jl @@ -61,7 +61,7 @@ dependencies = [ Dependency("Zlib_jll"), Dependency("libpng_jll"), Dependency("JpegTurbo_jll"), - Dependency("Libtiff_jll"; compat="4.3.0"), + Dependency("Libtiff_jll"; compat="~4.5.1"), Dependency("Ghostscript_jll"), Dependency("OpenJpeg_jll"), ] diff --git a/I/ImageMagick/ImageMagick@7/build_tarballs.jl b/I/ImageMagick/ImageMagick@7/build_tarballs.jl index 5ec3b1078e5..522d3174ae6 100644 --- a/I/ImageMagick/ImageMagick@7/build_tarballs.jl +++ b/I/ImageMagick/ImageMagick@7/build_tarballs.jl @@ -50,7 +50,7 @@ products = [ dependencies = [ Dependency("Ghostscript_jll"), Dependency("JpegTurbo_jll"), - Dependency("Libtiff_jll"; compat="4.3.0"), + Dependency("Libtiff_jll"; compat="~4.5.1"), Dependency("OpenJpeg_jll"), Dependency("Zlib_jll"), Dependency("libpng_jll"), From 49592d3790bc2c2cc3f54710f0baa883dacb8083 Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Tue, 10 Sep 2024 10:14:00 -0400 Subject: [PATCH 4/4] Use GCC 6 --- I/ImageMagick/ImageMagick@6/build_tarballs.jl | 3 ++- I/ImageMagick/ImageMagick@7/build_tarballs.jl | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/I/ImageMagick/ImageMagick@6/build_tarballs.jl b/I/ImageMagick/ImageMagick@6/build_tarballs.jl index c5c7435a1aa..18e949f889a 100644 --- a/I/ImageMagick/ImageMagick@6/build_tarballs.jl +++ b/I/ImageMagick/ImageMagick@6/build_tarballs.jl @@ -67,5 +67,6 @@ dependencies = [ ] # Build the tarballs, and possibly a `build.jl` as well. +# Using GCC 6 to get a newer libc, required by OpenJpeg that is pulled in by Libtiff build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies; - julia_compat="1.6", clang_use_lld=false) + clang_use_lld=false, julia_compat="1.6", preferred_gcc_version=v"6") diff --git a/I/ImageMagick/ImageMagick@7/build_tarballs.jl b/I/ImageMagick/ImageMagick@7/build_tarballs.jl index 522d3174ae6..97f752dc9c2 100644 --- a/I/ImageMagick/ImageMagick@7/build_tarballs.jl +++ b/I/ImageMagick/ImageMagick@7/build_tarballs.jl @@ -57,5 +57,6 @@ dependencies = [ ] # Build the tarballs, and possibly a `build.jl` as well. +# Using GCC 6 to get a newer libc, required by OpenJpeg that is pulled in by Libtiff build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies; - clang_use_lld=false, julia_compat="1.6") + clang_use_lld=false, julia_compat="1.6", preferred_gcc_version=v"6")