early-access version 2853

externals/vcpkg/ports/spatialite-tools/fix-makefiles.patch

@@ -0,0 +1,134 @@
+diff --git a/makefile.vc b/makefile.vc
+index 53ef75197..d48fb02db 100644
+--- a/makefile.vc
++++ b/makefile.vc
+@@ -16,7 +16,7 @@ SPATIALITE_OSM_RAW_EXE    = spatialite_osm_raw.exe
+ SPATIALITE_OSM_FILTER_EXE = spatialite_osm_filter.exe
+ SPATIALITE_GML_EXE        = spatialite_gml.exe
+ 
+-CFLAGS	=	/nologo -IC:\OSGeo4W\include $(OPTFLAGS)
++CFLAGS	=	/nologo $(OPTFLAGS)
+ 
+ default:	all
+ 
+@@ -27,96 +27,63 @@ all: $(SPATIALITE_EXE) $(SHP_DOCTOR_EXE) $(SPATIALITE_TOOL_EXE) \
+ 	$(SPATIALITE_OSM_FILTER_EXE) $(SHP_SANITIZE_EXE)
+ 
+ $(SPATIALITE_EXE): shell.obj
+-	cl shell.obj C:\OSGeo4W\lib\proj_i.lib \
+-		C:\OSGeo4W\lib\iconv.lib C:\OSGeo4W\lib\geos_c.lib \
+-		C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib \
+-		/Fe$(SPATIALITE_EXE)
++	cl shell.obj /Fe$(SPATIALITE_EXE) $(LIBS_ALL)
+ 	if exist $(SPATIALITE_EXE).manifest mt -manifest \
+ 		$(SPATIALITE_EXE).manifest -outputresource:$(SPATIALITE_EXE);1
+ 
+ $(EXIF_LOADER_EXE):	exif_loader.obj
+-	cl exif_loader.obj C:\OSGeo4W\lib\proj_i.lib \
+-		C:\OSGeo4W\lib\iconv.lib C:\OSGeo4W\lib\geos_c.lib \
+-		C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib 
++	cl exif_loader.obj $(LIBS_ALL)
+ 	if exist $(EXIF_LOADER_EXE).manifest mt -manifest \
+ 		$(EXIF_LOADER_EXE).manifest -outputresource:$(EXIF_LOADER_EXE);1
+ 
+ $(SHP_DOCTOR_EXE):	shp_doctor.obj
+-	cl shp_doctor.obj  C:\OSGeo4W\lib\proj_i.lib \
+-		C:\OSGeo4W\lib\iconv.lib C:\OSGeo4W\lib\geos_c.lib \
+-		C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib 
++	cl shp_doctor.obj $(LIBS_ALL)
+ 	if exist $(SHP_DOCTOR_EXE).manifest mt -manifest \
+ 		$(SHP_DOCTOR_EXE).manifest -outputresource:$(SHP_DOCTOR_EXE);1
+ 
+ $(SHP_SANITIZE_EXE):	shp_sanitize.obj
+-	cl shp_sanitize.obj  C:\OSGeo4W\lib\proj_i.lib \
+-		C:\OSGeo4W\lib\iconv.lib C:\OSGeo4W\lib\geos_c.lib \
+-		C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib 
++	cl shp_sanitize.obj $(LIBS_ALL)
+ 	if exist $(SHP_SANITIZE_EXE).manifest mt -manifest \
+ 		$(SHP_SANITIZE_EXE).manifest -outputresource:$(SHP_SANITIZE_EXE);1
+ 
+ $(SPATIALITE_NETWORK_EXE):	spatialite_network.obj
+-	cl spatialite_network.obj C:\OSGeo4W\lib\proj_i.lib \
+-		C:\OSGeo4W\lib\iconv.lib \
+-		C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib 
++	cl spatialite_network.obj $(LIBS_ALL)
+ 	if exist $(SPATIALITE_NETWORK_EXE).manifest mt -manifest \
+ 		$(SPATIALITE_TOOL_EXE).manifest \
+ 		-outputresource:$(SPATIALITE_TOOL_EXE);1
+ 
+ $(SPATIALITE_TOOL_EXE):	spatialite_tool.obj
+-	cl spatialite_tool.obj C:\OSGeo4W\lib\proj_i.lib \
+-		C:\OSGeo4W\lib\iconv.lib C:\OSGeo4W\lib\geos_c.lib \
+-		C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib 
++	cl spatialite_tool.obj $(LIBS_ALL)
+ 	if exist $(SPATIALITE_TOOL_EXE).manifest mt -manifest \
+ 		$(SPATIALITE_TOOL_EXE).manifest \
+ 		-outputresource:$(SPATIALITE_TOOL_EXE);1
+ 
+ $(SPATIALITE_OSM_NET_EXE):	spatialite_osm_net.obj
+-	cl spatialite_osm_net.obj C:\OSGeo4W\lib\proj_i.lib \
+-		C:\OSGeo4W\lib\iconv.lib \
+-		C:\OSGeo4W\lib\readosm_i.lib \
+-		C:\OSGeo4W\lib\libexpat.lib \
+-		C:\OSGeo4W\lib\zlib.lib \
+-		C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib 
++	cl spatialite_osm_net.obj $(LIBS_ALL)
+ 	if exist $(SPATIALITE_OSM_EXE).manifest mt -manifest \
+ 		$(SPATIALITE_OSM_EXE).manifest \
+ 		-outputresource:$(SPATIALITE_OSM_NET_EXE);1
+ 
+ $(SPATIALITE_OSM_MAP_EXE):	spatialite_osm_map.obj
+-	cl spatialite_osm_map.obj C:\OSGeo4W\lib\proj_i.lib \
+-		C:\OSGeo4W\lib\iconv.lib \
+-		C:\OSGeo4W\lib\readosm_i.lib \
+-		C:\OSGeo4W\lib\libexpat.lib \
+-		C:\OSGeo4W\lib\zlib.lib \
+-		C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib 
++	cl spatialite_osm_map.obj $(LIBS_ALL)
+ 	if exist $(SPATIALITE_OSM_MAP_EXE).manifest mt -manifest \
+ 		$(SPATIALITE_OSM_MAP_EXE).manifest \
+ 		-outputresource:$(SPATIALITE_OSM_MAP_EXE);1
+ 
+ $(SPATIALITE_GML_EXE):	spatialite_gml.obj
+-	cl spatialite_gml.obj C:\OSGeo4W\lib\proj_i.lib \
+-		C:\OSGeo4W\lib\iconv.lib \
+-		C:\OSGeo4W\lib\libexpat.lib \
+-		C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib 
++	cl spatialite_gml.obj $(LIBS_ALL)
+ 	if exist $(SPATIALITE_GML_EXE).manifest mt -manifest \
+ 		$(SPATIALITE_GML_EXE).manifest \
+ 		-outputresource:$(SPATIALITE_GML_EXE);1
+ 
+ $(SPATIALITE_OSM_RAW_EXE):	spatialite_osm_raw.obj
+-	cl spatialite_osm_raw.obj C:\OSGeo4W\lib\proj_i.lib \
+-		C:\OSGeo4W\lib\iconv.lib \
+-		C:\OSGeo4W\lib\readosm_i.lib \
+-		C:\OSGeo4W\lib\libexpat.lib \
+-		C:\OSGeo4W\lib\zlib.lib \
+-		C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib 
++	cl spatialite_osm_raw.obj $(LIBS_ALL)
+ 	if exist $(SPATIALITE_OSM_RAW_EXE).manifest mt -manifest \
+ 		$(SPATIALITE_OSM_RAW_EXE).manifest \
+ 		-outputresource:$(SPATIALITE_OSM_RAW_EXE);1
+ 
+ $(SPATIALITE_OSM_FILTER_EXE):	spatialite_osm_filter.obj
+-	cl spatialite_osm_filter.obj C:\OSGeo4W\lib\proj_i.lib \
+-		C:\OSGeo4W\lib\iconv.lib \
+-		C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib 
++	cl spatialite_osm_filter.obj $(LIBS_ALL)
+ 	if exist $(SPATIALITE_OSM_FILTER_EXE).manifest mt -manifest \
+ 		$(SPATIALITE_OSM_FILTER_EXE).manifest \
+ 		-outputresource:$(SPATIALITE_OSM_FILTER_EXE);1
+diff --git a/nmake.opt b/nmake.opt
+index 4f4a9538e..d9efecf7b 100644
+--- a/nmake.opt
++++ b/nmake.opt
+@@ -2,7 +2,7 @@
+ INSTDIR=C:\OSGeo4W
+ 
+ # Uncomment the first for an optimized build, or the second for debug.
+-OPTFLAGS=	/nologo /Ox /fp:precise /W3 /MD /D_CRT_SECURE_NO_WARNINGS \
++OPTFLAGS=	/nologo /fp:precise /W3 $(CL_FLAGS) /D_CRT_SECURE_NO_WARNINGS \
+ 	/D_LARGE_FILE=1 /D_FILE_OFFSET_BITS=64 /D_LARGEFILE_SOURCE=1
+ #OPTFLAGS=	/nologo /Zi /MD /Fdspatialite.pdb
+ 

externals/vcpkg/ports/spatialite-tools/portfile.cmake

@@ -0,0 +1,102 @@
+# Allow empty include directory
+set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
+
+set(SPATIALITE_TOOLS_VERSION_STR "5.0.1")
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://www.gaia-gis.it/gaia-sins/spatialite-tools-sources/spatialite-tools-${SPATIALITE_TOOLS_VERSION_STR}.tar.gz"
+    FILENAME "spatialite-tools-${SPATIALITE_TOOLS_VERSION_STR}.tar.gz"
+    SHA512 dad52f6ed3c66ffd95f3a5c21225cd1b20641523af616f7e8defba8e4e46921da169e5f7bf9c53a355e132b6e74750d6db3fe02c870a3386f850df49c83bb8cd
+)
+
+vcpkg_extract_source_archive(SOURCE_PATH
+    ARCHIVE "${ARCHIVE}"
+    PATCHES
+        fix-makefiles.patch
+)
+file(REMOVE "${SOURCE_PATH}/config.h")
+
+set(PKGCONFIG_MODULES expat libxml-2.0 sqlite3)
+
+if (VCPKG_TARGET_IS_WINDOWS)
+    list(APPEND PKGCONFIG_MODULES readosm spatialite)
+    x_vcpkg_pkgconfig_get_modules(
+        PREFIX PKGCONFIG
+        MODULES --msvc-syntax ${PKGCONFIG_MODULES}
+        LIBS
+    )
+
+    # vcpkg_build_nmake doesn't supply cmake's implicit link libraries
+    if(PKGCONFIG_LIBS_DEBUG MATCHES "libcrypto")
+        string(APPEND PKGCONFIG_LIBS_DEBUG " user32.lib")
+    endif()
+    if(PKGCONFIG_LIBS_RELEASE MATCHES "libcrypto")
+        string(APPEND PKGCONFIG_LIBS_RELEASE " user32.lib")
+    endif()
+
+    set(ICONV_LIBS "iconv.lib")
+    if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+        string(APPEND ICONV_LIBS " charset.lib")
+    endif()
+
+    set(UWP_LIBS "")
+    if(VCPKG_TARGET_IS_UWP)
+        set(UWP_LIBS "windowsapp.lib /APPCONTAINER")
+    endif()
+
+    file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}" INST_DIR)
+
+    vcpkg_install_nmake(
+        SOURCE_PATH "${SOURCE_PATH}"
+        OPTIONS_RELEASE
+            "INSTDIR=${INST_DIR}"
+            "LIBS_ALL=/link ${PKGCONFIG_LIBS_RELEASE} ${ICONV_LIBS} ${UWP_LIBS}"
+        OPTIONS_DEBUG
+            "INSTDIR=${INST_DIR}\\debug"
+            "LIBS_ALL=/link ${PKGCONFIG_LIBS_DEBUG} ${ICONV_LIBS} ${UWP_LIBS}"
+        )
+
+    set(TOOL_EXES
+        shp_sanitize
+        spatialite_osm_filter
+        spatialite_osm_raw
+        spatialite_gml
+        spatialite_osm_map
+        exif_loader
+        spatialite_osm_net
+        spatialite_network
+        spatialite_tool
+        shp_doctor
+        spatialite
+    )
+    vcpkg_copy_tools(TOOL_NAMES ${TOOL_EXES} AUTO_CLEAN)
+
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+
+else()
+    x_vcpkg_pkgconfig_get_modules(
+        PREFIX PKGCONFIG
+        MODULES ${PKGCONFIG_MODULES}
+        LIBS
+    )
+
+    vcpkg_configure_make(
+        SOURCE_PATH "${SOURCE_PATH}"
+        AUTOCONFIG
+        OPTIONS
+            --disable-minizip
+            --disable-readline
+            --enable-readosm
+        OPTIONS_DEBUG
+            "LIBS=${PKGCONFIG_LIBS_DEBUG} \$LIBS"
+        OPTIONS_RELEASE
+            "LIBS=${PKGCONFIG_LIBS_RELEASE} \$LIBS"
+    )
+
+    vcpkg_install_make()
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+endif()
+
+# Handle copyright
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

externals/vcpkg/ports/spatialite-tools/vcpkg.json

@@ -0,0 +1,25 @@
+{
+  "name": "spatialite-tools",
+  "version": "5.0.1",
+  "port-version": 1,
+  "description": "Contains spatialite.exe and other command line tools to work with SpatiaLite databases (import, export, SQL queries)",
+  "homepage": "https://www.gaia-gis.it/fossil/spatialite-tools/index",
+  "dependencies": [
+    "expat",
+    "libiconv",
+    {
+      "name": "libspatialite",
+      "features": [
+        "gcp",
+        "rttopo"
+      ]
+    },
+    "libxml2",
+    "readosm",
+    "sqlite3",
+    {
+      "name": "vcpkg-pkgconfig-get-modules",
+      "host": true
+    }
+  ]
+}