openjph: update to 0.12.0

msys2 · May 3, 2024 · b7f1b05 · b7f1b05
1 parent df0073b
commit b7f1b05
Showing 1 changed file with 12 additions and 25 deletions.
diff --git a/mingw-w64-openjph/PKGBUILD b/mingw-w64-openjph/PKGBUILD
@@ -4,7 +4,7 @@
 _realname=openjph
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=0.11.0
+pkgver=0.12.0
 pkgrel=1
 pkgdesc="Open-source implementation of HTJ2K (mingw-w64)"
 arch=('any')
@@ -18,7 +18,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja")
 source=(${_realname}-${pkgver}.tar.gz::https://github.com/aous72/OpenJPH/archive/${pkgver}.tar.gz)
-sha256sums=('43814a50a81a0e2447c6275f221ef87f34ac4c073e713d8d7e82c1e80e284ec1')
+sha256sums=('e73fd0b12d95c0b61884579f61c26da7461335146e7e9c84f4a2dd5c9325bb4f')
 
 build() {
   declare -a _extra_config
@@ -28,28 +28,18 @@ build() {
     _extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
   fi
 
-  msg "Build static version"
-  [[ -d ${srcdir}/build-static-${MSYSTEM} ]] && rm -rf ${srcdir}/build-static-${MSYSTEM}
-  mkdir ${srcdir}/build-static-${MSYSTEM}
-  cd ${srcdir}/build-static-${MSYSTEM}
-
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
     -G"Ninja" \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
     ${_extra_config[@]} \
     -DBUILD_SHARED_LIBS=OFF \
     -DCMAKE_SYSTEM_PREFIX_PATH=${MINGW_PREFIX} \
-    -DOJPH_DISABLE_INTEL_SIMD=$( [[ ${CARCH} == aarch64 ]] &&
-                        echo "ON" || echo "OFF" ) \
-    ../OpenJPH-${pkgver}
-
-  ${MINGW_PREFIX}/bin/cmake --build ./
+    -DOJPH_DISABLE_INTEL_SIMD=$([[ ${CARCH} == aarch64 ]] && echo "ON" || echo "OFF") \
+    -S OpenJPH-${pkgver} \
+    -B build-static-${MSYSTEM}
 
-  msg "Build shared version"
-  [[ -d ${srcdir}/build-shared-${MSYSTEM} ]] && rm -rf ${srcdir}/build-shared-${MSYSTEM}
-  mkdir ${srcdir}/build-shared-${MSYSTEM}
-  cd ${srcdir}/build-shared-${MSYSTEM}
+  ${MINGW_PREFIX}/bin/cmake --build build-static-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
@@ -59,19 +49,16 @@ build() {
     ${_extra_config[@]} \
     -DBUILD_SHARED_LIBS=ON \
     -DCMAKE_SYSTEM_PREFIX_PATH=${MINGW_PREFIX} \
-    -DOJPH_DISABLE_INTEL_SIMD=$( [[ ${CARCH} == aarch64 ]] &&
-                        echo "ON" || echo "OFF" ) \
-    ../OpenJPH-${pkgver}
+    -DOJPH_DISABLE_INTEL_SIMD=$([[ ${CARCH} == aarch64 ]] && echo "ON" || echo "OFF") \
+    -S OpenJPH-${pkgver} \
+    -B build-shared-${MSYSTEM}
 
-  ${MINGW_PREFIX}/bin/cmake --build ./
+  ${MINGW_PREFIX}/bin/cmake --build build-shared-${MSYSTEM}
 }
 
 package() {
-  cd "${srcdir}/build-static-${MSYSTEM}"
-  DESTDIR=${pkgdir} ${MINGW_PREFIX}/bin/cmake --install .
-
-  cd "${srcdir}/build-shared-${MSYSTEM}"
-  DESTDIR=${pkgdir} ${MINGW_PREFIX}/bin/cmake --install .
+  DESTDIR=${pkgdir} ${MINGW_PREFIX}/bin/cmake --install build-static-${MSYSTEM}
+  DESTDIR=${pkgdir} ${MINGW_PREFIX}/bin/cmake --install build-shared-${MSYSTEM}
 
   install -Dm644 "${srcdir}/OpenJPH-${pkgver}/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
 }