Merge pull request #459 from Maxxen/dev-1.1.3

Remove more vendored deps

.github/workflows/MainDistributionPipeline.yml

@@ -29,6 +29,7 @@ jobs:
       duckdb_version: main
       extension_name: spatial
       ci_tools_version: main
+      vcpkg_commit: 5e5d0e1cd7785623065e77eff011afdeec1a3574
 
   duckdb-latest-deploy:
     name: Deploy extension binaries
@@ -37,5 +38,6 @@ jobs:
     secrets: inherit
     with:
       duckdb_version: main
+      ci_tools_version: main
       extension_name: spatial
       deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}

.github/workflows/StableDistributionPipeline.yml

@@ -29,6 +29,8 @@ jobs:
       duckdb_version: v1.1.3
       extension_name: spatial
       ci_tools_version: v1.1.3
+      vcpkg_commit: 5e5d0e1cd7785623065e77eff011afdeec1a3574
+
 
   duckdb-stable-deploy:
     name: Deploy extension binaries
@@ -37,5 +39,6 @@ jobs:
     secrets: inherit
     with:
       duckdb_version: v1.1.3
+      ci_tools_version: v1.1.3
       extension_name: spatial
       deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/v1.1.3' }}

deps/CMakeLists.txt

@@ -35,7 +35,7 @@ set(PATCH_NAME_ENDING )
 if (EMSCRIPTEN)
   set(CMAKE_FLAGS_POINTER_SIZE -DCMAKE_SIZEOF_VOID_P=4 -DCMAKE_SIZEOF_VOIDP=4)
   set(CMAKE_PROJ_FLAGS -DCMAKE_MODULE_PATH=${LOCAL_INSTALL_DIR}/lib/cmake -DSQLITE3_INCLUDE_DIR=${LOCAL_INSTALL_DIR}/include -DSQLITE3_LIBRARY=${LOCAL_INSTALL_DIR}/lib/libsqlite3.a)
-  set(CMAKE_GDAL_FLAGS -DACCEPT_MISSING_LINUX_FS_HEADER=ON -DSIZEOF_INT=4 -DSIZEOF_UNSIGNED_LONG=4 -DSIZEOF_OFF_T=4 -DGEOS_DIR=${LOCAL_INSTALL_DIR}/lib/cmake/geos -DGeographicLib_DIR=${LOCAL_INSTALL_DIR}/lib/cmake/GeographicLib -DSQLITE3_LIBRARY=${LOCAL_INSTALL_DIR}/lib/libsqlite3.a)
+  set(CMAKE_GDAL_FLAGS -DACCEPT_MISSING_LINUX_FS_HEADER=ON -DSIZEOF_INT=4 -DSIZEOF_UNSIGNED_LONG=4 -DSIZEOF_OFF_T=4 -DSQLITE3_LIBRARY=${LOCAL_INSTALL_DIR}/lib/libsqlite3.a)
   set(PATCH_NAME_ENDING _wasm)
   set(OGR_ENABLE_DRIVER_OPENFILEGDB OFF)
 endif()
@@ -158,59 +158,7 @@ ExternalProject_Add(
 )
 set(GDAL_DEPENDENCIES ${GDAL_DEPENDENCIES} EXPAT)
 
-
-# GEOS
-ExternalProject_Add(
-    GEOS
-    URL ${CMAKE_CURRENT_SOURCE_DIR}/vendor/geos-3.13.0.tar.bz2
-    CONFIGURE_HANDLED_BY_BUILD TRUE
-    CMAKE_ARGS 
-    # CMake options
-    -DCMAKE_INSTALL_PREFIX:PATH=${LOCAL_INSTALL_DIR}
-    -DCMAKE_PREFIX_PATH=${LOCAL_INSTALL_DIR}
-    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-    -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES_PACKED}
-    -DCMAKE_POSITION_INDEPENDENT_CODE=ON
-    ${CMAKE_FLAGS_POINTER_SIZE}
-    # vcpkg options
-    -DVCPKG_MANIFEST_DIR='${VCPKG_MANIFEST_DIR}'
-    -DVCPKG_INSTALLED_DIR='${VCPKG_INSTALLED_DIR}'
-    -DCMAKE_TOOLCHAIN_FILE='${CMAKE_TOOLCHAIN_FILE}'
-    -DVCPKG_TARGET_TRIPLET='${VCPKG_TARGET_TRIPLET}'
-    -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE='${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}'
-    # GEOS options
-    -DBUILD_SHARED_LIBS=OFF
-    -DBUILD_TESTING=OFF
-    -DBUILD_DOCUMENTATION=OFF
-    -DBUILD_ASTYLE=OFF
-    -DBUILD_GEOSOP=OFF
-)
-set(GDAL_DEPENDENCIES ${GDAL_DEPENDENCIES} GEOS)
-
-# GeographicLib
-ExternalProject_Add(
-    GEOGRAPHICLIB
-    URL ${CMAKE_CURRENT_SOURCE_DIR}/vendor/GeographicLib-2.2.zip
-    CONFIGURE_HANDLED_BY_BUILD TRUE
-    PATCH_COMMAND patch -p1 < "${CMAKE_CURRENT_LIST_DIR}/patches/geographiclib${PATCH_NAME_ENDING}.patch"
-    CMAKE_ARGS
-    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-    -DCMAKE_INSTALL_PREFIX:PATH=${LOCAL_INSTALL_DIR}
-    -DCMAKE_PREFIX_PATH=${LOCAL_INSTALL_DIR}
-    -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES_PACKED}
-    -DCMAKE_POSITION_INDEPENDENT_CODE=ON
-    ${CMAKE_FLAGS_POINTER_SIZE}
-    # vcpkg options
-    -DVCPKG_MANIFEST_DIR='${VCPKG_MANIFEST_DIR}'
-    -DVCPKG_INSTALLED_DIR='${VCPKG_INSTALLED_DIR}'
-    -DCMAKE_TOOLCHAIN_FILE='${CMAKE_TOOLCHAIN_FILE}'
-    -DVCPKG_TARGET_TRIPLET='${VCPKG_TARGET_TRIPLET}'
-    -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE='${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}'
-    # GeographicLib options
-    -DBUILD_SHARED_LIBS=OFF
-    -DGEOGRAPHICLIB_DATA=${LOCAL_INSTALL_DIR}/share/GeographicLib
-    -DBUILD_DOCUMENTATION=OFF
-)
+set(GDAL_DEPENDENCIES ${GDAL_DEPENDENCIES})
 
 # GDAL
 ExternalProject_Add(

vcpkg.json

@@ -1,6 +1,8 @@
 {
-    "dependencies": [
-       "openssl",
-      "zlib"
-    ]
+  "dependencies": [
+    "openssl",
+    "zlib",
+    "geographiclib",
+    "geos"
+  ]
 }