diff options
| author | bartus | 2021-06-10 18:55:48 +0200 |
|---|---|---|
| committer | bartus | 2021-06-10 18:56:54 +0200 |
| commit | 9d36437cca9cd3dd15ae528e77ef2d141c83808a (patch) | |
| tree | ade4b4d334a67513074fdcf0045e398a66c747da | |
| parent | b473e8f856e008b4e71be018ca61a10992629a51 (diff) | |
| download | aur-9d36437cca9cd3dd15ae528e77ef2d141c83808a.tar.gz | |
Revert "Fix opencolorio{,1} conflict"
This reverts commit 2384d793950e6760de8a5547813adcd7f01e0a96.
Revert "Quick fix for opencolorio=2"
This reverts commit c65c943f0705f91566cd8cbff182ce3457e59c3f.
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 13 |
2 files changed, 5 insertions, 14 deletions
@@ -28,12 +28,12 @@ pkgbase = blender-develop-git depends = openal depends = freetype2 depends = libxi - depends = openimageio-qfix - depends = opencolorio-qfix + depends = openimageio + depends = opencolorio depends = openvdb depends = opencollada depends = opensubdiv - depends = openshadinglanguage-qfix + depends = openshadinglanguage depends = libtiff depends = libpng depends = openimagedenoise @@ -12,12 +12,6 @@ _CMAKE_FLAGS+=( -DCMAKE_C_COMPILER=gcc-10 -DCMAKE_CXX_COMPILER=g++-10 ) -# 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: ((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. ((DISABLE_USD)) && { @@ -39,8 +33,8 @@ changelog=blender.changelog arch=('i686' 'x86_64') url="https://blender.org/" depends+=('alembic' 'embree' 'libgl' 'python' 'python-numpy' 'openjpeg2' 'libharu' 'potrace' 'openxr' - 'ffmpeg' 'fftw' 'openal' 'freetype2' 'libxi' 'openimageio-qfix' 'opencolorio-qfix' - 'openvdb' 'opencollada' 'opensubdiv' 'openshadinglanguage-qfix' 'libtiff' 'libpng') + 'ffmpeg' 'fftw' 'openal' 'freetype2' 'libxi' 'openimageio' 'opencolorio' + 'openvdb' 'opencollada' 'opensubdiv' 'openshadinglanguage' 'libtiff' 'libpng') depends+=('openimagedenoise') makedepends+=('git' 'cmake' 'boost' 'mesa' 'llvm') provides=("blender=${pkgver%%.r*}") @@ -130,9 +124,6 @@ package() { export DESTDIR="$pkgdir" if ((DISABLE_NINJA)); then make -C "$srcdir/build" install; else ninja -C "$srcdir/build" install; fi - #undo rpath clean in cmake_install ( faster than patching CMakeLists.txt) - cp "$srcdir/build/bin/blender" "$pkgdir/usr/bin/blender" - msg "add -${_suffix} suffix to desktop shortcut" sed -i "s/=blender/=blender-${_suffix}/g" "${pkgdir}/usr/share/applications/blender.desktop" sed -i "s/=Blender/=Blender-${_suffix}/g" "${pkgdir}/usr/share/applications/blender.desktop" |