Add USD and Embree support.

3 files changed, 57 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a48746d99ecf..e982eedf4e95 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = blender-2.8-git
 	pkgdesc = Development version of Blender 2.8 branch
-	pkgver = 2.83.r93502.cef4d344f94
+	pkgver = 2.83.r93560.e2722aec6bc
 	pkgrel = 1
 	url = https://blender.org/
 	install = blender.install
@@ -34,6 +34,8 @@ pkgbase = blender-2.8-git
 	depends = openshadinglanguage
 	depends = libtiff
 	depends = libpng
+	depends = embree
+	depends = usd=19.11
 	optdepends = cuda: CUDA support in Cycles
 	provides = blender-2.83
 	conflicts = blender-2.83
@@ -44,13 +46,15 @@ pkgbase = blender-2.8-git
 	source = blender-dev-tools.git::git://git.blender.org/blender-dev-tools.git
 	source = blender-2.8.desktop
 	source = SelectCudaComputeArch.patch
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = cd108dca1c77607c6a7cc45aa284ea97
-	md5sums = 4441d9a6db38b85b7dc5c3c9e6872951
+	source = usd_python.patch
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = 9d7bd988939f4e8d06adc3166bacd76cc87a488b40f042f033863af35eadfc43
+	sha256sums = 66b9bf3db441f35119ef0eb5f855142f2e773e8002ac0216e056bcc6f8ac409c
+	sha256sums = 893b127c9e0ea1a67905434f729b45a993c58a7ea954f9f89480ad1cc0578849
 
 pkgname = blender-2.8-git
 
diff --git a/PKGBUILD b/PKGBUILD
index b83c16168224..c639dc351b9e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,16 +6,23 @@
 #_cuda_capability+=(sm_50 sm_52 sm_60 sm_61 sm_70 sm_75)
 ((TRAVIS)) && _cuda_capability+=(sm_50 sm_52 sm_60 sm_61 sm_70 sm_75) # suppress 3.x to prevent Travis build exceed time limit.
 
+#some extra, not officially supported stuff goes here:
+_EXTRAOPTS+=( -DWITH_ALEMBIC_HDF5=ON
+              -DWITH_CYCLES_EMBREE=ON
+              -DWITH_USD=ON
+              -DUSD_ROOT=/usr
+            )
+
 pkgname=blender-2.8-git
 _fragment="#branch=master"
-pkgver=2.83.r93502.cef4d344f94
+pkgver=2.83.r93560.e2722aec6bc
 pkgrel=1
 pkgdesc="Development version of Blender 2.8 branch"
 arch=('i686' 'x86_64')
 url="https://blender.org/"
 depends=('alembic' 'libgl' 'python' 'python-numpy' 'openjpeg' 'desktop-file-utils' 'hicolor-icon-theme'
          'ffmpeg' 'fftw' 'openal' 'freetype2' 'libxi' 'openimageio' 'opencolorio' 'openimagedenoise'
-         'openvdb' 'opencollada' 'opensubdiv' 'openshadinglanguage' 'libtiff' 'libpng')
+         'openvdb' 'opencollada' 'opensubdiv' 'openshadinglanguage' 'libtiff' 'libpng' 'embree' 'usd=19.11')
 makedepends=('git' 'cmake' 'boost' 'mesa' 'llvm')
 ((DISABLE_NINJA)) ||  makedepends+=('ninja')
 ((DISABLE_CUDA)) && optdepends=('cuda: CUDA support in Cycles') || { makedepends+=('cuda') ; ((DISABLE_OPTIX)) || makedepends+=('optix>=7.0'); }
@@ -35,14 +42,16 @@ source=("git://git.blender.org/blender.git${_fragment}"
         'blender-dev-tools.git::git://git.blender.org/blender-dev-tools.git'
         blender-2.8.desktop
         SelectCudaComputeArch.patch
+        usd_python.patch #add missing python headers when building against python enabled usd.
         )
-md5sums=('SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'cd108dca1c77607c6a7cc45aa284ea97'
-         '4441d9a6db38b85b7dc5c3c9e6872951')
+sha256sums=('SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            '9d7bd988939f4e8d06adc3166bacd76cc87a488b40f042f033863af35eadfc43'
+            '66b9bf3db441f35119ef0eb5f855142f2e773e8002ac0216e056bcc6f8ac409c'
+            '893b127c9e0ea1a67905434f729b45a993c58a7ea954f9f89480ad1cc0578849')
 
 pkgver() {
   cd "$srcdir/blender"
@@ -56,6 +65,7 @@ prepare() {
   if [ -z "$_cuda_capability" ] && grep -q nvidia <(lsmod); then 
     git apply -v ${srcdir}/SelectCudaComputeArch.patch
   fi
+  git apply -v ${srcdir}/usd_python.patch
 }
 
 build() {
diff --git a/usd_python.patch b/usd_python.patch
new file mode 100644
index 000000000000..1834b1a1571a
--- /dev/null
+++ b/usd_python.patch
@@ -0,0 +1,26 @@
+diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake
+index ac570f17e47..505aa97934c 100644
+--- a/build_files/cmake/platform/platform_unix.cmake
++++ b/build_files/cmake/platform/platform_unix.cmake
+@@ -320,6 +320,9 @@ if(WITH_BOOST)
+     if(WITH_OPENVDB)
+       list(APPEND __boost_packages iostreams)
+     endif()
++    if(WITH_USD)
++      list(APPEND __boost_packages python27)
++    endif()
+     list(APPEND __boost_packages system)
+     find_package(Boost 1.48 COMPONENTS ${__boost_packages})
+     if(NOT Boost_FOUND)
+diff --git a/source/blender/usd/CMakeLists.txt b/source/blender/usd/CMakeLists.txt
+index 6ea02f44d76..0ec18e17689 100644
+--- a/source/blender/usd/CMakeLists.txt
++++ b/source/blender/usd/CMakeLists.txt
+@@ -48,6 +48,7 @@ set(INC
+ set(INC_SYS
+   ${USD_INCLUDE_DIRS}
+   ${BOOST_INCLUDE_DIR}
++  ${PYTHON_INCLUDE_DIRS}
+   ${TBB_INCLUDE_DIR}
+ )
+