diff options
| author | Mike Taves <mwtoews@gmail.com> | 2020-04-28 02:47:08 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-27 07:47:08 -0700 |
| commit | 5c0c7672a8dbd21149be0c006f6a7e37fcecadf7 (patch) | |
| tree | 7438566500cdaacdc30f9bb9da4225eb6b199263 | |
| parent | 422fb5df87f6ae2d01a6ccdca7211a54c0e88fa1 (diff) | |
| download | vcpkg-5c0c7672a8dbd21149be0c006f6a7e37fcecadf7.tar.gz vcpkg-5c0c7672a8dbd21149be0c006f6a7e37fcecadf7.zip | |
[geos] Upgrade to GEOS 3.6.4 (released 2019-10-04) (#10377)
| -rw-r--r-- | ports/geos/CONTROL | 2 | ||||
| -rw-r--r-- | ports/geos/geos_c-static-support.patch | 32 | ||||
| -rw-r--r-- | ports/geos/portfile.cmake | 6 |
3 files changed, 21 insertions, 19 deletions
diff --git a/ports/geos/CONTROL b/ports/geos/CONTROL index 3366b6a5e..356c93269 100644 --- a/ports/geos/CONTROL +++ b/ports/geos/CONTROL @@ -1,4 +1,4 @@ Source: geos -Version: 3.6.3-3 +Version: 3.6.4 Homepage: https://www.osgeo.org/projects/geos/ Description: Geometry Engine Open Source diff --git a/ports/geos/geos_c-static-support.patch b/ports/geos/geos_c-static-support.patch index 148e63057..8cc49520c 100644 --- a/ports/geos/geos_c-static-support.patch +++ b/ports/geos/geos_c-static-support.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 927a0fe..8e6c3ea 100644 +index e7d2451..f8cc1ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,11 +66,7 @@ if(NOT MSVC) @@ -16,14 +16,17 @@ index 927a0fe..8e6c3ea 100644 if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) option(GEOS_ENABLE_FLOATSTORE diff --git a/capi/CMakeLists.txt b/capi/CMakeLists.txt -index 859722b..b6e44b6 100644 +index 0607b16..877d611 100644 --- a/capi/CMakeLists.txt +++ b/capi/CMakeLists.txt -@@ -23,15 +23,23 @@ file(GLOB geos_capi_HEADERS ${CMAKE_BINARY_DIR}/capi/*.h) # fix source_group iss +@@ -21,17 +21,25 @@ set(geos_c_SOURCES - if(NOT GEOS_ENABLE_MACOSX_FRAMEWORK) - # if building OS X framework, CAPI built into C++ library -- add_library(geos_c SHARED ${geos_c_SOURCES}) + file(GLOB geos_capi_HEADERS ${CMAKE_BINARY_DIR}/capi/*.h) # fix source_group issue + +-if(NOT GEOS_ENABLE_MACOSX_FRAMEWORK AND GEOS_BUILD_SHARED) ++if(NOT GEOS_ENABLE_MACOSX_FRAMEWORK) + # if building OS X framework or only building static libs, CAPI built into C++ library) +- add_library(geos_c SHARED ${geos_c_SOURCES}) + add_library(geos_c ${geos_c_SOURCES}) target_link_libraries(geos_c geos) @@ -49,19 +52,19 @@ index 859722b..b6e44b6 100644 set_target_properties(geos_c PROPERTIES diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 4a1e688..a33b5f6 100644 +index 3894a56..f86d823 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -23,7 +23,7 @@ if(GEOS_ENABLE_MACOSX_FRAMEWORK) - ${CMAKE_CURRENT_SOURCE_DIR}/../capi/geos_c.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/../capi/geos_ts_c.cpp) +@@ -24,7 +24,7 @@ if(GEOS_ENABLE_MACOSX_FRAMEWORK) + # also 1 binary, so include CAPI here + # and, make name all caps - add_library(GEOS SHARED ${geos_SOURCES} ${geos_c_SOURCES}) + add_library(GEOS ${geos_SOURCES} ${geos_c_SOURCES}) - math(EXPR CVERSION "${VERSION_MAJOR} + 1") - # VERSION = current version, SOVERSION = compatibility version -@@ -61,37 +61,27 @@ if(GEOS_ENABLE_MACOSX_FRAMEWORK) + math(EXPR CVERSION "${VERSION_MAJOR} + 1") + # VERSION = current version, SOVERSION = compatibility version +@@ -62,38 +62,27 @@ if(GEOS_ENABLE_MACOSX_FRAMEWORK) else() @@ -83,7 +86,8 @@ index 4a1e688..a33b5f6 100644 - endif() - - if(GEOS_BUILD_STATIC) -- add_library(geos-static STATIC ${geos_SOURCES} ${geos_ALL_HEADERS}) +- file(GLOB geos_capi_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/../capi/*.h) # fix source_group issue +- add_library(geos-static STATIC ${geos_SOURCES} ${geos_c_SOURCES} ${geos_ALL_HEADERS} ${geos_capi_HEADERS}) - - set_target_properties(geos-static + else() diff --git a/ports/geos/portfile.cmake b/ports/geos/portfile.cmake index 673b159f8..82a4e6276 100644 --- a/ports/geos/portfile.cmake +++ b/ports/geos/portfile.cmake @@ -1,11 +1,9 @@ -include(vcpkg_common_functions) - -set(GEOS_VERSION 3.6.3) +set(GEOS_VERSION 3.6.4) vcpkg_download_distfile(ARCHIVE URLS "http://download.osgeo.org/geos/geos-${GEOS_VERSION}.tar.bz2" FILENAME "geos-${GEOS_VERSION}.tar.bz2" - SHA512 f88adcf363433e247a51fb1a2c0b53f39b71aba8a6c01dd08aa416c2e980fe274a195e6edcb5bb5ff8ea81b889da14a1a8fb2849e04669aeba3b6d55754dc96a + SHA512 860513d86ee1294814ff3b3240373ee3a9ce88be9508b45f61ccc982bb698d0a1916e9458c37853ce8d69a977db6f12483745859f86617d704a688cfeb83b1e9 ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH |