diff options
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | PKGBUILD | 7 | ||||
-rw-r--r-- | embree.patch | 43 |
3 files changed, 51 insertions, 3 deletions
@@ -1,6 +1,6 @@ pkgbase = blender-2.8-git pkgdesc = Development version of Blender 2.8 branch - pkgver = 2.83.r93560.e2722aec6bc + pkgver = 2.83.r93804.4b2b5fe4b8d pkgrel = 1 url = https://blender.org/ install = blender.install @@ -47,6 +47,7 @@ pkgbase = blender-2.8-git source = blender-2.8.desktop source = SelectCudaComputeArch.patch source = usd_python.patch + source = embree.patch sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP @@ -55,6 +56,7 @@ pkgbase = blender-2.8-git sha256sums = 9d7bd988939f4e8d06adc3166bacd76cc87a488b40f042f033863af35eadfc43 sha256sums = 66b9bf3db441f35119ef0eb5f855142f2e773e8002ac0216e056bcc6f8ac409c sha256sums = 893b127c9e0ea1a67905434f729b45a993c58a7ea954f9f89480ad1cc0578849 + sha256sums = 42afe119529a5350034a489225958112bf4b84bdee38757a932e5caaa9bd5ed4 pkgname = blender-2.8-git @@ -15,7 +15,7 @@ _EXTRAOPTS+=( -DWITH_ALEMBIC_HDF5=ON pkgname=blender-2.8-git _fragment="#branch=master" -pkgver=2.83.r93560.e2722aec6bc +pkgver=2.83.r93804.4b2b5fe4b8d pkgrel=1 pkgdesc="Development version of Blender 2.8 branch" arch=('i686' 'x86_64') @@ -43,6 +43,7 @@ source=("git://git.blender.org/blender.git${_fragment}" blender-2.8.desktop SelectCudaComputeArch.patch usd_python.patch #add missing python headers when building against python enabled usd. + embree.patch #add missing embree link. ) sha256sums=('SKIP' 'SKIP' @@ -51,7 +52,8 @@ sha256sums=('SKIP' 'SKIP' '9d7bd988939f4e8d06adc3166bacd76cc87a488b40f042f033863af35eadfc43' '66b9bf3db441f35119ef0eb5f855142f2e773e8002ac0216e056bcc6f8ac409c' - '893b127c9e0ea1a67905434f729b45a993c58a7ea954f9f89480ad1cc0578849') + '893b127c9e0ea1a67905434f729b45a993c58a7ea954f9f89480ad1cc0578849' + '42afe119529a5350034a489225958112bf4b84bdee38757a932e5caaa9bd5ed4') pkgver() { cd "$srcdir/blender" @@ -66,6 +68,7 @@ prepare() { git apply -v ${srcdir}/SelectCudaComputeArch.patch fi git apply -v ${srcdir}/usd_python.patch + git apply -v ${srcdir}/embree.patch } build() { diff --git a/embree.patch b/embree.patch new file mode 100644 index 000000000000..bed0b39e744c --- /dev/null +++ b/embree.patch @@ -0,0 +1,43 @@ +diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt +index d9a2ebf8571..f3b7d156024 100644 +--- a/intern/cycles/blender/CMakeLists.txt ++++ b/intern/cycles/blender/CMakeLists.txt +@@ -66,6 +66,12 @@ if(WITH_CYCLES_LOGGING) + ) + endif() + ++if(WITH_CYCLES_EMBREE) ++ list(APPEND LIB ++ ${EMBREE_LIBRARIES} ++ ) ++endif() ++ + set(ADDON_FILES + addon/__init__.py + addon/engine.py +diff --git a/build_files/cmake/Modules/FindEmbree.cmake b/build_files/cmake/Modules/FindEmbree.cmake +index d9d525d4586..03b509a28f3 100644 +--- a/build_files/cmake/Modules/FindEmbree.cmake ++++ b/build_files/cmake/Modules/FindEmbree.cmake +@@ -72,7 +72,7 @@ ENDFOREACH() + + FIND_LIBRARY(EMBREE_LIBRARY + NAMES +- libembree3 ++ embree3 + HINTS + ${_embree_SEARCH_DIRS} + PATH_SUFFIXES +@@ -83,10 +83,10 @@ FIND_LIBRARY(EMBREE_LIBRARY + # all listed variables are TRUE + INCLUDE(FindPackageHandleStandardArgs) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(EMBREE DEFAULT_MSG +- _embree_LIBRARIES EMBREE_INCLUDE_DIR) ++ EMBREE_LIBRARY EMBREE_INCLUDE_DIR) + + IF(EMBREE_FOUND) +- SET(EMBREE_LIBRARIES ${_embree_LIBRARIES}) ++ SET(EMBREE_LIBRARIES ${EMBREE_LIBRARY}) + SET(EMBREE_INCLUDE_DIRS ${EMBREE_INCLUDE_DIR}) + ENDIF(EMBREE_FOUND) + |