summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbartus2021-02-18 11:42:07 +0100
committerbartus2021-02-18 11:42:07 +0100
commit8f76ef676c1c46a0ff74d96f290be55a42f84d0b (patch)
tree71767edd2efdb7367d1b69afd7d156426d8e288b
parent66a7f2e474043270d7620329fc65ab8e3f65f8d6 (diff)
downloadaur-8f76ef676c1c46a0ff74d96f290be55a42f84d0b.tar.gz
Fix opencolor{,1} conflict
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD12
2 files changed, 12 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2a1b4a64bea..4000f6bb244 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -24,7 +24,7 @@ pkgbase = blender-git
depends = freetype2
depends = libxi
depends = openimageio-qfix
- depends = opencolorio
+ depends = opencolorio-qfix
depends = openvdb
depends = opencollada
depends = opensubdiv
diff --git a/PKGBUILD b/PKGBUILD
index 787b26445fa..7ffff68bdf6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,6 +8,12 @@ _fragment=${FRAGMENT:-#branch=master}
[[ -v CUDA_ARCH ]] && _CUDA_ARCH=(${CUDA_ARCH})
((TRAVIS)) && _cuda_capability+=(sm_50 sm_52 sm_60 sm_61 sm_70 sm_75)
+# opencolorio=2 fix (add LD_LIBRRY_PATH or rpath to blender-2.93)
+_CMAKE_FLAGS+=( -DOSL_ROOT_DIR=/opt/osl
+ -DOPENIMAGEIO_ROOT_DIR=/opt/oiio
+ -DOPENCOLORIO_ROOT_DIR=/opt/ocio
+)
+
#some extra, unofficially supported stuff goes here:
_CMAKE_FLAGS+=( -DWITH_ALEMBIC_HDF5=ON )
_CMAKE_FLAGS+=( -DWITH_CYCLES_NETWORK=OFF )
@@ -19,7 +25,7 @@ pkgdesc="A fully integrated 3D graphics creation suite (development)"
arch=('i686' 'x86_64')
url="https://blender.org/"
depends+=('alembic' 'embree' 'libgl' 'python' 'python-numpy' 'openjpeg2'
- 'ffmpeg' 'fftw' 'openal' 'freetype2' 'libxi' 'openimageio-qfix' 'opencolorio'
+ 'ffmpeg' 'fftw' 'openal' 'freetype2' 'libxi' 'openimageio-qfix' 'opencolorio-qfix'
'openvdb' 'opencollada' 'opensubdiv' 'openshadinglanguage-qfix' 'libtiff' 'libpng')
optdepends=('cuda: CUDA support in Cycles'
'optix=7.1.0: OptiX support in Cycles'
@@ -115,6 +121,10 @@ package() {
_suffix=${pkgver%%.r*}
DESTDIR="$pkgdir" ninja -C "$srcdir/build" install
+ #undo rpath clean in cmake_install ( faster than patching CMakeLists.txt)
+ cp "$srcdir/build/bin/blender" "$pkgdir/usr/bin/blender"
+
+
if [[ -e "$pkgdir/usr/share/blender/${_suffix}/scripts/addons/cycles/lib/" ]] ; then
# make sure the cuda kernels are not stripped
chmod 444 "$pkgdir"/usr/share/blender/${_suffix}/scripts/addons/cycles/lib/*