Refactor:

* fix shellcheck warings
* extract cmake args
* add patch loop

1 files changed, 15 insertions, 15 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 13ecd09890eb..c4ebcee144e3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -21,6 +21,8 @@ sha256sums=('5f8599c64a9c1dbdf0d8ee13a4d395b03e9bcba17fec731526109437ab760898'
 
 
 CMAKE_FLAGS=( -DWITH_EMBREE=ON
+              -DCMAKE_BUILD_TYPE=Ship
+              -DCMAKE_INSTALL_PREFIX=/opt/appleseed
               -DWITH_DISNEY_MATERIAL=ON
               -DWITH_PYTHON3_BINDINGS=ON
               -DUSE_STATIC_EMBREE=OFF
@@ -33,28 +35,26 @@ CMAKE_FLAGS=( -DWITH_EMBREE=ON
             )
 
 prepare() {
-  cd ${pkgname}-${_pkgver}
-  patch -Np1 -i ${srcdir}/cmake.extra.install.dirs.remove.patch
-  grep -q avx /proc/cpuinfo && CMAKE_FLAGS="${CMAKE_FLAGS} -DUSE_AVX=ON"
-  grep -q avx2 /proc/cpuinfo && CMAKE_FLAGS="${CMAKE_FLAGS} -DUSE_AVX2=ON"
-  grep -q f16c /proc/cpuinfo && CMAKE_FLAGS="${CMAKE_FLAGS} -DUSE_F16C=ON"
-  grep -q sse4_2 /proc/cpuinfo && CMAKE_FLAGS="${CMAKE_FLAGS} -DUSE_SSE42=ON"
+  for patch in "${srcdir}"/*.patch; do
+    msg2 "Applying patch: ${patch##*/}"
+    patch -d "${pkgname}-${_pkgver}" -Nfp1 -i "$patch" || true #silently drop failed chunks
+  done
+  grep -q    avx /proc/cpuinfo && CMAKE_FLAGS+=(   -DUSE_AVX=ON)
+  grep -q   avx2 /proc/cpuinfo && CMAKE_FLAGS+=(  -DUSE_AVX2=ON)
+  grep -q   f16c /proc/cpuinfo && CMAKE_FLAGS+=(  -DUSE_F16C=ON)
+  grep -q sse4_2 /proc/cpuinfo && CMAKE_FLAGS+=( -DUSE_SSE42=ON)
 }
 
 build() {
-  cd ${pkgname}-${_pkgver}
-  mkdir -p build
-  cd build
   _pyver=$(python -c "from sys import version_info; print(\"%d.%d\" % (version_info[0],version_info[1]))")
-  CMAKE_FLAGS+=( -DPYTHON3_INCLUDE_DIR=/usr/include/python${_pyver}m )
-  cmake -DCMAKE_BUILD_TYPE=Ship -DCMAKE_INSTALL_PREFIX=/opt/appleseed ${CMAKE_FLAGS[*]} ..
-  make
+  CMAKE_FLAGS+=( -DPYTHON3_INCLUDE_DIR="/usr/include/python${_pyver}")
+  cmake "${CMAKE_FLAGS[@]}" -S "${pkgname}-${_pkgver}" -B build
+  make -C build
 }
 
 package() {
-  cd ${pkgname}-${_pkgver}/build
-  make DESTDIR=${pkgdir} install
-  install -D -m644 "../LICENSE.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  make -C build DESTDIR="${pkgdir}" install
+  install -D -m644 "${pkgname}-${_pkgver}/LICENSE.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
 # vim:set ts=2 sw=2 et: