From 673c413cce07fea16ecaaa60cbd62bfea3bdbaee Mon Sep 17 00:00:00 2001
From: Mehdi Chinoune <mehdi.chinoune@hotmail.com>
Date: Tue, 31 Jan 2023 21:20:19 +0000
Subject: [PATCH] libjpeg-turbo: update to 2.1.5

---
 mingw-w64-libjpeg-turbo/PKGBUILD | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/mingw-w64-libjpeg-turbo/PKGBUILD b/mingw-w64-libjpeg-turbo/PKGBUILD
index 0f795fe0a5..1151cad70f 100644
--- a/mingw-w64-libjpeg-turbo/PKGBUILD
+++ b/mingw-w64-libjpeg-turbo/PKGBUILD
@@ -4,7 +4,7 @@
 _realname=libjpeg-turbo
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=2.1.4
+pkgver=2.1.5
 pkgrel=1
 pkgdesc="JPEG image codec with accelerated baseline compression and decompression (mingw-w64)"
 arch=('any')
@@ -12,20 +12,17 @@ mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://libjpeg-turbo.virtualgl.org/"
 license=(custom:'BSD-like')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
-makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
-             "${MINGW_PACKAGE_PREFIX}-cc"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
-             $( [[ "${CARCH}" != "i686" \
-                   && "${CARCH}" != "x86_64" ]] \
-                || echo "${MINGW_PACKAGE_PREFIX}-nasm" ))
+             $( [[ "${CARCH}" == "aarch64" ]] || echo "${MINGW_PACKAGE_PREFIX}-nasm" ))
 provides=("${MINGW_PACKAGE_PREFIX}-libjpeg")
 conflicts=("${MINGW_PACKAGE_PREFIX}-libjpeg")
 replaces=("${MINGW_PACKAGE_PREFIX}-libjpeg")
-options=('staticlibs' 'strip')
 source=(${_realname}-${pkgver}.tar.gz::https://github.com/libjpeg-turbo/libjpeg-turbo/archive/${pkgver}.tar.gz
         "0001-header-compat.mingw.patch"
         "libjpeg-turbo-1.3.1-libmng-compatibility.patch")
-sha256sums=('a78b05c0d8427a90eb5b4eb08af25309770c8379592bb0b8a863373128e6143f'
+sha256sums=('254f3642b04e309fee775123133c6464181addc150499561020312ec61c1bf7c'
             '166264f617734b33ac55ec8b70e6636d4e409c0d837667afe158e9d28200e6dd'
             '16336caddc949a8a082f39c218b3289288d144bb3b87f62565ed1b294ff8e526')
 
@@ -36,21 +33,20 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
-  declare -a _build_type
-  if check_option "debug" "y"; then
-    _build_type=Debug
+  declare -a _extra_config
+  if check_option "debug" "n"; then
+    _extra_config+=("-DCMAKE_BUILD_TYPE=Release")
   else
-    _build_type=Release
+    _extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
   fi
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
     -GNinja \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-    -DCMAKE_BUILD_TYPE=${_build_type} \
+    ${_extra_config[@]} \
     -DWITH_JPEG8=ON \
     ../${_realname}-${pkgver}
 
@@ -59,7 +55,7 @@ build() {
 
 check() {
   cd "${srcdir}/build-${MSYSTEM}"
-  ctest || true
+  ${MINGW_PREFIX}/bin/ctest || true
 }
 
 package() {