From 4ea49a1cf82f93784a220bc1d1d998d2c1d4180f Mon Sep 17 00:00:00 2001
From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Date: Fri, 11 Jun 2021 07:02:29 +0800
Subject: [xtensor] update to 0.23.9 (#18206)

* [xtensor] update to 0.23.9

* update version

* [xtl] update to 0.7.2

* update version

* update patch

* update version

* Update ports/xtl/portfile.cmake

* update version

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
---
 ports/xtensor/CONTROL           | 13 -------------
 ports/xtensor/portfile.cmake    |  9 +++++----
 ports/xtensor/vcpkg.json        | 24 ++++++++++++++++++++++++
 ports/xtl/CONTROL               |  5 -----
 ports/xtl/fix-fixup-cmake.patch | 19 +++++++++++++++++++
 ports/xtl/portfile.cmake        |  8 ++++++--
 ports/xtl/vcpkg.json            |  9 +++++++++
 versions/baseline.json          |  4 ++--
 versions/x-/xtensor.json        |  5 +++++
 versions/x-/xtl.json            |  5 +++++
 10 files changed, 75 insertions(+), 26 deletions(-)
 delete mode 100644 ports/xtensor/CONTROL
 create mode 100644 ports/xtensor/vcpkg.json
 delete mode 100644 ports/xtl/CONTROL
 create mode 100644 ports/xtl/fix-fixup-cmake.patch
 create mode 100644 ports/xtl/vcpkg.json

diff --git a/ports/xtensor/CONTROL b/ports/xtensor/CONTROL
deleted file mode 100644
index 217b7f816..000000000
--- a/ports/xtensor/CONTROL
+++ /dev/null
@@ -1,13 +0,0 @@
-Source: xtensor
-Version: 0.21.9
-Description: C++ tensors with broadcasting and lazy computing
-Homepage: https://github.com/xtensor-stack/xtensor
-Build-Depends: nlohmann-json, xtl
-
-Feature: xsimd
-Description: xtensor with xsimd support
-Build-Depends: xsimd
-
-Feature: tbb
-Description: xtensor with tbb support
-Build-Depends: tbb
diff --git a/ports/xtensor/portfile.cmake b/ports/xtensor/portfile.cmake
index d2722c563..a9be2459d 100644
--- a/ports/xtensor/portfile.cmake
+++ b/ports/xtensor/portfile.cmake
@@ -3,14 +3,15 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO xtensor-stack/xtensor
-    REF a377fb84c29624e91b6b2451018f3aa3abec1c4f # 0.21.9
-    SHA512 627eaefef3526b59e9fdc6b0aebca1a47bac2adf382bc8381115c7f9fbf04a1496a46490985b16b5855166f03a873a7b00ea1f062131fd49d5adb545e5c8ecf5
+    REF f3c11b2d810159e7063daddeaa0764f4006e5a73 # 0.23.10
+    SHA512 85d94a3e346a13f8d802260e7b182a34f83ed7adddb5c082f10fdaac995ba5b895ea20daf33ac99d3f44e9eb95fdc4ec051eb006259258c4c2ae762c5f08399f
     HEAD_REF master
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    xsimd XTENSOR_USE_XSIMD
-    tbb XTENSOR_USE_TBB
+    FEATURES
+        xsimd XTENSOR_USE_XSIMD
+        tbb XTENSOR_USE_TBB
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/xtensor/vcpkg.json b/ports/xtensor/vcpkg.json
new file mode 100644
index 000000000..439e46066
--- /dev/null
+++ b/ports/xtensor/vcpkg.json
@@ -0,0 +1,24 @@
+{
+  "name": "xtensor",
+  "version": "0.23.10",
+  "description": "C++ tensors with broadcasting and lazy computing",
+  "homepage": "https://github.com/xtensor-stack/xtensor",
+  "dependencies": [
+    "nlohmann-json",
+    "xtl"
+  ],
+  "features": {
+    "tbb": {
+      "description": "xtensor with tbb support",
+      "dependencies": [
+        "tbb"
+      ]
+    },
+    "xsimd": {
+      "description": "xtensor with xsimd support",
+      "dependencies": [
+        "xsimd"
+      ]
+    }
+  }
+}
diff --git a/ports/xtl/CONTROL b/ports/xtl/CONTROL
deleted file mode 100644
index 41cd7e88b..000000000
--- a/ports/xtl/CONTROL
+++ /dev/null
@@ -1,5 +0,0 @@
-Source: xtl
-Version: 0.6.21
-Build-Depends: nlohmann-json
-Description: The x template library.
-Homepage: https://github.com/xtensor-stack/xtl
diff --git a/ports/xtl/fix-fixup-cmake.patch b/ports/xtl/fix-fixup-cmake.patch
new file mode 100644
index 000000000..9bc25bf0b
--- /dev/null
+++ b/ports/xtl/fix-fixup-cmake.patch
@@ -0,0 +1,19 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cbc6651..4e31f71 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -122,7 +122,7 @@ install(FILES ${XTL_HEADERS}
+         DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/xtl)
+ endif()
+ 
+-set(XTL_CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PROJECT_NAME}" CACHE
++set(XTL_CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}" CACHE
+     STRING "install path for xtlConfig.cmake")
+ 
+ configure_package_config_file(${PROJECT_NAME}Config.cmake.in
+@@ -157,4 +157,4 @@ configure_file(${PROJECT_NAME}.pc.in
+                "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc"
+                 @ONLY)
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc"
+-        DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig/")
++        DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/")
diff --git a/ports/xtl/portfile.cmake b/ports/xtl/portfile.cmake
index 5c761315a..6dd16a174 100644
--- a/ports/xtl/portfile.cmake
+++ b/ports/xtl/portfile.cmake
@@ -3,9 +3,11 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO xtensor-stack/xtl
-    REF 6c017f4a81a59bd52008025a785ce745e5b7f49c # 0.6.21
-    SHA512 f007196a38da267b6f457ce587220b60686b1c23670ab03d5f0516bb3b8c7b1e5b8859d57255e96f713bfc08a46d38dd497e55afc17fa40f2b653073690093c9
+    REF e0f00666d90086bb245ae73abb6123d0e2c1b30b # 0.7.2
+    SHA512 d7a552dc4e43a3270a56c57fde8fdc48a108909d4fa1e3fdd7ab12b178b3e271ed4d89aac9fd184e2739ddacfb3b5cb248538ed50a0ba56e740875c0faf5aa62
     HEAD_REF master
+    PATCHES
+        fix-fixup-cmake.patch
 )
 
 vcpkg_configure_cmake(
@@ -20,6 +22,8 @@ vcpkg_install_cmake()
 
 vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
 
+vcpkg_fixup_pkgconfig()
+
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/xtl/vcpkg.json b/ports/xtl/vcpkg.json
new file mode 100644
index 000000000..3570c661f
--- /dev/null
+++ b/ports/xtl/vcpkg.json
@@ -0,0 +1,9 @@
+{
+  "name": "xtl",
+  "version": "0.7.2",
+  "description": "The x template library",
+  "homepage": "https://github.com/xtensor-stack/xtl",
+  "dependencies": [
+    "nlohmann-json"
+  ]
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index 101d9974f..a4c182f98 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6721,7 +6721,7 @@
       "port-version": 0
     },
     "xtensor": {
-      "baseline": "0.21.9",
+      "baseline": "0.23.10",
       "port-version": 0
     },
     "xtensor-blas": {
@@ -6737,7 +6737,7 @@
       "port-version": 1
     },
     "xtl": {
-      "baseline": "0.6.21",
+      "baseline": "0.7.2",
       "port-version": 0
     },
     "xxhash": {
diff --git a/versions/x-/xtensor.json b/versions/x-/xtensor.json
index b7712c308..b175c89b5 100644
--- a/versions/x-/xtensor.json
+++ b/versions/x-/xtensor.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ca365f721479380995943c5ab4e8cdd6866ec785",
+      "version": "0.23.10",
+      "port-version": 0
+    },
     {
       "git-tree": "5566727b83f68936619a2bf8872c1148a30c5c61",
       "version-string": "0.21.9",
diff --git a/versions/x-/xtl.json b/versions/x-/xtl.json
index 5f252b87d..f3baee90b 100644
--- a/versions/x-/xtl.json
+++ b/versions/x-/xtl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2665b2dcd2f142f932337987817369ae8a377bbe",
+      "version": "0.7.2",
+      "port-version": 0
+    },
     {
       "git-tree": "f0cc60a9db2ec13e64cda97ae85bb344a8cd3e10",
       "version-string": "0.6.21",
-- 
cgit v1.2.3