Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[libspatialindex] Update to 1.9.3 #18040

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/libspatialindex/CONTROL
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: libspatialindex
Version: 1.9.0
Version: 1.9.3
Homepage: http://libspatialindex.github.com
Description: C++ implementation of R*-tree, an MVR-tree and a TPR-tree with C API.
Build-Depends: zlib
Expand Down
21 changes: 15 additions & 6 deletions ports/libspatialindex/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,16 +1,26 @@
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
set(BUILD_SHARED_LIBS ON)
else()
set(BUILD_SHARED_LIBS OFF)
endif()

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libspatialindex/libspatialindex
REF 1.9.0
SHA512 368537e9bfe52db96486a1febfabe035f9f7714fd1cb50450e3ab89d51c5ffffb0e2ea219e08bee34f772ba9813a3a7f9e63d8b8946887ce83811ef68d17d1cc
REF 1.9.3
SHA512 d4c608abbd631dc163b7b4fb6bf09dee3e85ce692a5f8875d51f05a26e09c75cd17dff1ed9d2c232a071f0f5864d21d877b4cbc252f3416896db24dfa3fa18cb
HEAD_REF master
PATCHES
PATCHES
static.patch

)

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
OPTIONS -DCMAKE_DEBUG_POSTFIX=d -DSIDX_BUILD_TESTS:BOOL=OFF
OPTIONS
-DCMAKE_DEBUG_POSTFIX=d
-DSIDX_BUILD_TESTS:BOOL=OFF
-DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
)

vcpkg_install_cmake()
Expand All @@ -21,5 +31,4 @@ vcpkg_copy_pdbs()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

# Handle copyright
file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libspatialindex)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/libspatialindex/COPYING ${CURRENT_PACKAGES_DIR}/share/libspatialindex/copyright)
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
34 changes: 23 additions & 11 deletions ports/libspatialindex/static.patch
Original file line number Diff line number Diff line change
@@ -1,21 +1,33 @@
From 7e67f364601cd53873298b1e91645daff2302ea6 Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias@opengis.ch>
Date: Fri, 21 May 2021 08:47:21 +0200
Subject: [PATCH] Fix building static

---
src/CMakeLists.txt | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e6b733bd..8f227ab0 100644
index 90f4501..8b6f19e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -194,9 +194,13 @@ if (NOT WITH_STATIC_LASZIP)
endif()
endif()
@@ -188,9 +188,14 @@ set(SIDX_SOURCES
#endif()

-add_library(${SIDX_LIB_NAME} SHARED ${SIDX_SOURCES})
-
-add_library(${SIDX_C_LIB_NAME} SHARED ${SIDX_CAPI_CPP})

-add_library(${SIDX_LIB_NAME} ${SIDX_SOURCES})
+if(BUILD_SHARED_LIBS)
+ add_library(${SIDX_LIB_NAME} SHARED ${SIDX_SOURCES})
+ add_library(${SIDX_C_LIB_NAME} SHARED ${SIDX_CAPI_CPP})
+ add_library(${SIDX_LIB_NAME} SHARED ${SIDX_SOURCES})
+ add_library(${SIDX_C_LIB_NAME} SHARED ${SIDX_CAPI_CPP})
+else(BUILD_SHARED_LIBS)
+ add_library(${SIDX_LIB_NAME} STATIC ${SIDX_SOURCES})
+ add_library(${SIDX_C_LIB_NAME} STATIC ${SIDX_CAPI_CPP})
+ add_library(${SIDX_LIB_NAME} STATIC ${SIDX_SOURCES})
+ add_library(${SIDX_C_LIB_NAME} STATIC ${SIDX_CAPI_CPP})
+endif(BUILD_SHARED_LIBS)

-add_library(${SIDX_C_LIB_NAME} ${SIDX_CAPI_CPP})

target_link_libraries(${SIDX_C_LIB_NAME}
${SIDX_LIB_NAME}
--
2.31.1

4 changes: 2 additions & 2 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -3513,7 +3513,7 @@
"port-version": 4
},
"libspatialindex": {
"baseline": "1.9.0",
"baseline": "1.9.3",
"port-version": 0
},
"libspatialite": {
Expand Down Expand Up @@ -6705,4 +6705,4 @@
"port-version": 1
}
}
}
}
5 changes: 5 additions & 0 deletions versions/l-/libspatialindex.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b75b5935322b19631c7bbec42532285bd7e39e02",
"version-string": "1.9.3",
"port-version": 0
},
{
"git-tree": "4313465aee191d0e9e0154f01beaf2e4e47a3e4f",
"version-string": "1.9.0",
Expand Down