From 518ee4be0819b06b4679280245e0b8f99108be9b Mon Sep 17 00:00:00 2001
From: Martijn Visser <mgvisser@gmail.com>
Date: Wed, 9 Oct 2024 20:14:30 +0000
Subject: [PATCH 1/3] [libgeotiff] build against latest PROJ

---
 L/libgeotiff/build_tarballs.jl | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/L/libgeotiff/build_tarballs.jl b/L/libgeotiff/build_tarballs.jl
index d27aa0e7873..71b31f7899e 100644
--- a/L/libgeotiff/build_tarballs.jl
+++ b/L/libgeotiff/build_tarballs.jl
@@ -2,21 +2,21 @@ using BinaryBuilder, Pkg
 
 name = "libgeotiff"
 upstream_version = v"1.7.3"
-version_offset = v"0.1.0"
+version_offset = v"0.2.0"
 version = VersionNumber(upstream_version.major * 100 + version_offset.major,
                         upstream_version.minor * 100 + version_offset.minor,
                         upstream_version.patch * 100 + version_offset.patch)
 
 # Collection of sources required to complete build
 sources = [
-    ArchiveSource("https://github.com/OSGeo/libgeotiff/releases/download/$upstream_version/libgeotiff-$upstream_version.tar.gz",
-                  "ba23a3a35980ed3de916e125c739251f8e3266be07540200125a307d7cf5a704"),
+    GitSource("https://github.com/OSGeo/libgeotiff.git",
+        "d2c72dba35ac9d1af2201191064ca4cbe7f57f11"),
 ]
 
 # Bash recipe for building across all platforms
 script = raw"""
 
-cd $WORKSPACE/srcdir/libgeotiff-*/
+cd $WORKSPACE/srcdir/libgeotiff/libgeotiff
 
 mkdir build && cd build
 
@@ -28,6 +28,7 @@ cmake -DCMAKE_INSTALL_PREFIX=$prefix \
 
 make -j${nproc}
 make install
+install_license ../LICENSE
 """
 
 # These are the platforms we will build for by default, unless further
@@ -45,8 +46,8 @@ products = [
 
 # Dependencies that must be installed before this package can be built
 dependencies = [
-    Dependency("PROJ_jll"; compat="901.300.0"),
-    Dependency("Libtiff_jll"; compat="4.5.1"),
+    Dependency("PROJ_jll"; compat="902.500"),
+    Dependency("Libtiff_jll"; compat="4.7"),
     Dependency("LibCURL_jll"; compat="7.73,8"),
 ]
 

From 1fc03bc3d3a042914bf262818e8d1b750d1825b2 Mon Sep 17 00:00:00 2001
From: Martijn Visser <mgvisser@gmail.com>
Date: Wed, 9 Oct 2024 21:05:38 +0000
Subject: [PATCH 2/3] Set preferred_gcc_version=v"8"

---
 L/libgeotiff/build_tarballs.jl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/L/libgeotiff/build_tarballs.jl b/L/libgeotiff/build_tarballs.jl
index 71b31f7899e..b5bb94a273b 100644
--- a/L/libgeotiff/build_tarballs.jl
+++ b/L/libgeotiff/build_tarballs.jl
@@ -52,6 +52,7 @@ dependencies = [
 ]
 
 # Build the tarballs, and possibly a `build.jl` as well.
-build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies; julia_compat="1.6")
+build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies;
+    julia_compat="1.6", preferred_gcc_version=v"8")
 
 # Build trigger: 1

From b4d38e60428aa7addbc83187b4d131637650d66c Mon Sep 17 00:00:00 2001
From: Martijn Visser <mgvisser@gmail.com>
Date: Thu, 10 Oct 2024 10:36:27 +0200
Subject: [PATCH 3/3] Disable freebsd and set optional deps

---
 L/libgeotiff/build_tarballs.jl | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/L/libgeotiff/build_tarballs.jl b/L/libgeotiff/build_tarballs.jl
index b5bb94a273b..66450fec13d 100644
--- a/L/libgeotiff/build_tarballs.jl
+++ b/L/libgeotiff/build_tarballs.jl
@@ -24,6 +24,8 @@ cmake -DCMAKE_INSTALL_PREFIX=$prefix \
       -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TARGET_TOOLCHAIN} \
       -DCMAKE_BUILD_TYPE=Release \
       -DBUILD_SHARED_LIBS=ON \
+      -DWITH_JPEG=ON \
+      -DWITH_ZLIB=ON \
       ..
 
 make -j${nproc}
@@ -34,6 +36,8 @@ install_license ../LICENSE
 # These are the platforms we will build for by default, unless further
 # platforms are passed in on the command line
 platforms = supported_platforms()
+# Disable until the dependencies are available for this platform
+filter!(p -> !(Sys.isfreebsd(p) && arch(p) == "aarch64"), platforms)
 
 # The products that we will ensure are always built
 products = [
@@ -46,9 +50,11 @@ products = [
 
 # Dependencies that must be installed before this package can be built
 dependencies = [
-    Dependency("PROJ_jll"; compat="902.500"),
-    Dependency("Libtiff_jll"; compat="4.7"),
+    Dependency("JpegTurbo_jll"; compat="3.0.1"),
     Dependency("LibCURL_jll"; compat="7.73,8"),
+    Dependency("Libtiff_jll"; compat="4.7"),
+    Dependency("PROJ_jll"; compat="902.500"),
+    Dependency("Zlib_jll"; compat="1.3"),
 ]
 
 # Build the tarballs, and possibly a `build.jl` as well.