pin open{imageio,shadinglanguage}, refactor

2 files changed, 29 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 924d519b0f74..ce177e25f759 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = appleseed-git
 	pkgdesc = physically-based global illumination rendering engine primarily designed for animation and visual effects.
-	pkgver = 2.1.0.beta.r137.g802dbf67b
+	pkgver = 2.1.0.beta.r267.gabb612f03
 	pkgrel = 1
 	epoch = 1
 	url = https://appleseedhq.net
@@ -17,8 +17,8 @@ pkgbase = appleseed-git
 	depends = boost
 	depends = openexr
 	depends = opencolorio
-	depends = openimageio
-	depends = openshadinglanguage>=1.8.9
+	depends = openimageio=2.1.19.0
+	depends = openshadinglanguage=1.10.13
 	depends = xerces-c
 	depends = zlib
 	provides = appleseed
diff --git a/PKGBUILD b/PKGBUILD
index 774c1be495f2..ae257cbf9c87 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,10 @@
+#!/bin/bash
 # Maintainer : bartus <arch-user-repoᘓbartus.33mail.com>
-pkgname=appleseed-git
+
 #_fragment="#branch=2.0.5-beta-maintenance"
-pkgver=2.1.0.beta.r137.g802dbf67b
+
+pkgname=appleseed-git
+pkgver=2.1.0.beta.r267.gabb612f03
 pkgrel=1
 epoch=1
 pkgdesc="physically-based global illumination rendering engine primarily designed for animation and visual effects. "
@@ -10,7 +13,7 @@ url="https://appleseedhq.net"
 license=('MIT')
 provides=('appleseed')
 conflicts=('appleseed')
-depends=(python2 python embree qt5-base seexpr-qt5 boost openexr opencolorio openimageio 'openshadinglanguage>=1.8.9' xerces-c zlib)
+depends=(python2 python embree qt5-base seexpr-qt5 boost openexr opencolorio 'openimageio=2.1.19.0' 'openshadinglanguage=1.10.13' xerces-c zlib)
 makedepends=(git cmake)
 options=()
 source=("${pkgname}::git+https://github.com/appleseedhq/appleseed.git${_fragment}"
@@ -19,10 +22,20 @@ source=("${pkgname}::git+https://github.com/appleseedhq/appleseed.git${_fragment
 sha256sums=('SKIP'
             '87b987f006e45d11cc4dfec2bd37fd2b760fd2bdbf06f48e7d467cbca9b2b301')
 
+pkgver() {
+  git -C "${srcdir}/${pkgname}" describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+prepare() {
+  git -C "${srcdir}/${pkgname}" apply -v ${srcdir}/cmake.extra.install.dirs.remove.patch
+  sed '/python37/s/37/38/' -i "${srcdir}/${pkgname}"/src/appleseed.python/CMakeLists.txt
+}
 
+build() {
+  _pyver=$(python -c "from sys import version_info; print(\"%d.%d\" % (version_info[0],version_info[1]))")
 CMAKE_FLAGS=( -DWITH_EMBREE=ON
               -DCMAKE_BUILD_TYPE=Ship
-              -DCMAKE_INSTALL_PREFIX=/opt/appleseed
+              -DCMAKE_INSTALL_PREFIX="/opt/appleseed"
               -DWITH_DISNEY_MATERIAL=ON
               -DWITH_PYTHON3_BINDINGS=ON
               -DUSE_STATIC_EMBREE=OFF
@@ -33,38 +46,20 @@ CMAKE_FLAGS=( -DWITH_EMBREE=ON
               -DUSE_STATIC_OSL=OFF
               -DWARNINGS_AS_ERRORS=OFF
               -DWITH_BENCH=OFF
+              -DPYTHON3_INCLUDE_DIR="/usr/include/python${_pyver}"
             )
+  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)
 
-pkgver() {
-  cd ${srcdir}/${pkgname}
-  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
-}
-
-prepare() {
-  cd ${pkgname}
-  git apply -v ${srcdir}/cmake.extra.install.dirs.remove.patch
-# git apply -v ${srcdir}/*.diff
-  sed '/python37/s/37/38/' -i src/appleseed.python/CMakeLists.txt
-  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"
-}
-
-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})
-  cd ${pkgname}
-  mkdir -p build
-  cd build
-  cmake ${CMAKE_FLAGS[*]} ..
-  make
+  cmake ${CMAKE_FLAGS[*]} -S "${srcdir}/${pkgname}" -B build -G Ninja
+  ninja -C build ${MAKEFLAGS:--j1}
 }
 
 package() {
-  cd ${pkgname}/build
-  make DESTDIR=${pkgdir} install
-  install -D -m644 "../LICENSE.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  DESTDIR="${pkgdir}" ninja -C build install
+  install -D -m644 "${srcdir}/${pkgname}/LICENSE.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
 # vim:set ts=2 sw=2 et: