Mercurial > mxe-octave

changeset 6975:7ee99a2a1459

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gdal: xml updates * src/gdal.mk: build in build folder * src/gdal-1-fixes.patch: patch for xml changes
author John Donoghue <john.donoghue@ieee.org>
date Sun, 19 Nov 2023 15:35:08 -0500
parents 26702b4a915a
children f0f5513c9782
files src/gdal-1-fixes.patch src/gdal.mk
diffstat 2 files changed, 34 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gdal-1-fixes.patch	Sun Nov 19 15:35:08 2023 -0500
@@ -0,0 +1,29 @@
+diff -ur gdal-3.8.0.orig/gcore/gdaljp2metadatagenerator.cpp gdal-3.8.0/gcore/gdaljp2metadatagenerator.cpp
+--- gdal-3.8.0.orig/gcore/gdaljp2metadatagenerator.cpp	2023-11-18 10:50:42.858058910 -0500
++++ gdal-3.8.0/gcore/gdaljp2metadatagenerator.cpp	2023-11-18 10:52:52.805490659 -0500
+@@ -357,7 +357,12 @@
+ /************************************************************************/
+ 
+ static void GDALGMLJP2XPathErrorHandler(void * /* userData */,
+-                                        xmlErrorPtr error)
++#if LIBXML_VERSION >= 21200
++                                        const xmlError *error
++#else
++                                        xmlErrorPtr error
++#endif
++)
+ {
+     if (error->domain == XML_FROM_XPATH && error->str1 != nullptr &&
+         error->int1 < static_cast<int>(strlen(error->str1)))
+diff -ur gdal-3.8.0.orig/port/cpl_xml_validate.cpp gdal-3.8.0/port/cpl_xml_validate.cpp
+--- gdal-3.8.0.orig/port/cpl_xml_validate.cpp	2023-11-18 13:23:43.173950425 -0500
++++ gdal-3.8.0/port/cpl_xml_validate.cpp	2023-11-18 13:26:22.462050184 -0500
+@@ -914,7 +914,7 @@
+ 
+     if (strstr(pszStr, "since this namespace was already imported") == nullptr)
+     {
+-        xmlErrorPtr pErrorPtr = xmlGetLastError();
++        const xmlError *pErrorPtr = xmlGetLastError();
+         const char *pszFilename = static_cast<char *>(ctx);
+         char *pszStrDup = CPLStrdup(pszStr);
+         int nLen = static_cast<int>(strlen(pszStrDup));
--- a/src/gdal.mk	Fri Nov 17 07:48:46 2023 -0500
+++ b/src/gdal.mk	Sun Nov 19 15:35:08 2023 -0500
@@ -15,7 +15,8 @@
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && cmake \
+    mkdir '$(1).build'
+    cd '$(1).build' && cmake \
         $($(PKG)_CMAKE_FLAGS) \
         -DBUILD_TESTING=no \
         $(CMAKE_CCACHE_FLAGS) \
@@ -24,7 +25,6 @@
         -DBUILD_APPS=OFF \
         -DGDAL_USE_ARMADILLO=OFF \
         -DGDAL_USE_ARROW=OFF \
-        -DGDAL_USE_GDAL_BASISU=OFF \
         -DGDAL_USE_BLOSC=OFF \
         -DGDAL_USE_BRUNSLI=OFF \
         -DGDAL_USE_CFITSIO=OFF \
@@ -78,7 +78,6 @@
         -DGDAL_USE_PNG=ON \
         -DGDAL_USE_POPPLER=OFF \
         -DGDAL_USE_POSTGRESQL=ON \
-        -DGDAL_USE_QB3=OFF \
         -DGDAL_USE_QHULL=ON \
         -DGDAL_USE_RASTERLITE2=OFF \
         -DGDAL_USE_RDB=OFF \
@@ -95,8 +94,8 @@
         -DBUILD_PYTHON_BINDINGS=OFF \
         -DBUILD_JAVA_BINDINGS=OFF \
         -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
-        .
+        $(1)
 
-    $(MAKE) -C '$(1)' -j '$(JOBS)' VERBOSE=1
-    $(MAKE) -C '$(1)' -j '1' VERBOSE=1 DESTDIR='$(3)' install
+    $(MAKE) -C '$(1).build' -j '$(JOBS)' VERBOSE=1
+    $(MAKE) -C '$(1).build' -j '1' VERBOSE=1 DESTDIR='$(3)' install
 endef