Skip to content

Commit be6f092

Browse files
authored
Merge branch 'master' into ib/ffplay_8
2 parents ae769b6 + 3bcc4b5 commit be6f092

File tree

277 files changed

+3625
-1860
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

277 files changed

+3625
-1860
lines changed

.github/component_owners.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ components:
1212
- eschnett
1313
A/AMReX/:
1414
- eschnett
15+
A/Arrow/:
16+
- evetion
17+
A/Aria2/:
18+
- evetion
1519
A/asdf_cxx/:
1620
- eschnett
1721
B/basiclu/:
@@ -72,6 +76,9 @@ components:
7276
- lgoettgens
7377
G/GDAL/:
7478
- eschnett
79+
- evetion
80+
G/geoarrow-c/:
81+
- evetion
7582
G/Git_LFS/:
7683
- cgarling
7784
G/GLPK/:
@@ -100,6 +107,8 @@ components:
100107
L/LAPACK/:
101108
- amontoison
102109
- imciner2
110+
L/LASzip/:
111+
- evetion
103112
L/LEMON/:
104113
- Krastanov
105114
L/legate/:
@@ -115,6 +124,8 @@ components:
115124
L/libblastrampoline/:
116125
- amontoison
117126
- imciner2
127+
L/licensecheck/:
128+
- ericphanson
118129
L/libigc/:
119130
- amontoison
120131
- michel2323
@@ -131,6 +142,8 @@ components:
131142
- fingolfin
132143
L/libsixel/:
133144
- eschnett
145+
M/MDAL/:
146+
- evetion
134147
M/METIS/:
135148
- amontoison
136149
M/MiniZinc/:
@@ -147,6 +160,8 @@ components:
147160
- eschnett
148161
M/MUMPS/:
149162
- amontoison
163+
N/nanoarrow/:
164+
- evetion
150165
N/Ncurses/:
151166
- eschnett
152167
N/NEO/:
@@ -195,6 +210,7 @@ components:
195210
- amontoison
196211
P/PDAL/:
197212
- eschnett
213+
- evetion
198214
P/PicoSAT:
199215
- StefanKarpinski
200216
P/polymake:
@@ -205,6 +221,7 @@ components:
205221
- amontoison
206222
P/PROJ/:
207223
- eschnett
224+
- evetion
208225
P/ProxTV/:
209226
- amontoison
210227
P/PROPACK/:
@@ -253,6 +270,8 @@ components:
253270
- amontoison
254271
S/StarPU/:
255272
- amontoison
273+
S/startin/:
274+
- evetion
256275
S/STYRENE/:
257276
- amontoison
258277
S/SuiteSparse/:

A/AMReX/build_tarballs.jl

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,25 @@
22
# `julia build_tarballs.jl --help` to see a usage message.
33
using BinaryBuilder, Pkg
44
using Base.BinaryPlatforms
5+
56
const YGGDRASIL_DIR = "../.."
67
include(joinpath(YGGDRASIL_DIR, "platforms", "mpi.jl"))
8+
include(joinpath(YGGDRASIL_DIR, "platforms", "macos_sdks.jl"))
79

810
name = "AMReX"
9-
version_string = "25.07"
11+
version_string = "25.11"
1012
version = VersionNumber(version_string)
1113

1214
# Collection of sources required to complete build
1315
sources = [
1416
ArchiveSource("https://github.com/AMReX-Codes/amrex/releases/download/$(version_string)/amrex-$(version_string).tar.gz",
15-
"19b9e5271451c202610f9c6569189c28fc05bcd655d53525df9169efeb5ee66f"),
16-
FileSource("https://github.com/phracker/MacOSX-SDKs/releases/download/10.15/MacOSX10.14.sdk.tar.xz",
17-
"0f03869f72df8705b832910517b47dd5b79eb4e160512602f593ed243b28715f"),
17+
"be9e5f04e1f3e2252a14e5bb817fb4f2c231e0901ef85ee4e14341616f6b1ba6"),
1818
]
1919

2020
# Bash recipe for building across all platforms
2121
script = raw"""
2222
cd ${WORKSPACE}/srcdir/amrex
2323
24-
if [[ "${target}" == x86_64-apple-darwin* ]]; then
25-
rm -rf /opt/${target}/${target}/sys-root/System
26-
tar --extract --file=${WORKSPACE}/srcdir/MacOSX10.14.sdk.tar.xz --directory="/opt/${target}/${target}/sys-root/." --strip-components=1 MacOSX10.14.sdk/System MacOSX10.14.sdk/usr
27-
export MACOSX_DEPLOYMENT_TARGET=10.14
28-
fi
29-
3024
# Correct HDF5 compiler wrappers
3125
perl -pi -e 's+-I/workspace/srcdir/hdf5-1[.]14[.]./src/H5FDsubfiling++' $(which h5pcc)
3226
@@ -83,6 +77,8 @@ fi
8377
install_license LICENSE
8478
"""
8579

80+
sources, script = require_macos_sdk("10.14", sources, script)
81+
8682
augment_platform_block = """
8783
using Base.BinaryPlatforms
8884
$(MPI.augment)
@@ -108,7 +104,7 @@ platforms = filter(p -> libc(p) ≠ "musl", platforms)
108104

109105
platforms, platform_dependencies = MPI.augment_platforms(platforms)
110106

111-
# Windows does not supported parallel HDF5
107+
# Windows does not support parallel HDF5
112108
hdf5_platforms = filter(!Sys.iswindows, platforms)
113109

114110
# Dependencies that must be installed before this package can be built

A/Aeron/build_tarballs.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
using BinaryBuilder, Pkg
44

55
name = "Aeron"
6-
version = v"1.48.6"
6+
version = v"1.49.0"
77

88
# Collection of sources required to complete build
99
sources = [
10-
GitSource("https://github.com/aeron-io/aeron.git", "b6bb4a0f46afa8aeec06590481f6e3418db32e3e"),
10+
GitSource("https://github.com/aeron-io/aeron.git", "4b09b14043753dfbf08517de22d9865011b7b120"),
1111
]
1212

1313
# Bash recipe for building across all platforms

A/AlphaMolWrapper/build_tarballs.jl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ using BinaryBuilder, Pkg
33
name = "AlphaMolWrapper"
44
version = v"0.5.0"
55
julia_versions = [v"1.7", v"1.8", v"1.9", v"1.10", v"1.11"]
6-
julia_compat = join("~" .* string.(getfield.(julia_versions, :major)) .* "." .* string.(getfield.(julia_versions, :minor)), ", ")
7-
86

97
sources = [
108
GitSource("https://github.com/IvanSpirandelli/AlphaMolWrapper", "e3e0dd706b6bad98d5c58b96e0a9fc6b5fb7a2a3"),
@@ -20,6 +18,7 @@ cmake .. \
2018
VERBOSE=ON cmake --build . --config Release --target install -- -j${nproc}
2119
"""
2220
include("../../L/libjulia/common.jl")
21+
julia_compat = libjulia_julia_compat(julia_versions)
2322
platforms = expand_cxxstring_abis(vcat(libjulia_platforms.(julia_versions)...))
2423

2524
products = [

A/AppBundlerUtils/build_tarballs.jl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@
33
using BinaryBuilder, Pkg
44

55
name = "AppBundlerUtils"
6-
version = v"0.1.5"
6+
version = v"0.4.0"
77

88
# Collection of sources required to complete build
99
sources = [
10-
GitSource("https://github.com/PeaceFounder/AppBundler.jl.git", "dfddaa473e9e8a11cee95ede5cd351051907f2d3")
10+
GitSource("https://github.com/PeaceFounder/AppBundler.jl.git", "776473409906752c12dbc0c80bcb6c110f626f67")
1111
]
1212

1313
# Bash recipe for building across all platforms
1414
script = raw"""
15-
cd $WORKSPACE/srcdir/AppBundler.jl/recipes/macos
15+
cd $WORKSPACE/srcdir/AppBundler.jl/utils
1616
17-
$CC -o launcher launcher.c
17+
$CC -o macos_launcher macos_launcher.c
1818
1919
install_license $WORKSPACE/srcdir/AppBundler.jl/LICENSE
20-
install -Dvm 755 "launcher" "${bindir}/macos_launcher"
20+
install -Dvm 755 "macos_launcher" "${bindir}/macos_launcher"
2121
"""
2222

2323
# These are the platforms we will build for by default, unless further

A/alive2/build_tarballs.jl

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
# `julia build_tarballs.jl --help` to see a usage message.
33
using BinaryBuilder, Pkg
44

5+
const YGGDRASIL_DIR = "../.."
6+
include(joinpath(YGGDRASIL_DIR, "platforms", "macos_sdks.jl"))
7+
58
name = "alive2"
69
version = v"0.1.0"
710

@@ -10,9 +13,6 @@ sources = Any[
1013
# An alive version from around Sep 2022 to hopefully be compatible with our LLVM version
1114
GitSource("https://github.com/AliveToolkit/alive2.git", "189436ffe02f44b710111ee5de06ca6b91aaff74"),
1215
# DirectorySource("./bundled") - Implicitly added by the LLVM configure_build
13-
# Alive2 requires C++20, which needs a newer SDK
14-
ArchiveSource("https://github.com/realjf/MacOSX-SDKs/releases/download/v0.0.1/MacOSX12.3.sdk.tar.xz",
15-
"a511c1cf1ebfe6fe3b8ec005374b9c05e89ac28b3d4eb468873f59800c02b030"),
1616
]
1717

1818
include("../../L/LLVM/common.jl")
@@ -28,21 +28,8 @@ end
2828

2929
append!(sources, llvm_sources)
3030

31-
sdk_update_script = raw"""
32-
if [[ "${target}" == *-apple-darwin* ]]; then
33-
# Install a newer SDK which supports C++20
34-
pushd $WORKSPACE/srcdir/MacOSX12.*.sdk
35-
rm -rf /opt/${target}/${target}/sys-root/System
36-
rm -rf /opt/${target}/${target}/sys-root/usr/*
37-
cp -ra usr/* "/opt/${target}/${target}/sys-root/usr/."
38-
cp -ra System "/opt/${target}/${target}/sys-root/."
39-
popd
40-
export MACOSX_DEPLOYMENT_TARGET=12.3
41-
fi
42-
"""
43-
4431
# Bash recipe for building across all platforms
45-
script = sdk_update_script * llvm_script * raw"""
32+
script = llvm_script * raw"""
4633
# Build alive2
4734
apk add re2c
4835
cd $WORKSPACE/srcdir/alive2
@@ -60,6 +47,9 @@ make -j${nproc}
6047
make install
6148
"""
6249

50+
# Alive2 requires C++20, which needs a newer SDK
51+
sources, script = require_macos_sdk("12.3", sources, script)
52+
6353
# The products that we will ensure are always built
6454
products = [
6555
ExecutableProduct("alive", :alive)

A/aws_c_cal/build_tarballs.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
using BinaryBuilder, Pkg
44

55
name = "aws_c_cal"
6-
version = v"0.9.5"
6+
version = v"0.9.9"
77

88
# Collection of sources required to complete build
99
sources = [
10-
GitSource("https://github.com/awslabs/aws-c-cal.git", "c5858e4d6b1a2faeeb551ad6acc06059a7d6f9cf"),
10+
GitSource("https://github.com/awslabs/aws-c-cal.git", "918ed33dd1b09ddef973d39c017739cfc253fc40"),
1111
ArchiveSource("https://github.com/phracker/MacOSX-SDKs/releases/download/10.15/MacOSX10.15.sdk.tar.xz",
1212
"2408d07df7f324d3beea818585a6d990ba99587c218a3969f924dfcc4de93b62"),
1313
]

A/aws_c_common/build_tarballs.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
using BinaryBuilder, Pkg
44

55
name = "aws_c_common"
6-
version = v"0.12.5"
6+
version = v"0.12.6"
77

88
# Collection of sources required to complete build
99
sources = [
10-
GitSource("https://github.com/awslabs/aws-c-common.git", "31578beb2309330fece3fb3a66035a568a2641e7"),
10+
GitSource("https://github.com/awslabs/aws-c-common.git", "95515a8b1ff40d5bb14f965ca4cbbe99ad1843df"),
1111
]
1212

1313
# Bash recipe for building across all platforms

A/aws_c_http/build_tarballs.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
using BinaryBuilder, Pkg
44

55
name = "aws_c_http"
6-
version = v"0.10.6"
6+
version = v"0.10.7"
77

88
# Collection of sources required to complete build
99
sources = [
10-
GitSource("https://github.com/awslabs/aws-c-http.git", "e638eb00423029d422aea97fcfadeb68890a2f5c"),
10+
GitSource("https://github.com/awslabs/aws-c-http.git", "07302aa4a2892adbbf95ee6d458db3bb240030d3"),
1111
]
1212

1313
# Bash recipe for building across all platforms

A/aws_c_io/build_tarballs.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
using BinaryBuilder, Pkg
44

55
name = "aws_c_io"
6-
version = v"0.23.2"
6+
version = v"0.23.3"
77

88
# Collection of sources required to complete build
99
sources = [
10-
GitSource("https://github.com/awslabs/aws-c-io.git", "1af325b54bba2e95a640a5be5ffe0b27e4ead79c"),
10+
GitSource("https://github.com/awslabs/aws-c-io.git", "9cf142c08c28d5b1195aae09d2c05a6d17502e09"),
1111
ArchiveSource("https://github.com/phracker/MacOSX-SDKs/releases/download/10.15/MacOSX10.15.sdk.tar.xz",
1212
"2408d07df7f324d3beea818585a6d990ba99587c218a3969f924dfcc4de93b62"),
1313
]
@@ -60,8 +60,8 @@ products = [
6060

6161
# Dependencies that must be installed before this package can be built
6262
dependencies = [
63-
Dependency("s2n_tls_jll"; compat="1.5.27", platforms=filter(p->Sys.islinux(p) || Sys.isfreebsd(p), platforms)),
64-
Dependency("aws_c_cal_jll"; compat="0.9.4"),
63+
Dependency("s2n_tls_jll"; compat="1.6.0", platforms=filter(p->Sys.islinux(p) || Sys.isfreebsd(p), platforms)),
64+
Dependency("aws_c_cal_jll"; compat="0.9.8"),
6565
Dependency("aws_c_common_jll"; compat="0.12.5"),
6666
BuildDependency("aws_lc_jll"),
6767
]

0 commit comments

Comments
 (0)