<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0ec2ba14ded9ba33020ba2f966bfe0a56a08981d">https://github.com/macports/macports-ports/commit/0ec2ba14ded9ba33020ba2f966bfe0a56a08981d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0ec2ba14ded9ba33020ba2f966bfe0a56a08981d
</span>Author: Nicklas Larsson <n_larsson@yahoo.com>
AuthorDate: Thu Nov 30 22:43:38 2023 +0100
<span style='display:block; white-space:pre;color:#404040;'> gdal, py*-gdal: update to version 3.8.1
</span>---
gis/gdal/Portfile | 13 +++------
...e_bulk_load.c-define-__STDC_FORMAT_MACROS.patch | 25 -----------------
gis/gdal/files/patch-build-for-libxml2-12.diff | 32 ----------------------
python/py-gdal/Portfile | 8 +++---
4 files changed, 8 insertions(+), 70 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/Portfile b/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1a0920061dd..d36ca04c9c0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,12 +8,12 @@ PortGroup legacysupport 1.0
</span> PortGroup muniversal 1.0
name gdal
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.8.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.8.1
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 21ca0198e5fa72efdb535118ab7ffa141b9671ce \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ec0f78d9dc32352aeac6edc9c3b27a991b91f9dc6f92c452207d84431c58757d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 8853728
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 64b2072ea8d97ee3cc331c7d035b932317def9b3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 75a20b23879bfa3d8c0db68e1d6f8b924f7f9d97f5fed089b01a72e404293900 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 8860344
</span>
categories gis
license MIT BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,11 +48,6 @@ cmake.set_cxx_standard yes
</span> # See https://trac.macports.org/ticket/56908
compiler.thread_local_storage yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/OSGeo/gdal/pull/8748
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/68734
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append 0001-sqlite_rtree_bulk_load.c-define-__STDC_FORMAT_MACROS.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# for GDAL 3.8.0 with libxml2 2.12
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-build-for-libxml2-12.diff
</span> # https://trac.macports.org/ticket/68716
patchfiles-append patch-have_shared_mutex.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/files/0001-sqlite_rtree_bulk_load.c-define-__STDC_FORMAT_MACROS.patch b/gis/gdal/files/0001-sqlite_rtree_bulk_load.c-define-__STDC_FORMAT_MACROS.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index cd9ea434414..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal/files/0001-sqlite_rtree_bulk_load.c-define-__STDC_FORMAT_MACROS.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,25 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From b0e8b43f019ce12a3234036a7267d1a7dbd7d318 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: barracuda156 <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sun, 19 Nov 2023 13:07:23 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] sqlite_rtree_bulk_load.c: define __STDC_FORMAT_MACROS to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unbreak build on platforms which need it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .../sqlite/sqlite_rtree_bulk_load/sqlite_rtree_bulk_load.c | 4 ++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 4 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git ogr/ogrsf_frmts/sqlite/sqlite_rtree_bulk_load/sqlite_rtree_bulk_load.c ogr/ogrsf_frmts/sqlite/sqlite_rtree_bulk_load/sqlite_rtree_bulk_load.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b19d91808b..598d5047bd 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ogr/ogrsf_frmts/sqlite/sqlite_rtree_bulk_load/sqlite_rtree_bulk_load.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ogr/ogrsf_frmts/sqlite/sqlite_rtree_bulk_load/sqlite_rtree_bulk_load.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26,6 +26,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * DEALINGS IN THE SOFTWARE.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ****************************************************************************/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __STDC_FORMAT_MACROS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define __STDC_FORMAT_MACROS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "sqlite_rtree_bulk_load.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <assert.h>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/files/patch-build-for-libxml2-12.diff b/gis/gdal/files/patch-build-for-libxml2-12.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1b5986b0ee6..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal/files/patch-build-for-libxml2-12.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,32 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Patch to enable GDAL 3.8.0 build with libxml2 2.12, as noted in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://lists.osgeo.org/pipermail/gdal-dev/2023-November/057965.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gcore/gdaljp2metadatagenerator.cpp.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gcore/gdaljp2metadatagenerator.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -357,7 +357,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /************************************************************************/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void GDALGMLJP2XPathErrorHandler(void * /* userData */,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- xmlErrorPtr error)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if LIBXML_VERSION >= 21200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const xmlError *error
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ xmlErrorPtr error
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (error->domain == XML_FROM_XPATH && error->str1 != nullptr &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- error->int1 < static_cast<int>(strlen(error->str1)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- port/cpl_xml_validate.cpp.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ port/cpl_xml_validate.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -914,7 +914,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (strstr(pszStr, "since this namespace was already imported") == nullptr)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- xmlErrorPtr pErrorPtr = xmlGetLastError();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const xmlError *pErrorPtr = xmlGetLastError();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char *pszFilename = static_cast<char *>(ctx);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *pszStrDup = CPLStrdup(pszStr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int nLen = static_cast<int>(strlen(pszStrDup));
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-gdal/Portfile b/python/py-gdal/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 859a6c62e20..09310f11620 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-gdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-gdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup select 1.0
</span> name py-gdal
python.rootname GDAL
# keep version in sync with gdal; rebuilt after gdal update
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.8.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.8.1
</span> revision 0
categories-append gis
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,9 +20,9 @@ long_description This Python package and extensions are a number of tools for
</span>
homepage https://www.gdal.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 852e0f7daeb42c109416298ff1c2d89736d07362 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9ec312ccd48a1182603feebb38de7bf2e824d16fbefbd8f2e5041a3af2aada07 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 802260
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 2d5d4a09a79920c090a0559cd0f9419c2bec25ae \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 92bab022810bf7e218cfc15cdd58f100b2f15b81bba24e12bb156d67c707bbb3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 802319
</span>
python.versions 38 39 310 311
</pre><pre style='margin:0'>
</pre>