From 9bc6ce13fa3df72f81b88cd3df35db59becf0e5d Mon Sep 17 00:00:00 2001
From: Hleb Valoshka <375gnu@gmail.com>
Date: Wed, 26 Jan 2022 08:01:54 +0300
Subject: [PATCH] [cspice] update to version 67 (#22655)

* [cspice] update to version 67

* [cspice] update cspice in ports database

Co-authored-by: Hleb Valoshka <v-hleb.v@turvo.com>
---
 ports/cspice/CMakeLists.txt |  2 +-
 ports/cspice/portfile.cmake | 71 ++++++++++++++++---------------------
 ports/cspice/vcpkg.json     | 16 +++++++--
 versions/baseline.json      |  4 +--
 versions/c-/cspice.json     |  5 +++
 5 files changed, 52 insertions(+), 46 deletions(-)

diff --git a/ports/cspice/CMakeLists.txt b/ports/cspice/CMakeLists.txt
index 899a94033b..8c9c829b97 100644
--- a/ports/cspice/CMakeLists.txt
+++ b/ports/cspice/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.1)
 project(cspice LANGUAGES C)
 
-set(SOVERSION 66)
+set(SOVERSION 67)
 
 # Include all *.c files from the library
 file(GLOB CSPICE_SOURCE ${PROJECT_SOURCE_DIR}/cspice/src/cspice/*.c)
diff --git a/ports/cspice/portfile.cmake b/ports/cspice/portfile.cmake
index 667785cac5..1109c1c747 100644
--- a/ports/cspice/portfile.cmake
+++ b/ports/cspice/portfile.cmake
@@ -1,45 +1,37 @@
-if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
-    if (VCPKG_TARGET_IS_WINDOWS)
-        vcpkg_download_distfile(ARCHIVE
-            URLS "https://naif.jpl.nasa.gov/pub/naif/toolkit/C/PC_Windows_VisualC_32bit/packages/cspice.zip"
-            FILENAME "cspice_32bit.zip"
-            SHA512 4f6129b26543729f4eb4f8240b43ca87530db9c6d9a5c0e3f43faf30561eaad95dcf507e3fecfd1c3d4388ccaa4e22a76df7bf7945b6ce9a68eb3b4893885992
-        )
-    elseif (VCPKG_TARGET_IS_OSX)
-        vcpkg_download_distfile(ARCHIVE
-            URLS "https://naif.jpl.nasa.gov/pub/naif/toolkit//C/MacIntel_OSX_AppleC_32bit/packages/cspice.tar.Z"
-            FILENAME "cspice_32bit.tar.Z"
-            SHA512 bd5cc20206e48b3712c5077a2beb05c98cd58a25ce374ed363699a04998eb8ba93e42b5f7c2104c5296db95b3bccdc7cc9b6a2ba45875454d0c3914834aa4c42
-        )
-    else ()
-        vcpkg_download_distfile(ARCHIVE
-            URLS "https://naif.jpl.nasa.gov/pub/naif/toolkit/C/PC_Linux_GCC_32bit/packages/cspice.tar.Z"
-            FILENAME "cspice_32bit.tar.Z"
-            SHA512 b387bc2cfca4deccc451d198af49564ea0b19cf665ba143d39196ed532639cbc11aad7e1d63f71f1bb88d72c0e6ac30757b6e1babca9e0ee3b92f9c205c1b908
-        )
+if (VCPKG_TARGET_IS_WINDOWS)
+    if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
+        set(URL "https://naif.jpl.nasa.gov/pub/naif/toolkit/C/PC_Windows_VisualC_32bit/packages/cspice.zip")
+        set(FILENAME "cspice_32bit.zip")
+        set(SHA512 1949fd12b30ca0e42f53311a97d8571e68737f6a667a56946d3415ee715dda0a1adca9bfc985b9b9447084189c50d261f2c00960cbe2ddf6a1d1d92cf8fa17ab)
+    elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
+        set(URL "https://naif.jpl.nasa.gov/pub/naif/toolkit/C/PC_Windows_VisualC_64bit/packages/cspice.zip")
+        set(FILENAME "cspice_64bit.zip")
+        set(SHA512 5457f24279fb485b0ac92713dab026d1c1ed766a358fcf7d9ce3f70693e75da85a656e72b1ada4dc334e9e68d6c0eb42b2a31f3ad0c83b491dd3afc79e5cda98)
+    endif()
+elseif(VCPKG_TARGET_IS_OSX)
+    if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
+        set(URL "https://naif.jpl.nasa.gov/pub/naif/toolkit//C/MacIntel_OSX_AppleC_64bit/packages/cspice.tar.Z")
+        set(FILENAME "cspice_64bit.tar.Z")
+        set(SHA512 ea9a32c763cd54303de180b4895a195cd5ef6774051f18a1812f2fff39adc0ca9d5dd7878853af40e766882e79a0f542a45139656fb79fb4b436c4bc5bdecddc)
+    elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
+        set(URL "https://naif.jpl.nasa.gov/pub/naif/toolkit//C/MacM1_OSX_clang_64bit/packages/cspice.tar.Z")
+        set(FILENAME "cspice_64bit.tar.Z")
+        set(SHA512 a64f028ec1935dbc7f8d03c903fbfa40cfff097ec4aa0ca4aa1d2ee08561833000e7caf99d6550b06d2a0874cbaf1767382e7a9aea6a39228f3eaa89c6c31a6d)
     endif()
 else()
-    if (VCPKG_TARGET_IS_WINDOWS)
-        vcpkg_download_distfile(ARCHIVE
-            URLS "https://naif.jpl.nasa.gov/pub/naif/toolkit/C/PC_Windows_VisualC_64bit/packages/cspice.zip"
-            FILENAME "cspice_64bit.zip"
-            SHA512 7b5353c638fdba67ed2e9fd21c4f78ac56c0afba408caa70f910f23bb025f6dc822fbaa7d6d7fa277d1038f835e6a962563f4b11a6adf63150d48354959e3c62
-        )
-    elseif (VCPKG_TARGET_IS_OSX)
-        vcpkg_download_distfile(ARCHIVE
-            URLS "https://naif.jpl.nasa.gov/pub/naif/toolkit//C/MacIntel_OSX_AppleC_64bit/packages/cspice.tar.Z"
-            FILENAME "cspice_64bit.tar.Z"
-            SHA512 0d4ef95dfa65d127c1d6f9cf1f637d41ca6680660ee3003f357652f12ed9d04a21888ef796f347ba90354a445b5aea9ffca7dedc6c1617f253b0002683d54a0f
-        )
-    else ()
-        vcpkg_download_distfile(ARCHIVE
-            URLS "https://naif.jpl.nasa.gov/pub/naif/toolkit/C/PC_Linux_GCC_64bit/packages/cspice.tar.Z"
-            FILENAME "cspice_64bit.tar.Z"
-            SHA512 7d090e9196596436740b53180a7c6ca885c12e301771a83fc62d625a63691129c69012cb0385a6c8f246cc5edf1c1af57ffac8a9d766061e1bde8584c57c6ca4
-        )
+    if ((VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") OR (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm"))
+        set(URL "https://naif.jpl.nasa.gov/pub/naif/toolkit/C/PC_Linux_GCC_32bit/packages/cspice.tar.Z")
+        set(FILENAME "cspice_32bit.tar.Z")
+        set(SHA512 22a6250376e9f98d75ecc8682c5432a07a89addc9812010ad97059491e2c19cab418d7aa3f591bded9df132fcfb6865686f0ecfe70821ad31061ae2f7b165f2b)
+    elseif((VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") OR (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64"))
+        set(URL "https://naif.jpl.nasa.gov/pub/naif/toolkit/C/PC_Linux_GCC_64bit/packages/cspice.tar.Z")
+        set(FILENAME "cspice_64bit.tar.Z")
+        set(SHA512 59946f628284cd31c75a23c152d725ae7e01b179f97c52b98518eceeda54bc38875b1dd93dc17574c0bf00e706e0ee35d06ecb5d7871d49633baa8f16eb6c7c8)
     endif()
 endif()
 
+vcpkg_download_distfile(ARCHIVE URLS ${URL} FILENAME ${FILENAME} SHA512 ${SHA512})
+
 set(PATCHES isatty.patch)
 if (NOT VCPKG_TARGET_IS_WINDOWS)
     set(PATCHES ${PATCHES} mktemp.patch)
@@ -63,14 +55,13 @@ if (VCPKG_TARGET_IS_UWP)
     set(VCPKG_CXX_FLAGS "/sdl- ${VCPKG_CXX_FLAGS}")
 endif()
 
-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
     OPTIONS -D_STATIC_BUILD=${_STATIC_BUILD}
     OPTIONS_DEBUG -D_SKIP_HEADERS=ON
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
 vcpkg_copy_pdbs()
 
diff --git a/ports/cspice/vcpkg.json b/ports/cspice/vcpkg.json
index abbf6dfaf5..4bdc82fd7d 100644
--- a/ports/cspice/vcpkg.json
+++ b/ports/cspice/vcpkg.json
@@ -1,7 +1,17 @@
 {
   "name": "cspice",
-  "version-string": "66",
-  "port-version": 5,
+  "version-string": "67",
   "description": "NASA C SPICE toolkit",
-  "homepage": "https://naif.jpl.nasa.gov/naif/toolkit_C.html"
+  "homepage": "https://naif.jpl.nasa.gov/naif/toolkit_C.html",
+  "supports": "!((arm | arm64) & windows)",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index c1268a7242..910d132c52 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1669,8 +1669,8 @@
       "port-version": 1
     },
     "cspice": {
-      "baseline": "66",
-      "port-version": 5
+      "baseline": "67",
+      "port-version": 0
     },
     "ctbignum": {
       "baseline": "2019-08-02",
diff --git a/versions/c-/cspice.json b/versions/c-/cspice.json
index 6586f30ebf..20951a983c 100644
--- a/versions/c-/cspice.json
+++ b/versions/c-/cspice.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1c8f251f7712ff12e7b94d059a56eff69915fb43",
+      "version-string": "67",
+      "port-version": 0
+    },
     {
       "git-tree": "2b03824386796440e0b529f4e29413686f0fc5d5",
       "version-string": "66",