Skip to content

Commit

Permalink
[SDL2_ttf] Add Bzip2_jll as dependency and require Julia v1.6 (Juli…
Browse files Browse the repository at this point in the history
…aPackaging#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.
  • Loading branch information
giordano authored and simeonschaub committed Feb 23, 2022
1 parent 255a010 commit c7bbe7f
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions S/SDL2_ttf/build_tarballs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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-*/
Expand Down Expand Up @@ -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")

0 comments on commit c7bbe7f

Please sign in to comment.