geo/gdal: update to 3.12.4.

add hidden dep on math/muparser while here, it is a recommended
dependency for mathematical expressions in vrt files

geo/gdal/Makefile

@@ -3,7 +3,7 @@ USE_NOBTCFI-aarch64 =	Yes# fortran
 COMMENT-main =	translator library for geospatial data formats
 COMMENT-python =python bindings and utilities for GDAL
 
-V =		3.12.3
+V =		3.12.4
 DISTNAME =	gdal-${V}
 DISTFILES =	${DISTNAME}${EXTRACT_SUFX} \
 		gdalautotest-${V}.zip
@@ -58,6 +58,7 @@ LIB_DEPENDS-main =	archivers/libarchive \
 			graphics/png \
 			graphics/tiff \
 			math/hdf5 \
+			math/muparser \
 			math/netcdf \
 			math/qhull>=2020.2 \
 			net/curl \
@@ -67,7 +68,7 @@ WANTLIB-main =		Lerc archive arrow arrow_acero arrow_dataset avif c crypto \
 			curl deflate expat freexl geos_c geotiff gif hdf5 iconv jpeg \
 			json-c jxl jxl_threads lzma lz4 m netcdf openjp2 parquet \
 			pcre2-8 png poppler pq proj pthread qhull_r spatialite \
-			sqlite3 ssl tiff xml2 webp z zstd SFCGAL aec sz \
+			sqlite3 ssl tiff xml2 webp z zstd SFCGAL aec sz muparser \
 			${COMPILER_LIBCXX}
 
 RUN_DEPENDS-python =	${MODPY_RUN_DEPENDS} \

geo/gdal/distinfo

@@ -1,4 +1,4 @@
-SHA256 (gdal-3.12.3.tar.gz) = H9/lEYHQi5uDA3thHaTeSnzx/KaeZWSUWsmdP30DZ90=
-SHA256 (gdalautotest-3.12.3.zip) = oy/YnkG5xep+4j9X8yefxk1vqi0hXm02ALIqF9Au3uE=
-SIZE (gdal-3.12.3.tar.gz) = 15108176
-SIZE (gdalautotest-3.12.3.zip) = 23255528
+SHA256 (gdal-3.12.4.tar.gz) = aIRK4pVXt++uQpLDtMs6O4p50Ut2W4nFp7F8uuf6cVo=
+SHA256 (gdalautotest-3.12.4.zip) = 0iTBocNZpbuGY78qUZKh+8fRqc/gyYdHyvdQq6KHxoY=
+SIZE (gdal-3.12.4.tar.gz) = 15095868
+SIZE (gdalautotest-3.12.4.zip) = 23266101

geo/gdal/patches/patch-frmts_pdf_CMakeLists_txt

@@ -1,23 +0,0 @@
-Fix build with poppler-26.04.0 (this one is not really required,
-but it was part of the commit).
-
-From upstream commit 4c6443c7b9795d43b15fdf9c47347edae1068dd3.
-
-Index: frmts/pdf/CMakeLists.txt
---- frmts/pdf/CMakeLists.txt.orig
-+++ frmts/pdf/CMakeLists.txt
-@@ -67,11 +67,11 @@ if (GDAL_USE_POPPLER)
-   if ("${Poppler_VERSION_MINOR}" MATCHES "0?[0-9]+")
-     string(REGEX REPLACE "0?([0-9]+)" "\\1" Poppler_VERSION_MINOR ${Poppler_VERSION_MINOR})
-   endif ()
--  # POPPLER_24_05_OR_LATER used transiently (by fuzzers/build.sh) until 24.05 is actually released
--  if (Poppler_VERSION_STRING VERSION_GREATER_EQUAL "24.05" OR POPPLER_24_05_OR_LATER)
-+  if (Poppler_VERSION_STRING VERSION_GREATER_EQUAL "24.05")
-     target_compile_features(gdal_PDF PRIVATE cxx_std_20)
-   endif ()
--  target_compile_definitions(gdal_PDF PRIVATE -DHAVE_POPPLER -DPOPPLER_MAJOR_VERSION=${Poppler_VERSION_MAJOR}
-+  target_compile_definitions(gdal_PDF PRIVATE -DHAVE_POPPLER
-+                                              -DPOPPLER_MAJOR_VERSION=${Poppler_VERSION_MAJOR}
-                                               -DPOPPLER_MINOR_VERSION=${Poppler_VERSION_MINOR})
- endif ()
- if (GDAL_USE_PODOFO)

geo/gdal/patches/patch-frmts_pdf_pdfobject_cpp

@@ -1,42 +0,0 @@
-Fix build with poppler-26.04.0.
-
-From upstream commit 4c6443c7b9795d43b15fdf9c47347edae1068dd3.
-
-Index: frmts/pdf/pdfobject.cpp
---- frmts/pdf/pdfobject.cpp.orig
-+++ frmts/pdf/pdfobject.cpp
-@@ -20,6 +20,7 @@
- #include "gdal_pdf.h"
- 
- #include <limits>
-+#include <type_traits>
- #include <vector>
- #include "pdfobject.h"
- 
-@@ -1122,8 +1123,24 @@ const std::string &GDALPDFObjectPoppler::GetString()
- {
-     if (GetType() == PDFObjectType_String)
-     {
--        const GooString *gooString = m_poConst->getString();
--        const std::string &osStdStr = gooString->toStr();
-+        const std::string &osStdStr = *(
-+            [](auto &&obj) -> const std::string *
-+            {
-+                if constexpr (std::is_same_v<decltype(obj),
-+                                             const std::string &>)
-+                {
-+                    // Since Poppler 26.04
-+                    return &obj;
-+                }
-+                else
-+                {
-+                    static_assert(
-+                        std::is_same_v<decltype(obj), const GooString *&&>);
-+                    static_assert(std::is_same_v<decltype(obj->toStr()),
-+                                                 const std::string &>);
-+                    return &(obj->toStr());
-+                }
-+            }(m_poConst->getString()));
-         const bool bLEUnicodeMarker =
-             osStdStr.size() >= 2 && static_cast<uint8_t>(osStdStr[0]) == 0xFE &&
-             static_cast<uint8_t>(osStdStr[1]) == 0xFF;