diff options
| author | bartus | 2020-12-19 23:12:19 +0100 |
|---|---|---|
| committer | bartus | 2020-12-19 23:12:19 +0100 |
| commit | d52794cae4998f73b6e657d421678af52536f7b0 (patch) | |
| tree | b2757950996a88e0c97ba4e3469983f24ff78740 | |
| parent | 8275cb41916fe9e3ff52af6071ed1bed900e6a95 (diff) | |
| download | aur-d52794cae4998f73b6e657d421678af52536f7b0.tar.gz | |
Fix boost:1.74 build
| -rw-r--r-- | .SRCINFO | 7 | ||||
| -rw-r--r-- | PKGBUILD | 13 | ||||
| -rw-r--r-- | boost_107400.patch | 12 |
3 files changed, 25 insertions, 7 deletions
@@ -1,7 +1,7 @@ pkgbase = mitsuba-git pkgdesc = Mitsuba physically based renderer. pkgver = 0.6.0.r2172.cfeb7766 - pkgrel = 1 + pkgrel = 2 url = http://mitsuba-renderer.org/ arch = i686 arch = x86_64 @@ -10,7 +10,9 @@ pkgbase = mitsuba-git makedepends = python2-scons makedepends = git makedepends = boost + makedepends = boost-python2 depends = python + depends = python2 depends = xerces-c depends = glew-1.13.0 depends = openexr @@ -21,14 +23,17 @@ pkgbase = mitsuba-git depends = fftw depends = collada-dom-mitsuba depends = boost-libs + depends = boost-python2-libs depends = pcre provides = mitsuba conflicts = mitsuba conflicts = mitsuba-hg source = mitsuba::git+https://github.com/mitsuba-renderer/mitsuba.git source = python3.9.patch + source = boost_107400.patch sha256sums = SKIP sha256sums = 6fc5513d95182a84209b4bbdce8cd2eee3bdf25aadd5da35c6b246479c4c8939 + sha256sums = c4c571653c86e7c21d702f1f5cb9695edc32bf9fc05f6246e67a660693a32322 pkgname = mitsuba-git @@ -5,20 +5,22 @@ _pkgname="mitsuba" _pkgver="0.6.0" pkgname="${_pkgname}-git" pkgver=0.6.0.r2172.cfeb7766 -pkgrel=1 +pkgrel=2 pkgdesc="Mitsuba physically based renderer." url="http://mitsuba-renderer.org/" license=("GPL3") arch=("i686" "x86_64") -depends=("python" "xerces-c" "glew-1.13.0" "openexr" "libpng" "libjpeg" "qt5-base" "qt5-xmlpatterns" "fftw" "collada-dom-mitsuba" "boost-libs" "pcre") -makedepends=("eigen" "python2-scons" "git" "boost") +depends=(python{,2} "xerces-c" "glew-1.13.0" "openexr" "libpng" "libjpeg" "qt5-base" "qt5-xmlpatterns" "fftw" "collada-dom-mitsuba" boost{,-python2}-libs "pcre") +makedepends=("eigen" "python2-scons" "git" boost{,-python2}) provides=("mitsuba") conflicts=("mitsuba" "mitsuba-hg") source=("${_pkgname}::git+https://github.com/mitsuba-renderer/mitsuba.git" "python3.9.patch" + "boost_107400.patch" ) sha256sums=('SKIP' - '6fc5513d95182a84209b4bbdce8cd2eee3bdf25aadd5da35c6b246479c4c8939') + '6fc5513d95182a84209b4bbdce8cd2eee3bdf25aadd5da35c6b246479c4c8939' + 'c4c571653c86e7c21d702f1f5cb9695edc32bf9fc05f6246e67a660693a32322') pkgver() { cd ${_pkgname} @@ -55,13 +57,12 @@ prepare() { sed -i "s/^CFLAGS[ ]*= \[/&\'${CFLAGS// /\',\'}\', /g" config.py sed -i "s/^CXXFLAGS[ ]*= \[/&\'${CXXFLAGS// /\',\'}\', /g" config.py - git apply ${srcdir}/python3.9.patch + git apply -v ${srcdir}/{python3.9,boost_107400}.patch } build() { cd "${_pkgname}" scons2 --jobs=$((${MAKEFLAGS/-j/} - 1)) - } package() { diff --git a/boost_107400.patch b/boost_107400.patch new file mode 100644 index 000000000000..39e16951c50d --- /dev/null +++ b/boost_107400.patch @@ -0,0 +1,12 @@ +diff --git a/src/volume/volcache.cpp b/src/volume/volcache.cpp +index f1edd726..ab8558c7 100644 +--- a/src/volume/volcache.cpp ++++ b/src/volume/volcache.cpp +@@ -22,6 +22,7 @@ + #include <mitsuba/core/sched.h> + #include <mitsuba/core/lrucache.h> + #include <fstream> ++#include <boost/bind.hpp> + + MTS_NAMESPACE_BEGIN + |