diff options
| author | bill-auger <mr.j.spam.me@gmail.com> | 2020-12-14 01:01:22 -0500 |
|---|---|---|
| committer | bill-auger <mr.j.spam.me@gmail.com> | 2020-12-14 04:21:20 -0500 |
| commit | b594f094a7a0f6d122c2ce33d5b3c3526c2523de (patch) | |
| tree | 0764b226a71171d521b88b907e803bf0f0a32081 | |
| parent | a766065d396a8a5a3a7fd22569285847e77fdb3a (diff) | |
[blender]: rebuild against latest boost-libs
| -rw-r--r-- | libre/blender/PKGBUILD | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/libre/blender/PKGBUILD b/libre/blender/PKGBUILD index 8783dad73..c175fcf7a 100644 --- a/libre/blender/PKGBUILD +++ b/libre/blender/PKGBUILD @@ -15,7 +15,7 @@ pkgname=blender pkgver=2.91.0 pkgrel=4 -pkgrel+=.parabola2 +pkgrel+=.parabola3 epoch=17 _pythonver_x86_64=3.9 _pythonver_i686=3.8 @@ -35,11 +35,10 @@ depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' 'python-requ depends_x86_64=('embree' 'openimagedenoise') depends_i686=('embree') makedepends=('cmake' 'boost' 'mesa' 'git' 'llvm' 'ninja') -if [[ "${CARCH}" == 'i686' ]] -then # FIXME: special case deps - presently, 'openxr' is only in [community-testing] - depends[21]='openimageio=2.1.16.0' # but 'community-testing/openimageio' is incompatible with 'openshadinglanguage', so we must specify the one in [community] - depends+=('jsoncpp=1.9.4') # also 'extra/jsoncpp' is incompatible with 'openxr', so we must specify the one in [testing] - makedepends[0]='cmake=3.18.1' # and 'extra/cmake' is incompatible with 'testing/jsoncpp', so we must specify the one in [testing] +if [[ "${CARCH}" == 'i686' ]] ; then # FIXME: special case deps - currently, 'openxr' is only in [community-testing] + depends[21]='openimageio=2.1.16.0' # but 'community-testing/openimageio' is incompatible with 'openshadinglanguage', so we must specify the one in [community] + depends+=('jsoncpp=1.9.4') # also 'extra/jsoncpp' is incompatible with 'openxr', so we must specify the one in [testing] + makedepends[0]='cmake=3.18.1' # and 'extra/cmake' is incompatible with 'testing/jsoncpp', so we must specify the one in [testing] fi options=(!strip) source=("git://git.blender.org/blender.git#tag=v$pkgver" @@ -140,16 +139,16 @@ package() { # pin to tightly-coupled dependency versions # NOTE: indirect sodeps may still be unsatisfyable: # libboost_filesystem.so <- openimageio, - # libboost_thread.so <- openshadinglanguage + # libboost_thread.so <- openshadinglanguage, + # libboost_iostreams.so <- openvdb depends+=( libboost_locale.so $(_version_constraint openexr 2) # eg: libHalf.so.12 -$( [[ "${CARCH}" == 'i686' ]] && echo 'openimageio=2.1.16.0' || echo \ $(_version_constraint openimageio 2) # eg: libOpenImageIO.so.2.0 -) # FIXME: special case dep $(_version_constraint openshadinglanguage 2) # eg: liboslcomp.so.1.10 $(_version_constraint opensubdiv 3) # eg: libosdGPU.so.3.3.3 $(_version_constraint openvdb 2) # eg: libopenvdb.so.6.2 $(_version_constraint python 2) ) # eg: libpython3.6.so.1.0 + [[ "${CARCH}" == 'i686' ]] && depends[37]='' depends[38]='' # FIXME: special case dep openimageio DESTDIR="${pkgdir}" ninja -C build install install -Dm755 release/bin/blender-softwaregl "${pkgdir}/usr/bin/blender-softwaregl" |