Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump ImageMagick, build for experimental platforms #3424

Merged
merged 5 commits into from
Oct 1, 2021
Merged

Bump ImageMagick, build for experimental platforms #3424

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fb8561d
Bump ImageMagick, build for experimental platforms
staticfloat Aug 3, 2021
39c4862
Bump `libtiff` version, as requested by comment
staticfloat Aug 3, 2021
26afe07
Update build_tarballs.jl
staticfloat Aug 3, 2021
f3850e7
[ImageMagick] Link some utilities to librt because of `clock_gettime`
giordano Aug 22, 2021
3fcd22e
[ImageMagick] Add more patches for Windows
giordano Aug 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions I/ImageMagick/build_tarballs.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
# `julia build_tarballs.jl --help` to see a usage message.
using BinaryBuilder
name = "ImageMagick"
version = v"6.9.10-12"
version = v"6.9.12-19"
staticfloat marked this conversation as resolved.
Show resolved Hide resolved

# Collection of sources required to build imagemagick
sources = [
ArchiveSource("https://github.com/ImageMagick/ImageMagick6/archive/6.9.10-12.tar.gz",
"efaae51489af9f895762bcb7090636f03194daaa026eda97dae230098d2ccec7"),
ArchiveSource("https://github.com/ImageMagick/ImageMagick6/archive/6.9.12-19.tar.gz",
"2f184f1f5c3e19849347b2b4acb6dd074290903d36fa5924956ee06c85ddf783"),
]

# Bash recipe for building across all platforms
Expand All @@ -20,7 +20,7 @@ make install

# These are the platforms we will build for by default, unless further
# platforms are passed in on the command line
platforms = expand_cxxstring_abis(supported_platforms())
platforms = expand_cxxstring_abis(supported_platforms(;experimental=true))

# The products that we will ensure are always built
products = [
Expand All @@ -34,9 +34,8 @@ dependencies = [
Dependency("Zlib_jll"),
Dependency("libpng_jll"),
Dependency("JpegTurbo_jll"),
# TODO: v4.3.0 is available, use that next time
Dependency("Libtiff_jll"; compat="4.1.0"),
Dependency("Libtiff_jll"; compat="4.3.0"),
]

# Build the tarballs, and possibly a `build.jl` as well.
build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies)
build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies; julia_compat="1.6")