[proj4] Upgrade version to 6.1.1 and remove patches. (#7917)

* [proj4]Upgrade version to 6.1.1 and remove useless patches.

* [libgeotiff]Fix build errors using proj4 6.1.1.

* [libspatialite]Fix build errors using proj4 6.1.1.

* [gdal]Fix build errors using proj4 6.1.1.

* [spatialite-tools]Fix build errors using proj4 6.1.1.

* [spatialite-tools]Fix build errors using proj4 6.1.1.

* [libgeotiff]Re-fix build errors using proj4 6.1.1.

* [vtk]Fix build errors using proj4 6.1.1.

* [proj4]Fix find sqlite binary failure.

* [proj4]Disable build tools when building proj4 in arm/uwp.

* [sqlite3/libgeotiff]Fix libdl library linkage. Re-fix use proj issue.

* add back dl libs

* [gdal]Fix dependent port proj library name.

* [proj4]Set Windows library name to "proj" and revert fix-proj-name changes.

* [liblas]Fix build errors using proj4 6.1.1.

* [liblas]Fix build errors using proj4 6.1.1.

* [liblas]Fix build errors using proj4 6.1.1.

* [proj4]Fix feature database on triplet arm/uwp.

* [gdal]Remove useless flag PROJ_STATIC.

* [proj4]Fix build error on x64-windows-static.

* [liblas]Use find_library to get proj4/sqlite3 libraries.

* [proj4]Fix sqlite dependency.

* [proj4]Fix arm/uwp dependency.

* [proj4]Fix linux build: configure error.

* [proj4]Disable export proj4 namespace.

* [liblas]Delete proj dependency.

* [libspatialite]Fix linux build.

* [libspatialite]Fix linux command.

* [libspatialite]Fix configure error.

* [proj4]fix static cmake tools path.

* [libgeotiff]Set configure options to 1/0 to avoid the "if" comparison failure in config.cmake.
[proj4]Revert changes about namespace.
[liblas]Remove FindPROJ4.cmake and FindGeoTIFF.cmake from the source.

* [vtk]Fix using latest proj4 issue.

* [proj4]Delete missing patch.

1 files changed, 135 insertions, 0 deletions

diff --git a/ports/libspatialite/fix-linux-configure.patch b/ports/libspatialite/fix-linux-configure.patch
new file mode 100644
index 000000000..59afa8c49
--- /dev/null
+++ b/ports/libspatialite/fix-linux-configure.patch
@@ -0,0 +1,135 @@
+diff --git a/configure b/configure
+index aafdad5..fe46039 100644
+--- a/configure
++++ b/configure
+@@ -17448,6 +17448,7 @@ fi
+ #   --enable-proj
+ #
+ # Check whether --enable-proj was given.
++
+ if test "${enable_proj+set}" = set; then :
+   enableval=$enable_proj;
+ else
+@@ -17469,122 +17470,6 @@ fi
+ 
+ done
+ 
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pj_init_plus" >&5
+-$as_echo_n "checking for library containing pj_init_plus... " >&6; }
+-if ${ac_cv_search_pj_init_plus+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_func_search_save_LIBS=$LIBS
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char pj_init_plus ();
+-int
+-main ()
+-{
+-return pj_init_plus ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-for ac_lib in '' proj; do
+-  if test -z "$ac_lib"; then
+-    ac_res="none required"
+-  else
+-    ac_res=-l$ac_lib
+-    LIBS="-l$ac_lib -lm $ac_func_search_save_LIBS"
+-  fi
+-  if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_search_pj_init_plus=$ac_res
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext
+-  if ${ac_cv_search_pj_init_plus+:} false; then :
+-  break
+-fi
+-done
+-if ${ac_cv_search_pj_init_plus+:} false; then :
+-
+-else
+-  ac_cv_search_pj_init_plus=no
+-fi
+-rm conftest.$ac_ext
+-LIBS=$ac_func_search_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pj_init_plus" >&5
+-$as_echo "$ac_cv_search_pj_init_plus" >&6; }
+-ac_res=$ac_cv_search_pj_init_plus
+-if test "$ac_res" != no; then :
+-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+-
+-else
+-  as_fn_error $? "'libproj' is required but it doesn't seem to be installed on this system." "$LINENO" 5
+-fi
+-
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pj_init_ctx" >&5
+-$as_echo_n "checking for library containing pj_init_ctx... " >&6; }
+-if ${ac_cv_search_pj_init_ctx+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_func_search_save_LIBS=$LIBS
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char pj_init_ctx ();
+-int
+-main ()
+-{
+-return pj_init_ctx ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-for ac_lib in '' proj; do
+-  if test -z "$ac_lib"; then
+-    ac_res="none required"
+-  else
+-    ac_res=-l$ac_lib
+-    LIBS="-l$ac_lib -lm $ac_func_search_save_LIBS"
+-  fi
+-  if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_search_pj_init_ctx=$ac_res
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext
+-  if ${ac_cv_search_pj_init_ctx+:} false; then :
+-  break
+-fi
+-done
+-if ${ac_cv_search_pj_init_ctx+:} false; then :
+-
+-else
+-  ac_cv_search_pj_init_ctx=no
+-fi
+-rm conftest.$ac_ext
+-LIBS=$ac_func_search_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pj_init_ctx" >&5
+-$as_echo "$ac_cv_search_pj_init_ctx" >&6; }
+-ac_res=$ac_cv_search_pj_init_ctx
+-if test "$ac_res" != no; then :
+-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+-
+-else
+-  as_fn_error $? "'libproj' is required but the version on this system does not support the required features (Version 4.8.0 or later is needed)." "$LINENO" 5
+-fi
+-
+ else
+   $as_echo "#define OMIT_PROJ 1" >>confdefs.h
+