[shapelib] Update to 1.6.1 (microsoft#40399)

myd7349 · Aug 17, 2024 · 2f210a9 · 2f210a9
1 parent ffc46d4
commit 2f210a9
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 16 deletions.
diff --git a/ports/shapelib/portfile.cmake b/ports/shapelib/portfile.cmake
@@ -1,7 +1,7 @@
 vcpkg_download_distfile(ARCHIVE
  URLS "http://download.osgeo.org/shapelib/shapelib-${VERSION}.zip"
  FILENAME "shapelib-${VERSION}.zip"
- SHA512 f3f43f2028fe442e020558de2559b24eae9c7a1d0c84cc242f23ea985cf1fb5ff39fbfef7738f9b8ef5df9a5d0b9f3e891a61b3d5fbbe5b224f41a46589723a3
+ SHA512 50859bbd1ea8808aa06cd112cc16cc77c1bd29d93129180818a5ea3a753b63de4039f232d1d9f13ebd7d076e427d10036e5f00775e633eb637da511625fa29bb
 )
 
 vcpkg_extract_source_archive(
@@ -12,34 +12,39 @@ vcpkg_extract_source_archive(
 vcpkg_check_features(OUT_FEATURE_OPTIONS options
  FEATURES
  contrib BUILD_SHAPELIB_CONTRIB
+ tools BUILD_APPS
 )
 
 vcpkg_cmake_configure(
  SOURCE_PATH "${SOURCE_PATH}"
  OPTIONS
  ${options}
  -DBUILD_TESTING=OFF
+ -DUSE_RPATH=OFF
 )
 
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 vcpkg_cmake_config_fixup()
+vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-vcpkg_copy_tools(
- TOOL_NAMES
- dbfadd
- dbfcreate
- dbfdump
- shpadd
- shpcreate
- shpdump
- shprewind
- shptreedump
- AUTO_CLEAN
-)
+if(BUILD_APPS)
+ vcpkg_copy_tools(
+ TOOL_NAMES
+ dbfadd
+ dbfcreate
+ dbfdump
+ shpadd
+ shpcreate
+ shpdump
+ shprewind
+ shptreedump
+ AUTO_CLEAN
+ )
+endif()
 if(BUILD_SHAPELIB_CONTRIB)
  vcpkg_copy_tools(
  TOOL_NAMES

diff --git a/ports/shapelib/vcpkg.json b/ports/shapelib/vcpkg.json
@@ -1,6 +1,6 @@
 {
  "name": "shapelib",
- "version": "1.6.0",
+ "version": "1.6.1",
  "description": "Shapefile C Library is simple C API for reading and writing ESRI Shapefiles",
  "homepage": "https://download.osgeo.org/shapelib",
  "license": "MIT OR LGPL-2.0-or-later",
@@ -16,8 +16,11 @@
  ],
  "features": {
  "contrib": {
- "description": "Build utilities (from contrib)",
+ "description": "Build utilities from contrib",
  "license": null
+ },
+ "tools": {
+ "description": "Build tools"
  }
  }
 }
diff --git a/versions/baseline.json b/versions/baseline.json
@@ -8181,7 +8181,7 @@
  "port-version": 0
  },
  "shapelib": {
- "baseline": "1.6.0",
+ "baseline": "1.6.1",
  "port-version": 0
  },
  "shiftmedia-libgcrypt": {

diff --git a/versions/s-/shapelib.json b/versions/s-/shapelib.json
@@ -1,5 +1,10 @@
 {
  "versions": [
+ {
+ "git-tree": "d314741ee9002b2f9a50d305ae759b1f2bb734b2",
+ "version": "1.6.1",
+ "port-version": 0
+ },
  {
  "git-tree": "6b89a941de4bb79399a81b9199cf15e66a882956",
  "version": "1.6.0",