From 6d43c79bafb92a1effcb912fd2605bc7ed9f68f4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 3 May 2022 15:28:06 -0400
Subject: [PATCH] armadillo: update to 11.0.1.

---
 common/shlibs                                 |  2 +-
 .../patches/9.700.2--include_dirs.patch       | 40 -------------------
 srcpkgs/armadillo/template                    | 18 +++++++--
 3 files changed, 15 insertions(+), 45 deletions(-)
 delete mode 100644 srcpkgs/armadillo/patches/9.700.2--include_dirs.patch

diff --git a/common/shlibs b/common/shlibs
index 4114151662f..a2d858413fd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3722,7 +3722,7 @@ libdrumstick-rt.so.1 drumstick-1.1.2_1
 libnozzle.so.1 libnozzle1-1.11_4
 libmygpo-qt5.so.1 libmygpo-qt-1.1.0_1
 libluv.so.1 libluv-1.30.1.0_1
-libarmadillo.so.9 armadillo-9.700.2_1
+libarmadillo.so.11 armadillo-11.0.1_1
 libvarnishapi.so.2 libvarnishapi-6.3.0_1
 libicns.so.1 libicns-0.8.1_1
 librabbitmq.so.4 rabbitmq-c-0.10.0_2
diff --git a/srcpkgs/armadillo/patches/9.700.2--include_dirs.patch b/srcpkgs/armadillo/patches/9.700.2--include_dirs.patch
deleted file mode 100644
index a19472dff13..00000000000
--- a/srcpkgs/armadillo/patches/9.700.2--include_dirs.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From a65f29c4cddccd22545746b077e6bd19d56e6bfb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
-Date: Fri, 24 Jul 2020 23:07:44 +0200
-Subject: [PATCH] Absolute paths can't match both cross and native use
-
-
-diff --git include/armadillo_bits/config.hpp.cmake include/armadillo_bits/config.hpp.cmake
-index be42243..a285e35 100644
---- a/include/armadillo_bits/config.hpp.cmake
-+++ b/include/armadillo_bits/config.hpp.cmake
-@@ -50,7 +50,7 @@
- #endif
- 
- #if !defined(ARMA_SUPERLU_INCLUDE_DIR)
--#define ARMA_SUPERLU_INCLUDE_DIR ${ARMA_SUPERLU_INCLUDE_DIR}/
-+#define ARMA_SUPERLU_INCLUDE_DIR ./
- //// If you're using SuperLU and want to explicitly include the SuperLU headers,
- //// uncomment the above define and specify the appropriate include directory.
- //// Make sure the directory has a trailing /
-@@ -94,7 +94,7 @@
- //// ARMA_BLAS_LONG, ARMA_BLAS_LONG_LONG, ARMA_USE_FORTRAN_HIDDEN_ARGS
- 
- #cmakedefine ARMA_USE_ATLAS
--#define ARMA_ATLAS_INCLUDE_DIR ${ARMA_ATLAS_INCLUDE_DIR}/
-+#define ARMA_ATLAS_INCLUDE_DIR ./
- //// If you're using ATLAS and the compiler can't find cblas.h and/or clapack.h
- //// uncomment the above define and specify the appropriate include directory.
- //// Make sure the directory has a trailing /
-@@ -140,7 +140,7 @@
-   #undef  ARMA_USE_HDF5
-   #define ARMA_USE_HDF5
-   
--  #define ARMA_HDF5_INCLUDE_DIR ${ARMA_HDF5_INCLUDE_DIR}/
-+  #define ARMA_HDF5_INCLUDE_DIR ./
- #endif
- 
- #if !defined(ARMA_MAT_PREALLOC)
--- 
-2.27.0
-
diff --git a/srcpkgs/armadillo/template b/srcpkgs/armadillo/template
index 9407c3aa8b4..7117b47a312 100644
--- a/srcpkgs/armadillo/template
+++ b/srcpkgs/armadillo/template
@@ -1,9 +1,10 @@
 # Template file for 'armadillo'
 pkgname=armadillo
-version=9.900.2
+version=11.0.1
 revision=1
 build_style=cmake
-configure_args="-DDETECT_HDF5=$(vopt_if hdf5 ON OFF)"
+configure_args="-DOPENBLAS_PROVIDES_LAPACK=true
+ -DDETECT_HDF5=$(vopt_if hdf5 ON OFF)"
 hostmakedepends="pkg-config"
 makedepends="openblas-devel superlu-devel $(vopt_if hdf5 hdf5-devel)"
 short_desc="C++ linear algebra library"
@@ -11,15 +12,24 @@ maintainer="Julien Dehos <dehos@lisic.univ-littoral.fr>"
 license="Apache-2.0"
 homepage="http://arma.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/arma/${pkgname}-${version}.tar.xz"
-checksum=d78658c9442addf7f718eb05881150ee3ec25604d06dd3af4942422b3ce26d05
+checksum=e43d4449376c1fc8b562095431bb82cf9c4ff98a791a22a25d0f96e5e7937c22
 
 build_options="hdf5"
 desc_option_hdf5="HDF5 support"
-# hd5 is nocross
+
+# hdf5 is nocross
 if [ -z "$CROSS_BUILD" ]; then
 	build_options_default="hdf5"
 fi
 
+post_install() {
+	# Strip cross prefix from default header paths in config.hpp
+	if [ "$CROSS_BUILD" ]; then
+		vsed -e "s@${XBPS_CROSS_BASE}/@/@" \
+			-i "${DESTDIR}/usr/include/armadillo_bits/config.hpp"
+	fi
+}
+
 armadillo-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"