From dc69ce52c992f69c29319667629e5b2c7635b4ff Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath <nathbappai@gmail.com>
Date: Sun, 13 Feb 2022 01:19:20 +0530
Subject: [PATCH] dlib: update to 19.23

* Use ninja instead of make.
* Enable clang32 build.
* Remove duplicate lapack dependency.
---
 mingw-w64-dlib/PKGBUILD | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/mingw-w64-dlib/PKGBUILD b/mingw-w64-dlib/PKGBUILD
index a2170a0332..3359c09869 100644
--- a/mingw-w64-dlib/PKGBUILD
+++ b/mingw-w64-dlib/PKGBUILD
@@ -3,11 +3,11 @@
 _realname=dlib
 pkgbase="mingw-w64-${_realname}"
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-python-${_realname}")
-pkgver=19.21
-pkgrel=3
+pkgver=19.23
+pkgrel=1
 pkgdesc="A toolkit for making real world machine learning and data analysis applications in C++ (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 url='http://dlib.net/'
 license=('Boost')
 depends=("${MINGW_PACKAGE_PREFIX}-lapack"
@@ -15,18 +15,18 @@ depends=("${MINGW_PACKAGE_PREFIX}-lapack"
          "${MINGW_PACKAGE_PREFIX}-libpng"
          "${MINGW_PACKAGE_PREFIX}-libjpeg-turbo"
          "${MINGW_PACKAGE_PREFIX}-openblas"
-         "${MINGW_PACKAGE_PREFIX}-lapack"
          "${MINGW_PACKAGE_PREFIX}-fftw"
          "${MINGW_PACKAGE_PREFIX}-sqlite3")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-python"
              "${MINGW_PACKAGE_PREFIX}-python-setuptools"
-             "${MINGW_PACKAGE_PREFIX}-cc")
+             "${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-ninja")
 options=('strip')
 source=(${_realname}-${pkgver}.tar.gz::"https://github.com/davisking/${_realname}/archive/v${pkgver}.tar.gz"
         "001-python-binding.patch"
         "003-proper-link-libraries.patch")
-sha256sums=('116f52e58be04b47dab52057eaad4b5c4d5c3032d927fe23d55b0741fc4107a0'
+sha256sums=('0fc74a39d2046ad15819bab25a695333a63e740c91ed3c620c8594381c132e88'
             'f3ecc5652a463496ee13488185214f7f88d6d1a2981d532f94843a76c4b191d4'
             'b330f72fe0b679f9245d7ef9b0780ed0712a8806d325cb072afdb02ffdba3196')
 
@@ -49,8 +49,8 @@ build() {
   mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
-    ${MINGW_PREFIX}/bin/cmake \
-      -G'MSYS Makefiles' \
+    ${MINGW_PREFIX}/bin/cmake.exe \
+      -G'Ninja' \
       -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
       -DUSE_AVX_INSTRUCTIONS=ON \
       -DDLIB_ISO_CPP_ONLY=OFF \
@@ -63,12 +63,14 @@ build() {
       -DDLIB_USE_FFTW=ON \
       -DBUILD_SHARED_LIBS=ON \
       ../${_realname}-${pkgver}
-  cmake --build . --config Release
+
+  ${MINGW_PREFIX}/bin/cmake.exe --build . --config Release
 
   msg "Python build for ${CARCH}"
   cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
-  ${MINGW_PREFIX}/bin/python setup.py build -G "MSYS Makefiles" \
+  ${MINGW_PREFIX}/bin/python setup.py build \
+    -G "Ninja" \
     --set CMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
     --set USE_AVX_INSTRUCTIONS=ON \
     --set DLIB_ISO_CPP_ONLY=OFF \
@@ -89,7 +91,7 @@ build() {
 package_dlib() {
   optdepends=("${MINGW_PACKAGE_PREFIX}-python-dlib")
   cd "${srcdir}"/build-${CARCH}
-  make install DESTDIR="${pkgdir}"
+  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --install ./
 
   # Remove hard coded library path from cmake files
   local PREFIX_DEPS=$(cygpath -am ${MINGW_PREFIX})