From cdbdca9d3cf56da7f6e8e6c5235d62be04bc3a3f Mon Sep 17 00:00:00 2001 From: Jeremiah <4462211+jeremiahpslewis@users.noreply.github.com> Date: Tue, 19 Sep 2023 13:49:26 +0200 Subject: [PATCH 1/3] [OpenJpeg] Bump to v2.5 --- O/OpenJpeg/build_tarballs.jl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/O/OpenJpeg/build_tarballs.jl b/O/OpenJpeg/build_tarballs.jl index c6e37969e5f..fb052168878 100644 --- a/O/OpenJpeg/build_tarballs.jl +++ b/O/OpenJpeg/build_tarballs.jl @@ -3,18 +3,18 @@ using BinaryBuilder, Pkg name = "OpenJpeg" -version = v"2.4.0" +version = v"2.5.0" # Collection of sources required to complete build sources = [ - ArchiveSource("https://github.com/uclouvain/openjpeg/archive/v$(version)/openjpeg-$(version).tar.gz", - "8702ba68b442657f11aaeb2b338443ca8d5fb95b0d845757968a7be31ef7f16d"), + GitSource("https://github.com/uclouvain/openjpeg.git", + "a5891555eb49ed7cc26b2901ea680acda136d811"), DirectorySource("./bundled") ] # Bash recipe for building across all platforms script = raw""" -cd $WORKSPACE/srcdir/openjpeg-*/ +cd $WORKSPACE/srcdir/openjpeg/ for f in ${WORKSPACE}/srcdir/patches/*.patch; do atomic_patch -p1 ${f} done @@ -39,7 +39,7 @@ products = [ dependencies = [ Dependency(PackageSpec(name="LittleCMS_jll", uuid="d3a379c0-f9a3-5b72-a4c0-6bf4d2e8af0f")) Dependency(PackageSpec(name="libpng_jll", uuid="b53b4c65-9356-5827-b1ea-8c7a1a84506f")) - Dependency("Libtiff_jll"; compat="4.3.0") + Dependency("Libtiff_jll"; compat="4.5.1") ] # Build the tarballs, and possibly a `build.jl` as well. From 569a38dffd8198c174466483edb95d4cf9b87772 Mon Sep 17 00:00:00 2001 From: Jeremiah <4462211+jeremiahpslewis@users.noreply.github.com> Date: Tue, 19 Sep 2023 15:07:06 +0200 Subject: [PATCH 2/3] Update O/OpenJpeg/build_tarballs.jl --- O/OpenJpeg/build_tarballs.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/O/OpenJpeg/build_tarballs.jl b/O/OpenJpeg/build_tarballs.jl index fb052168878..e628f2d0543 100644 --- a/O/OpenJpeg/build_tarballs.jl +++ b/O/OpenJpeg/build_tarballs.jl @@ -39,7 +39,7 @@ products = [ dependencies = [ Dependency(PackageSpec(name="LittleCMS_jll", uuid="d3a379c0-f9a3-5b72-a4c0-6bf4d2e8af0f")) Dependency(PackageSpec(name="libpng_jll", uuid="b53b4c65-9356-5827-b1ea-8c7a1a84506f")) - Dependency("Libtiff_jll"; compat="4.5.1") + Dependency("Libtiff_jll"; compat="~4.5.1") ] # Build the tarballs, and possibly a `build.jl` as well. From 64cd2790905cc3f0062a606673bfbae818be92b5 Mon Sep 17 00:00:00 2001 From: Jeremiah <4462211+jeremiahpslewis@users.noreply.github.com> Date: Wed, 20 Sep 2023 11:46:26 +0200 Subject: [PATCH 3/3] Syntax update --- O/OpenJpeg/build_tarballs.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/O/OpenJpeg/build_tarballs.jl b/O/OpenJpeg/build_tarballs.jl index e628f2d0543..d642f05b090 100644 --- a/O/OpenJpeg/build_tarballs.jl +++ b/O/OpenJpeg/build_tarballs.jl @@ -25,7 +25,7 @@ make install # These are the platforms we will build for by default, unless further # platforms are passed in on the command line -platforms = supported_platforms(; experimental=true) +platforms = supported_platforms() # The products that we will ensure are always built products = [