[postgis-tickets] r17109 - Support Proj 6. Support is via legacy API, we need to redesign for non-legacy and Proj 7.

[Darafei]

Author: komzpa
Date: 2018-12-17 02:34:45 -0800 (Mon, 17 Dec 2018)
New Revision: 17109

Modified:
   branches/2.5/NEWS
   branches/2.5/configure.ac
   branches/2.5/liblwgeom/liblwgeom.h.in
   branches/2.5/macros/ac_proj4_version.m4
   branches/2.5/raster/macros/ac_proj4_version.m4
Log:
Support Proj 6. Support is via legacy API, we need to redesign for non-legacy and Proj 7.

Closes #4254
Closes https://github.com/postgis/postgis/pull/354


Modified: branches/2.5/NEWS
===================================================================
--- branches/2.5/NEWS	2018-12-17 10:31:51 UTC (rev 17108)
+++ branches/2.5/NEWS	2018-12-17 10:34:45 UTC (rev 17109)
@@ -2,24 +2,32 @@
 XXXX/XX/XX
 
  * Bug fixes *
+
   - #4231, Support for PostgreSQL 12dev (remove use of pg_constraint.consrc)
            (Regina Obe, Laurenz Albe)
+
   - #4247, Avoid undefined behaviour in next_float functions (Raúl Marín)
+
   - #4249, Fix undefined behaviour in raster intersection (Raúl Marín)
+
   - #4246, Fix undefined behaviour in ST_3DDistance (Raúl Marín)
+
   - #4244, Avoid unaligned memory access in BOX2D_out (Raúl Marín)
+
   - #4139, Make mixed-dimension ND index build tree correctly.
   WARNING: REINDEX your ND index on tables that have records with different M/Z
            dimensions for &&& operator to work predictably.
            (Darafei Praliaskouski, Arthur Lesuisse, Andrew Gierth, Raúl Marín)
+
   - #4262, Document MULTISURFACE compatibility of ST_LineToCurve (Steven Ottens)
 
+  - #4267, Enable Proj 6 deprecated APIs (Darafei Praliaskouski)
 
 PostGIS 2.5.1
 2018/11/18
 
  * Bug fixes *
-  - #4183, St_AsMVTGeom: Drop invalid geometries after simplification (Raúl Marín)
+  - #4183, ST_AsMVTGeom: Drop invalid geometries after simplification (Raúl Marín)
   - #4188, Avoid division by zero in kmeans (Raúl Marín)
   - #4189, Fix undefined behaviour in SADFWrite (Raúl Marín)
   - #4191, Fix undefined behaviour in ptarray_clone_deep (Raúl Marín)

Modified: branches/2.5/configure.ac
===================================================================
--- branches/2.5/configure.ac	2018-12-17 10:31:51 UTC (rev 17108)
+++ branches/2.5/configure.ac	2018-12-17 10:34:45 UTC (rev 17109)
@@ -825,7 +825,7 @@
 			AC_MSG_RESULT([Using user-specified proj directory: $PROJDIR])
 
 			dnl Add the include directory to PROJ_CPPFLAGS
-			PROJ_CPPFLAGS="-I$PROJDIR/include"
+			PROJ_CPPFLAGS="-I$PROJDIR/include -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1"
 			PROJ_LDFLAGS="-L$PROJDIR/lib"
 		else
 			AC_MSG_ERROR([the --with-projdir directory "$PROJDIR" cannot be found])
@@ -833,11 +833,11 @@
 	fi
 fi
 
-
 dnl Check that we can find the proj_api.h header file
-CPPFLAGS_SAVE="$CPPFLAGS"
-CPPFLAGS="$PROJ_CPPFLAGS"
-AC_CHECK_HEADER([proj_api.h], [], [AC_MSG_ERROR([could not find proj_api.h - you may need to specify the directory of a PROJ.4 installation using --with-projdir])])
+AC_CHECK_HEADER([proj_api.h], [], [AC_MSG_ERROR([could not find proj_api.h - you may need to specify the directory of a PROJ.4 installation using --with-projdir])],
+[
+#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H 1
+])
 
 dnl Return the PROJ.4 version number
 AC_PROJ_VERSION([POSTGIS_PROJ_VERSION])

Modified: branches/2.5/liblwgeom/liblwgeom.h.in
===================================================================
--- branches/2.5/liblwgeom/liblwgeom.h.in	2018-12-17 10:31:51 UTC (rev 17108)
+++ branches/2.5/liblwgeom/liblwgeom.h.in	2018-12-17 10:34:45 UTC (rev 17109)
@@ -32,6 +32,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdint.h>
+#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H 1
 #include "proj_api.h"
 
 #if defined(PJ_VERSION) && PJ_VERSION >= 490

Modified: branches/2.5/macros/ac_proj4_version.m4
===================================================================
--- branches/2.5/macros/ac_proj4_version.m4	2018-12-17 10:31:51 UTC (rev 17108)
+++ branches/2.5/macros/ac_proj4_version.m4	2018-12-17 10:34:45 UTC (rev 17109)
@@ -19,13 +19,14 @@
 		#ifdef HAVE_STDINT_H
         		#include <stdio.h>
 		#endif
+		#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H 1
 		#include "proj_api.h"
-	], 
+	],
 	[
-		FILE *fp; 
+		FILE *fp;
 
-		fp = fopen("conftest.out", "w"); 
-		fprintf(fp, "%d\n", PJ_VERSION); 
+		fp = fopen("conftest.out", "w");
+		fprintf(fp, "%d\n", PJ_VERSION);
 		fclose(fp)])
 	],
         [

Modified: branches/2.5/raster/macros/ac_proj4_version.m4
===================================================================
--- branches/2.5/raster/macros/ac_proj4_version.m4	2018-12-17 10:31:51 UTC (rev 17108)
+++ branches/2.5/raster/macros/ac_proj4_version.m4	2018-12-17 10:34:45 UTC (rev 17109)
@@ -30,13 +30,14 @@
 		#ifdef HAVE_STDINT_H
         		#include <stdio.h>
 		#endif
+		#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H 1
 		#include "proj_api.h"
-	], 
+	],
 	[
-		FILE *fp; 
+		FILE *fp;
 
-		fp = fopen("conftest.out", "w"); 
-		fprintf(fp, "%d\n", PJ_VERSION); 
+		fp = fopen("conftest.out", "w");
+		fprintf(fp, "%d\n", PJ_VERSION);
 		fclose(fp)])
 	],
         [