aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbartus2020-07-08 18:15:49 +0200
committerbartus2020-07-08 18:15:49 +0200
commitf53595d3513d2163c2cdb2a38ce670830ea0593c (patch)
treea2763b2be7c7b5919dcc0c7e152410dd607e8d93
parentb63ceae727a43dcf6781726e8460ee178dddc771 (diff)
downloadaur-f53595d3513d2163c2cdb2a38ce670830ea0593c.tar.gz
Drop DISABLE_EMBREE env var since it's now required.
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD8
2 files changed, 3 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8f63c2248f84..79443e98f5e0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -13,8 +13,8 @@ pkgbase = blender-develop-git
makedepends = boost
makedepends = mesa
makedepends = llvm
- depends = embree
depends = alembic
+ depends = embree
depends = libgl
depends = python
depends = python-numpy
diff --git a/PKGBUILD b/PKGBUILD
index 58fa4d842aa7..e3d91d37c4c0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,10 +10,6 @@ _fragment=${FRAGMENT:-#branch=master}
#some extra, unofficially supported stuff goes here:
((TRAVIS)) && _cuda_capability+=(sm_50 sm_52 sm_60 sm_61 sm_70 sm_75) # Travis memory limit is not enough to build for arch 3.x.
_CMAKE_FLAGS+=( -DWITH_ALEMBIC_HDF5=ON )
-((DISABLE_EMBREE)) || {
- _CMAKE_FLAGS+=( -DWITH_CYCLES_EMBREE=ON )
- depends+=(embree)
-}
((DISABLE_USD)) || {
_CMAKE_FLAGS+=( -DWITH_USD=ON
-DUSD_ROOT=/usr )
@@ -30,7 +26,7 @@ pkgdesc="Development version of Blender 2.8 branch"
changelog=blender.changelog
arch=('i686' 'x86_64')
url="https://blender.org/"
-depends+=('alembic' 'libgl' 'python' 'python-numpy' 'openjpeg2'
+depends+=('alembic' 'embree' 'libgl' 'python' 'python-numpy' 'openjpeg2'
'ffmpeg' 'fftw' 'openal' 'freetype2' 'libxi' 'openimageio' 'opencolorio'
'openvdb' 'opencollada' 'opensubdiv' 'openshadinglanguage' 'libtiff' 'libpng')
depends+=('openimagedenoise')
@@ -77,7 +73,7 @@ prepare() {
git -C "$srcdir/blender" apply -v "${srcdir}"/SelectCudaComputeArch.patch
fi
((DISABLE_USD)) || git -C "$srcdir/blender" apply -v "${srcdir}"/usd_python.patch
- ((DISABLE_EMBREE)) || git -C "$srcdir/blender" apply -v "${srcdir}"/embree.patch
+ git -C "$srcdir/blender" apply -v "${srcdir}"/embree.patch
}
build() {