[SCM] PostGIS branch stable-3.5 updated. 3.5.2-42-g5e9bf0a63

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".

The branch, stable-3.5 has been updated
       via  5e9bf0a63aa5e8204fbcea959662b6b0dbc8d872 (commit)
      from  87a4db64f2c51980dc4e906c68520d26ad473db9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5e9bf0a63aa5e8204fbcea959662b6b0dbc8d872
Author: Regina Obe <lr at pcorp.us>
Date:   Fri May 16 22:38:25 2025 -0400

    Don't use functions deprecated in SFCGAL 2.1 when built against SFCGAL 2.1

diff --git a/NEWS b/NEWS
index e1aacdc22..a97440e59 100644
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,7 @@ PostgreSQL 12-18 required. GEOS 3.8+ required. Proj 6.1+ required.
 - #5829, geometry_columns with non-standard constraints (Paul Ramsey)
 - #5818, GT-244 Fix CG_IsSolid function (Loïc Bartoletti)
 - #5885, Fix documentation about grid-based overlay operations (Sandro Santilli)
+- For SFCGAL 2.1.0+ prevent using deprecated functions (Regina Obe)
 
 PostGIS 3.5.2
 2025/01/18
diff --git a/doc/release_notes.xml b/doc/release_notes.xml
index a56cfda34..003fce43d 100644
--- a/doc/release_notes.xml
+++ b/doc/release_notes.xml
@@ -25,6 +25,8 @@
                     <para><link xlink:href="https://trac.osgeo.org/postgis/ticket/5829">5829</link>, geometry_columns with non-standard constraints (Paul Ramsey)</para>
                     <para><link xlink:href="https://trac.osgeo.org/postgis/ticket/5818">5818</link>, <link xlink:href="https://git.osgeo.org/gitea/postgis/postgis/pulls/244">GT-244</link> Fix CG_IsSolid function (Loïc Bartoletti)</para>
                     <para><link xlink:href="https://trac.osgeo.org/postgis/ticket/5885">5885</link>, Fix documentation about grid-based overlay operations (Sandro Santilli)</para>
+                    <para>For SFCGAL 2.1.0+ prevent using deprecated functions (Regina Obe)</para>
+            </simplesect>
             </simplesect>
         </section>
         <section>
diff --git a/liblwgeom/lwgeom_sfcgal.c b/liblwgeom/lwgeom_sfcgal.c
index 2e6d11e23..6fe4c8890 100644
--- a/liblwgeom/lwgeom_sfcgal.c
+++ b/liblwgeom/lwgeom_sfcgal.c
@@ -26,12 +26,14 @@
 #include <stdio.h>
 
 #if POSTGIS_SFCGAL_VERSION >= 20100
-#define sfcgal_triangulated_surface_num_triangles(g) sfcgal_geometry_num_geometries((g))
-#define sfcgal_triangulated_surface_triangle_n(g,i)  sfcgal_geometry_get_geometry_n((g), (i))
-#define sfcgal_polyhedral_surface_num_polygons(g)    sfcgal_geometry_num_geometries((g))
-#define sfcgal_polyhedral_surface_polygon_n(g,i)     sfcgal_geometry_get_geometry_n((g), (i))
+#define sfcgal_triangulated_surface_num_triangles(g) sfcgal_geometry_num_patches((g))
+#define sfcgal_triangulated_surface_triangle_n(g,i) sfcgal_triangulated_surface_patch_n((g), (i))
+#define sfcgal_triangulated_surface_add_triangle(g, p) sfcgal_triangulated_surface_add_patch((g), (p))
+#define sfcgal_polyhedral_surface_num_polygons(g) sfcgal_polyhedral_surface_num_patches((g))
+#define sfcgal_polyhedral_surface_polygon_n(g,i) sfcgal_polyhedral_surface_patch_n((g), (i))
 #define sfcgal_geometry_collection_num_geometries(g) sfcgal_geometry_num_geometries((g))
-#define sfcgal_geometry_collection_geometry_n(g,i)   sfcgal_geometry_get_geometry_n((g), (i))
+#define sfcgal_geometry_collection_geometry_n(g,i) sfcgal_geometry_get_geometry_n((g), (i))
+#define sfcgal_polyhedral_surface_add_polygon(g, p) sfcgal_polyhedral_surface_add_patch((g), (p))
 #endif
 
 static int SFCGAL_type_to_lwgeom_type(sfcgal_geometry_type_t type);

-----------------------------------------------------------------------

Summary of changes:
 NEWS                      |  1 +
 doc/release_notes.xml     |  2 ++
 liblwgeom/lwgeom_sfcgal.c | 12 +++++++-----
 3 files changed, 10 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
PostGIS