From c7bbe7febbc2dca0ca3bf0ed3fd97d8fa41d9ab1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mos=C3=A8=20Giordano?= Date: Thu, 22 Jul 2021 16:30:10 +0100 Subject: [PATCH] [SDL2_ttf] Add `Bzip2_jll` as dependency and require Julia v1.6 (#3367) * [SDL2_ttf] Add `Bzip2_jll` as dependency * [SDL2_ttf] Require Julia v1.6 and build for experimental platforms Also, remove HarfBuzz dependency: as far as I understand, HarfBuzz is only a dependency of FreeType, which they vendor in their source code, but we don't really need it directly for SDL2_ttf. --- S/SDL2_ttf/build_tarballs.jl | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/S/SDL2_ttf/build_tarballs.jl b/S/SDL2_ttf/build_tarballs.jl index b12ea0d1673..349c640f650 100644 --- a/S/SDL2_ttf/build_tarballs.jl +++ b/S/SDL2_ttf/build_tarballs.jl @@ -12,6 +12,8 @@ sources = [ DirectorySource("./bundled"), ] +version = v"2.0.16" # <-- this version number is a lie to build for Julia v1.6 + # Bash recipe for building across all platforms script = raw""" cd $WORKSPACE/srcdir/SDL2_ttf-*/ @@ -51,18 +53,16 @@ products = [ # Dependencies that must be installed before this package can be built dependencies = [ - Dependency("SDL2_jll"), + Dependency("Bzip2_jll"; compat="1.0.8"), Dependency("FreeType2_jll"), + Dependency("Glib_jll"; compat="2.68.1"), + Dependency("Graphite2_jll"), # The following libraries aren't needed for the build, but libSDL2_ttf is # dynamically linked to them regardless. Dependency("libpng_jll"), - # TODO: Next time you build a new version of this package, make sure - # HarfBuzz is actually needed, it doesn't look like it's the case. - Dependency("HarfBuzz_jll"), - Dependency("Graphite2_jll"), - Dependency("Glib_jll", v"2.59.0"; compat="2.59.0"), Dependency("PCRE_jll"), + Dependency("SDL2_jll"), ] # 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")