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.

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

[Cairo] v1.18.0 #7454

Merged
merged 30 commits into from
Oct 8, 2023
Merged
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
4b41785
[Cairo] v1.18.0
jeremiahpslewis Sep 29, 2023
49a2fe6
Update build_tarballs.jl
jeremiahpslewis Sep 29, 2023
4f020ad
Update build_tarballs.jl
jeremiahpslewis Sep 29, 2023
af035a2
Switch to meson
jeremiahpslewis Sep 29, 2023
696bfc1
Disable tests
jeremiahpslewis Sep 29, 2023
a014692
add nipc_rmid_deferred_release fix
jeremiahpslewis Sep 30, 2023
782cff6
Merge branch 'jpsl-cairo-1.18' of https://github.com/jeremiahpslewis/…
jeremiahpslewis Sep 30, 2023
f1d2ac5
Drop excess args
jeremiahpslewis Sep 30, 2023
d8eb175
disable directwrite fonts
jeremiahpslewis Sep 30, 2023
3c14eeb
see if we can get away with less configuring
jeremiahpslewis Sep 30, 2023
073195e
simplify build script
jeremiahpslewis Sep 30, 2023
595e654
add back fix
jeremiahpslewis Sep 30, 2023
11b9a0f
use gcc for all builds
jeremiahpslewis Sep 30, 2023
675a065
fix backtrace error
jeremiahpslewis Sep 30, 2023
3ac86e2
Rework cross file for meson
jeremiahpslewis Sep 30, 2023
01b4b19
freebsd is fixed
jeremiahpslewis Sep 30, 2023
cb7dcb9
Update build_tarballs.jl
jeremiahpslewis Oct 1, 2023
2dcbf93
Update build_tarball
jeremiahpslewis Oct 1, 2023
401ad44
Update build_tarballs.jl
jeremiahpslewis Oct 1, 2023
4b3fef3
Update build_tarballs.jl
jeremiahpslewis Oct 1, 2023
28930fc
Update build_tarballs.jl
jeremiahpslewis Oct 1, 2023
e54a1db
fix commit hash
jeremiahpslewis Oct 1, 2023
4a6f919
Update build_tarballs.jl
jeremiahpslewis Oct 1, 2023
ef0542e
Update build_tarballs.jl
jeremiahpslewis Oct 1, 2023
888e7c8
Further meson tweaks
jeremiahpslewis Oct 2, 2023
049aaf2
Fix script for mac
jeremiahpslewis Oct 3, 2023
ea0b481
Reactivate dependencies
jeremiahpslewis Oct 3, 2023
a90c971
Fix for windows
jeremiahpslewis Oct 3, 2023
5c78f80
Drop lzo for mac
jeremiahpslewis Oct 3, 2023
2c8b4de
Freetype fix
jeremiahpslewis Oct 3, 2023
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
12 changes: 5 additions & 7 deletions C/Cairo/build_tarballs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,14 @@
# `julia build_tarballs.jl --help` to see a usage message.
using BinaryBuilder
name = "Cairo"
version = v"1.16.0"
version = v"1.18.0"

sources = [
ArchiveSource("https://www.cairographics.org/releases/cairo-$(version).tar.xz",
"5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331"),
"243a0736b978a33dee29f9cca7521733b78a65b5418206fef7bd1c3d4cf10b64"),
DirectorySource("./bundled"),
]

version = v"1.16.1" # <-- This version number is a lie to build for the experimental platforms

# Bash recipe for building across all platforms
script = raw"""
cd $WORKSPACE/srcdir/cairo-*/
Expand Down Expand Up @@ -64,7 +62,7 @@ make install

# These are the platforms we will build for by default, unless further
# platforms are passed in on the command line
platforms = filter!(p -> arch(p) != "armv6l", supported_platforms(; experimental=true))
platforms = filter!(p -> arch(p) != "armv6l", supported_platforms())
jeremiahpslewis marked this conversation as resolved.
Show resolved Hide resolved

# The products that we will ensure are always built
products = [
Expand All @@ -83,8 +81,8 @@ dependencies = [
Dependency("Pixman_jll"),
Dependency("libpng_jll"),
Dependency("Fontconfig_jll"),
Dependency("FreeType2_jll"; compat="2.10.4"),
Dependency("Bzip2_jll", v"1.0.8"; compat="1.0.8"),
Dependency("FreeType2_jll"; compat="2.13.1"),
Dependency("Bzip2_jll"; compat="1.0.8")
Dependency("Xorg_libXext_jll"; platforms=linux_freebsd),
Dependency("Xorg_libXrender_jll"; platforms=linux_freebsd),
Dependency("LZO_jll"),
Expand Down