[Git][debian-gis-team/mapcache][master] Add patch to fix FTBFS with GDAL 3.13.0. (closes: #1134122)

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch master at Debian GIS Project / mapcache


Commits:
c1b003b4 by Bas Couwenberg at 2026-04-16T20:33:35+02:00
Add patch to fix FTBFS with GDAL 3.13.0. (closes: #1134122)

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/gdal-3.13.patch
- + debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -8,6 +8,8 @@ mapcache (1.14.1-4) UNRELEASED; urgency=medium
   * Drop Priority: optional, default since dpkg 1.22.13.
   * Bump Standards-Version to 4.7.4, changes: priority.
   * Drop obsolete Breaks/Replaces.
+  * Add patch to fix FTBFS with GDAL 3.13.0.
+    (closes: #1134122)
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 18 Jul 2025 13:31:33 +0200
 


=====================================
debian/patches/gdal-3.13.patch
=====================================
@@ -0,0 +1,23 @@
+Description: Fix FTBFS with GDAL 3.13.0.
+ error: implicit declaration of function 'MIN' [-Wimplicit-function-declaration]
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/MapServer/mapcache/issues/373#issuecomment-4262514532
+
+--- a/lib/source_gdal.c
++++ b/lib/source_gdal.c
+@@ -347,9 +347,15 @@ CreateWarpedVRT( GDALDatasetH hSrcDS,
+     {
+         double dfDesiredXRes = (extent->maxx - extent->minx) / width;
+         double dfDesiredYRes = (extent->maxy - extent->miny) / height;
++#if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(3, 13, 0)
++        double dfDesiredRes = CPL_MIN( dfDesiredXRes, dfDesiredYRes );
++        double dfGuessedFullRes = CPL_MIN( adfDstGeoTransform[1],
++                                   fabs(adfDstGeoTransform[5]) );
++#else
+         double dfDesiredRes = MIN( dfDesiredXRes, dfDesiredYRes );
+         double dfGuessedFullRes = MIN( adfDstGeoTransform[1],
+                                    fabs(adfDstGeoTransform[5]) );
++#endif
+         double dfApproxDstOvrRatio = dfDesiredRes / dfGuessedFullRes;
+ 
+         GDALRasterBandH hFirstBand = GDALGetRasterBand(hSrcDS, 1);


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+gdal-3.13.patch



View it on GitLab: https://salsa.debian.org/debian-gis-team/mapcache/-/commit/c1b003b4672cba313bf21319c2f4ae62d16f4309

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapcache/-/commit/c1b003b4672cba313bf21319c2f4ae62d16f4309
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20260416/1a837850/attachment-0001.htm>