From 92f0508653bac8c152eaa2a2725418c7335fd26a Mon Sep 17 00:00:00 2001
From: cvanelteren <caspervanelteren@gmail.com>
Date: Tue, 25 Feb 2025 08:30:24 +0100
Subject: [PATCH 01/16] add macos

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b4a1b275..21d5403e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -48,7 +48,7 @@ jobs:
     needs: [build_data]
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
         include:
           - os: ubuntu-latest
             before_all: >-

From 47fd818305bb255c90b0990945235f2b1bf25af4 Mon Sep 17 00:00:00 2001
From: cvanelteren <caspervanelteren@gmail.com>
Date: Tue, 25 Feb 2025 08:34:36 +0100
Subject: [PATCH 02/16] update cibuild

---
 .github/workflows/build.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 21d5403e..e9f2dac5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -56,6 +56,12 @@ jobs:
               echo "GEOS_DIR set to: ${GEOS_DIR}" &&
               cd "{package}" &&
               python -c "import utils; utils.GeosLibrary('${GEOS_VERSION}').build('${GEOS_DIR}', njobs=2)"
+          - os: macos-latest
+            before_all: >-
+              echo "Starting BEFORE_ALL script" &&
+              echo "GEOS_DIR set to: ${GEOS_DIR}" &&
+              cd "{package}" &&
+              python -c "import utils; utils.GeosLibrary('${GEOS_VERSION}').build('${GEOS_DIR}', njobs=2)"
           - os: windows-latest
             before_all: >-
               echo Starting BEFORE_ALL script &&

From 0641ba68742462d5999a5a19608acd0e5224d92c Mon Sep 17 00:00:00 2001
From: cvanelteren <caspervanelteren@gmail.com>
Date: Tue, 25 Feb 2025 08:41:43 +0100
Subject: [PATCH 03/16] add macos arm builds

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e9f2dac5..fbaaa383 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -89,7 +89,7 @@ jobs:
         env:
           CIBW_BUILD_VERBOSITY: 1
           CIBW_BUILD: "cp39* cp310* cp311* cp312* cp313*"
-          CIBW_SKIP: "pp* *-musllinux_* *-win32 *-manylinux_i686 *-musllinux_i686 *-aarch64 *-armv7l"
+          CIBW_SKIP: "pp* *-musllinux_* *-win32 *-manylinux_i686 *-musllinux_i686 *-linux_aarch64 *-linux_armv7l"
           CIBW_BEFORE_ALL: ${{ matrix.before_all }}
           CIBW_TEST_EXTRAS: "test"
           CIBW_TEST_COMMAND: "python -m pytest {project}/packages/basemap"

From 2e000789059b13eb601f8de20eb06a587ad9163d Mon Sep 17 00:00:00 2001
From: cvanelteren <caspervanelteren@gmail.com>
Date: Tue, 25 Feb 2025 10:16:12 +0100
Subject: [PATCH 04/16] add explicit x86 support for macos

---
 .github/workflows/build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fbaaa383..8f62ba10 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -89,6 +89,7 @@ jobs:
         env:
           CIBW_BUILD_VERBOSITY: 1
           CIBW_BUILD: "cp39* cp310* cp311* cp312* cp313*"
+          CIBW_ARCHS_MACOS: "x86_64 arm64"
           CIBW_SKIP: "pp* *-musllinux_* *-win32 *-manylinux_i686 *-musllinux_i686 *-linux_aarch64 *-linux_armv7l"
           CIBW_BEFORE_ALL: ${{ matrix.before_all }}
           CIBW_TEST_EXTRAS: "test"

From 8780bd3ad9f51ebac513cd30faf7e84c3b3e380f Mon Sep 17 00:00:00 2001
From: cvanelteren <caspervanelteren@gmail.com>
Date: Tue, 25 Feb 2025 10:46:54 +0100
Subject: [PATCH 05/16] set arch flags for macos

---
 .github/workflows/build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8f62ba10..26d20b63 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -58,6 +58,7 @@ jobs:
               python -c "import utils; utils.GeosLibrary('${GEOS_VERSION}').build('${GEOS_DIR}', njobs=2)"
           - os: macos-latest
             before_all: >-
+              ARCHFLAGS="-arch x86_64 -arch arm64"
               echo "Starting BEFORE_ALL script" &&
               echo "GEOS_DIR set to: ${GEOS_DIR}" &&
               cd "{package}" &&

From d2695754caba73e482a449065d0395e026a0a7ce Mon Sep 17 00:00:00 2001
From: cvanelteren <caspervanelteren@gmail.com>
Date: Tue, 25 Feb 2025 10:58:29 +0100
Subject: [PATCH 06/16] update ld path

---
 .github/workflows/build.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 26d20b63..f0813d38 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -58,6 +58,9 @@ jobs:
               python -c "import utils; utils.GeosLibrary('${GEOS_VERSION}').build('${GEOS_DIR}', njobs=2)"
           - os: macos-latest
             before_all: >-
+              ARCHFLAGS="-arch x86_64 -arch arm64"
+              LD_LIBRARY_PATH="${GEOS_DIR}/lib:$LD_LIBRARY_PATH"
+              DYLD_FALLBACK_LIBRARY_PATH="${GEOS_DIR}/lib:$DYLD_FALLBACK_LIBRARY_PATH"
               ARCHFLAGS="-arch x86_64 -arch arm64"
               echo "Starting BEFORE_ALL script" &&
               echo "GEOS_DIR set to: ${GEOS_DIR}" &&

From 4e4d2dc1e8747d5576e74a5c38626dff4c9cc9ae Mon Sep 17 00:00:00 2001
From: cvanelteren <caspervanelteren@gmail.com>
Date: Tue, 25 Feb 2025 11:18:25 +0100
Subject: [PATCH 07/16] add macos-13 for x86 builds

---
 .github/workflows/build.yml | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f0813d38..9d39bbdd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -51,14 +51,23 @@ jobs:
         os: [ubuntu-latest, windows-latest, macos-latest]
         include:
           - os: ubuntu-latest
+            arch: x86_64
             before_all: >-
               echo "Starting BEFORE_ALL script" &&
               echo "GEOS_DIR set to: ${GEOS_DIR}" &&
               cd "{package}" &&
               python -c "import utils; utils.GeosLibrary('${GEOS_VERSION}').build('${GEOS_DIR}', njobs=2)"
-          - os: macos-latest
+          - os: macos-13:
             before_all: >-
+              LD_LIBRARY_PATH="${GEOS_DIR}/lib:$LD_LIBRARY_PATH"
+              DYLD_FALLBACK_LIBRARY_PATH="${GEOS_DIR}/lib:$DYLD_FALLBACK_LIBRARY_PATH"
               ARCHFLAGS="-arch x86_64 -arch arm64"
+              echo "Starting BEFORE_ALL script" &&
+              echo "GEOS_DIR set to: ${GEOS_DIR}" &&
+              cd "{package}" &&
+              python -c "import utils; utils.GeosLibrary('${GEOS_VERSION}').build('${GEOS_DIR}', njobs=2)"
+          - os: macos-latest
+            before_all: >-
               LD_LIBRARY_PATH="${GEOS_DIR}/lib:$LD_LIBRARY_PATH"
               DYLD_FALLBACK_LIBRARY_PATH="${GEOS_DIR}/lib:$DYLD_FALLBACK_LIBRARY_PATH"
               ARCHFLAGS="-arch x86_64 -arch arm64"
@@ -67,6 +76,7 @@ jobs:
               cd "{package}" &&
               python -c "import utils; utils.GeosLibrary('${GEOS_VERSION}').build('${GEOS_DIR}', njobs=2)"
           - os: windows-latest
+            arch: x86_64
             before_all: >-
               echo Starting BEFORE_ALL script &&
               echo GEOS_DIR set to: %GEOS_DIR% &&
@@ -93,7 +103,7 @@ jobs:
         env:
           CIBW_BUILD_VERBOSITY: 1
           CIBW_BUILD: "cp39* cp310* cp311* cp312* cp313*"
-          CIBW_ARCHS_MACOS: "x86_64 arm64"
+          CIBW_ARCHS_MACOS: ${{ matrix.arch }}
           CIBW_SKIP: "pp* *-musllinux_* *-win32 *-manylinux_i686 *-musllinux_i686 *-linux_aarch64 *-linux_armv7l"
           CIBW_BEFORE_ALL: ${{ matrix.before_all }}
           CIBW_TEST_EXTRAS: "test"

From 06a0d798e3b6e2c6cb92ebe1c7522709523c6ced Mon Sep 17 00:00:00 2001
From: cvanelteren <caspervanelteren@gmail.com>
Date: Tue, 25 Feb 2025 11:19:45 +0100
Subject: [PATCH 08/16] update strategy

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9d39bbdd..22687177 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -48,7 +48,7 @@ jobs:
     needs: [build_data]
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
         include:
           - os: ubuntu-latest
             arch: x86_64

From 9860f9f40c5d14902ff59b06af8fe904805137af Mon Sep 17 00:00:00 2001
From: cvanelteren <caspervanelteren@gmail.com>
Date: Tue, 25 Feb 2025 11:20:32 +0100
Subject: [PATCH 09/16] typo

---
 .github/workflows/build.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 22687177..f626fde9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -48,7 +48,8 @@ jobs:
     needs: [build_data]
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
+        os:
+          [ubuntu-latest, windows-latest, macos-latest, macos-13]
         include:
           - os: ubuntu-latest
             arch: x86_64
@@ -57,7 +58,7 @@ jobs:
               echo "GEOS_DIR set to: ${GEOS_DIR}" &&
               cd "{package}" &&
               python -c "import utils; utils.GeosLibrary('${GEOS_VERSION}').build('${GEOS_DIR}', njobs=2)"
-          - os: macos-13:
+          - os: macos-13
             before_all: >-
               LD_LIBRARY_PATH="${GEOS_DIR}/lib:$LD_LIBRARY_PATH"
               DYLD_FALLBACK_LIBRARY_PATH="${GEOS_DIR}/lib:$DYLD_FALLBACK_LIBRARY_PATH"

From 7e58cc86c453b46ec18346dd4db147580abdf475 Mon Sep 17 00:00:00 2001
From: cvanelteren <caspervanelteren@gmail.com>
Date: Tue, 25 Feb 2025 11:34:58 +0100
Subject: [PATCH 10/16] add arch

---
 .github/workflows/build.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f626fde9..c385005f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -59,6 +59,7 @@ jobs:
               cd "{package}" &&
               python -c "import utils; utils.GeosLibrary('${GEOS_VERSION}').build('${GEOS_DIR}', njobs=2)"
           - os: macos-13
+            arch: x86_64
             before_all: >-
               LD_LIBRARY_PATH="${GEOS_DIR}/lib:$LD_LIBRARY_PATH"
               DYLD_FALLBACK_LIBRARY_PATH="${GEOS_DIR}/lib:$DYLD_FALLBACK_LIBRARY_PATH"
@@ -68,6 +69,7 @@ jobs:
               cd "{package}" &&
               python -c "import utils; utils.GeosLibrary('${GEOS_VERSION}').build('${GEOS_DIR}', njobs=2)"
           - os: macos-latest
+            arch: arm64
             before_all: >-
               LD_LIBRARY_PATH="${GEOS_DIR}/lib:$LD_LIBRARY_PATH"
               DYLD_FALLBACK_LIBRARY_PATH="${GEOS_DIR}/lib:$DYLD_FALLBACK_LIBRARY_PATH"

From cb009396ad77cbe128809c8c218ef9e7b061892d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?=
 <molinav@users.noreply.github.com>
Date: Tue, 25 Feb 2025 19:43:18 +0100
Subject: [PATCH 11/16] Remove LD_LIBRARY_PATH from MacOS before_all block

---
 .github/workflows/build.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c385005f..3b026b0e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -61,7 +61,6 @@ jobs:
           - os: macos-13
             arch: x86_64
             before_all: >-
-              LD_LIBRARY_PATH="${GEOS_DIR}/lib:$LD_LIBRARY_PATH"
               DYLD_FALLBACK_LIBRARY_PATH="${GEOS_DIR}/lib:$DYLD_FALLBACK_LIBRARY_PATH"
               ARCHFLAGS="-arch x86_64 -arch arm64"
               echo "Starting BEFORE_ALL script" &&
@@ -71,7 +70,6 @@ jobs:
           - os: macos-latest
             arch: arm64
             before_all: >-
-              LD_LIBRARY_PATH="${GEOS_DIR}/lib:$LD_LIBRARY_PATH"
               DYLD_FALLBACK_LIBRARY_PATH="${GEOS_DIR}/lib:$DYLD_FALLBACK_LIBRARY_PATH"
               ARCHFLAGS="-arch x86_64 -arch arm64"
               echo "Starting BEFORE_ALL script" &&

From 28bbd170417b6c6ab64e25a3d0e14148915dbda6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?=
 <molinav@users.noreply.github.com>
Date: Tue, 25 Feb 2025 20:00:35 +0100
Subject: [PATCH 12/16] Replace macos-latest with macos-14

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3b026b0e..041a7a68 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -49,7 +49,7 @@ jobs:
     strategy:
       matrix:
         os:
-          [ubuntu-latest, windows-latest, macos-latest, macos-13]
+          [ubuntu-latest, windows-latest, macos-13, macos-14]
         include:
           - os: ubuntu-latest
             arch: x86_64
@@ -67,7 +67,7 @@ jobs:
               echo "GEOS_DIR set to: ${GEOS_DIR}" &&
               cd "{package}" &&
               python -c "import utils; utils.GeosLibrary('${GEOS_VERSION}').build('${GEOS_DIR}', njobs=2)"
-          - os: macos-latest
+          - os: macos-14
             arch: arm64
             before_all: >-
               DYLD_FALLBACK_LIBRARY_PATH="${GEOS_DIR}/lib:$DYLD_FALLBACK_LIBRARY_PATH"

From 19f0b8f70547dc47a30d6f96ed1d3810a5ac8e6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?=
 <molinav@users.noreply.github.com>
Date: Tue, 25 Feb 2025 20:01:08 +0100
Subject: [PATCH 13/16] Remove DYLD_FALLBACK_LIBRARY_PATH from MacOS before_all
 block

---
 .github/workflows/build.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 041a7a68..2b2df731 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -61,7 +61,6 @@ jobs:
           - os: macos-13
             arch: x86_64
             before_all: >-
-              DYLD_FALLBACK_LIBRARY_PATH="${GEOS_DIR}/lib:$DYLD_FALLBACK_LIBRARY_PATH"
               ARCHFLAGS="-arch x86_64 -arch arm64"
               echo "Starting BEFORE_ALL script" &&
               echo "GEOS_DIR set to: ${GEOS_DIR}" &&
@@ -70,7 +69,6 @@ jobs:
           - os: macos-14
             arch: arm64
             before_all: >-
-              DYLD_FALLBACK_LIBRARY_PATH="${GEOS_DIR}/lib:$DYLD_FALLBACK_LIBRARY_PATH"
               ARCHFLAGS="-arch x86_64 -arch arm64"
               echo "Starting BEFORE_ALL script" &&
               echo "GEOS_DIR set to: ${GEOS_DIR}" &&

From 343af4f4146f3c431a681f122b2f55731ea42303 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?=
 <molinav@users.noreply.github.com>
Date: Tue, 25 Feb 2025 20:26:45 +0100
Subject: [PATCH 14/16] Remove ARCHFLAGS from MacOS before_all block

---
 .github/workflows/build.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2b2df731..a4546f74 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -61,7 +61,6 @@ jobs:
           - os: macos-13
             arch: x86_64
             before_all: >-
-              ARCHFLAGS="-arch x86_64 -arch arm64"
               echo "Starting BEFORE_ALL script" &&
               echo "GEOS_DIR set to: ${GEOS_DIR}" &&
               cd "{package}" &&
@@ -69,7 +68,6 @@ jobs:
           - os: macos-14
             arch: arm64
             before_all: >-
-              ARCHFLAGS="-arch x86_64 -arch arm64"
               echo "Starting BEFORE_ALL script" &&
               echo "GEOS_DIR set to: ${GEOS_DIR}" &&
               cd "{package}" &&

From 79b94231b14e8c8874fefca6aaf7728382b80cb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?=
 <molinav@users.noreply.github.com>
Date: Tue, 25 Feb 2025 20:56:16 +0100
Subject: [PATCH 15/16] Update comment about LD_LIBRARY_PATH

---
 .github/workflows/build.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a4546f74..6c518d3b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -111,7 +111,8 @@ jobs:
             PIP_PREFER_BINARY=1
             PYTHONUNBUFFERED=1
             LD_LIBRARY_PATH="${GEOS_DIR}/lib"
-          # LD_LIBRARY_PATH in environment is needed by auditwheel (Linux).
+          # LD_LIBRARY_PATH in environment is needed by
+          # auditwheel (Linux) and delocate (MacOS).
         with:
           package-dir: "packages/basemap"
           output-dir: "packages/basemap/dist"

From b19d33decf0cf50288cc2dc776c976e6bb64aa05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?=
 <molinav@users.noreply.github.com>
Date: Tue, 25 Feb 2025 20:56:42 +0100
Subject: [PATCH 16/16] Remove redundant entry in workflow matrix

---
 .github/workflows/build.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6c518d3b..e1f43644 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -48,8 +48,6 @@ jobs:
     needs: [build_data]
     strategy:
       matrix:
-        os:
-          [ubuntu-latest, windows-latest, macos-13, macos-14]
         include:
           - os: ubuntu-latest
             arch: x86_64