ceres-solver: update to 2.2.0

mingw-w64-ceres-solver/001-find-openblas.patch

@@ -1,51 +0,0 @@
---- a/cmake/FindSuiteSparse.cmake
-+++ b/cmake/FindSuiteSparse.cmake
-@@ -248,15 +248,21 @@
- # of all variables that must be defined for SuiteSparse to be considered found.
- unset(SuiteSparse_REQUIRED_VARS)
- 
--# BLAS.
--find_package(BLAS QUIET)
-+# OpenBLAS or (BLAS and LAPACK)
-+find_package(OpenBLAS QUIET)
-+if (DEFINED OpenBLAS_LIBRARIES)
-+  set(LAPACK_FOUND "YES")
-+  set(BLAS_FOUND "YES")
-+else (DEFINED OpenBLAS_LIBRARIES)
-+  find_package(LAPACK QUIET)
-+  find_package(BLAS QUIET)
-+endif (DEFINED OpenBLAS_LIBRARIES)
-+  
- if (NOT BLAS_FOUND)
-   suitesparse_report_not_found(
-     "Did not find BLAS library (required for SuiteSparse).")
- endif (NOT BLAS_FOUND)
- 
--# LAPACK.
--find_package(LAPACK QUIET)
- if (NOT LAPACK_FOUND)
-   suitesparse_report_not_found(
-     "Did not find LAPACK library (required for SuiteSparse).")
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -244,7 +244,19 @@
- endif (CUDA)
- 
- if (LAPACK)
--  find_package(LAPACK QUIET)
-+  find_package(OpenBLAS QUIET)
-+  if (DEFINED OpenBLAS_LIBRARIES)
-+    set(LAPACK_FOUND "YES")
-+    set(LAPACK_INCLUDE_DIRS ${OpenBLAS_INCLUDE_DIRS})
-+    set(LAPACK_LIBRARIES ${OpenBLAS_LIBRARIES})
-+    set(BLAS_FOUND "YES")
-+    set(BLAS_INCLUDE_DIRS ${OpenBLAS_INCLUDE_DIRS})
-+    set(BLAS_LIBRARIES ${OpenBLAS_LIBRARIES})
-+  else (DEFINED OpenBLAS_LIBRARIES)
-+    find_package(LAPACK QUIET)
-+    find_package(BLAS QUIET)
-+  endif (DEFINED OpenBLAS_LIBRARIES)
-+
-   if (LAPACK_FOUND)
-     message("-- Found LAPACK library: ${LAPACK_LIBRARIES}")
-   else (LAPACK_FOUND)

mingw-w64-ceres-solver/PKGBUILD

@@ -3,11 +3,11 @@
 _realname=ceres-solver
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=2.1.0
+pkgver=2.2.0
 pkgrel=6
 pkgdesc="A large scale non-linear optimization library (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="http://ceres-solver.org/"
 msys2_repository_url="https://github.com/ceres-solver/ceres-solver"
 msys2_references=(
@@ -16,34 +16,35 @@ msys2_references=(
 license=('spdx:BSD-3-Clause')
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
-             "${MINGW_PACKAGE_PREFIX}-ninja")
+             "${MINGW_PACKAGE_PREFIX}-ninja"
+             "${MINGW_PACKAGE_PREFIX}-eigen3")
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
-         "${MINGW_PACKAGE_PREFIX}-eigen3"
          "${MINGW_PACKAGE_PREFIX}-glog"
          "${MINGW_PACKAGE_PREFIX}-suitesparse")
 checkdepends=("${MINGW_PACKAGE_PREFIX}-gflags")
-source=("${url}${_realname}-${pkgver}.tar.gz"
-        "001-find-openblas.patch")
-sha256sums=('f7d74eecde0aed75bfc51ec48c91d01fe16a6bf16bce1987a7073286701e2fc6'
-            '6c7e82c22c7ebb00096c721dbc99a8d5975f223519516cb95cb59e395519a267')
-
-prepare() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/001-find-openblas.patch"
-}
+source=("${url}${_realname}-${pkgver}.tar.gz")
+sha256sums=('48b2302a7986ece172898477c3bcd6deb8fb5cf19b3327bc49969aad4cede82d')
 
 build() {
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
+  declare -a _extra_config
+  if check_option "debug" "n"; then
+    _extra_config+=("-DCMAKE_BUILD_TYPE=Release")
+  else
+    _extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
+  fi
+
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake.exe \
     -G"Ninja" \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-    -DBUILD_SHARED_LIBS=YES \
+    -DBUILD_SHARED_LIBS=ON \
+    -DCMAKE_DLL_NAME_WITH_SOVERSION=ON \
     -DBUILD_TESTING=OFF \
     -DBUILD_EXAMPLES=OFF \
     -DBUILD_BENCHMARKS=OFF \
-    -DCXSparse_NO_CMAKE=ON \
+    "${_extra_config[@]}" \
     "../${_realname}-${pkgver}"
 
   ${MINGW_PREFIX}/bin/cmake --build .