summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbartus2020-06-11 17:50:38 +0200
committerbartus2020-06-11 17:50:38 +0200
commitcdf30713a3d1bb5c80a075aa70ffa27baf53be62 (patch)
treed73b82422f074f16c55c1e260376972de256514a
parent19c742b9d62c55dc5875af774236e82933f80f9e (diff)
downloadaur-cdf30713a3d1bb5c80a075aa70ffa27baf53be62.tar.gz
Refactor
* Sort arrays. * Allow MAKEFLAGS expansion in ninja call.
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD5
2 files changed, 6 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ac691be3f48..9a6fb5e7de4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -14,13 +14,13 @@ pkgbase = luxcorerender
makedepends = ninja
makedepends = pyside2-tools
depends = opencl-icd-loader
- depends = openimagedenoise
- depends = openimageio
- depends = boost-libs
depends = blosc
+ depends = boost-libs
depends = embree
depends = glfw
depends = gtk3
+ depends = openimagedenoise
+ depends = openimageio
optdepends = opencl-driver: for gpu acceleration
optdepends = pyside2: for pyluxcoretools gui
provides = luxrays
diff --git a/PKGBUILD b/PKGBUILD
index 9eb188857ad..4bd8d8465d8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,7 +20,7 @@ pkgdesc="Physically correct, unbiased rendering engine."
arch=('x86_64')
url="https://www.luxcorerender.org/"
license=('Apache')
-depends+=(openimagedenoise openimageio boost-libs blosc embree glfw gtk3)
+depends+=(blosc boost-libs embree glfw gtk3 openimagedenoise openimageio)
optdepends+=("pyside2: for pyluxcoretools gui")
makedepends+=(boost git doxygen cmake ninja pyside2-tools)
provides=(luxrays)
@@ -45,7 +45,8 @@ build() {
_pyver=$(python -c "from sys import version_info; print(\"%d%d\" % (version_info.major,version_info.minor))")
CMAKE_FLAGS+=("-DPYTHON_V=${_pyver}")
cmake "${CMAKE_FLAGS[@]}" -S "${srcdir}"/${_name} -B build -G Ninja
- ninja "$(grep -oP -- '-+[A-z]+ ?[0-9]*'<<<"${MAKEFLAGS:--j1}")" -C "${srcdir}/build"
+# shellcheck disable=SC2086
+ ninja $(grep -oP -- '-+[A-z]+ ?[0-9]*'<<<"${MAKEFLAGS:--j1}") -C "${srcdir}/build"
}
package() {