Update embree.patch

3 files changed, 44 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 78ae50784983..7e08d0e7bdae 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = blender-develop-git
 	pkgdesc = Development version of Blender (non-conflicting version)
-	pkgver = 2.91.r98402.g8c10e56331d
+	pkgver = 2.91.r98801.gb522e834ec3
 	pkgrel = 1
 	url = https://blender.org/
 	changelog = blender.changelog
@@ -51,7 +51,7 @@ pkgbase = blender-develop-git
 	sha256sums = SKIP
 	sha256sums = 66b9bf3db441f35119ef0eb5f855142f2e773e8002ac0216e056bcc6f8ac409c
 	sha256sums = 12bd6db5c1fe14244fd7321e3d740941a36aa545ec21b02325e7553c9214778a
-	sha256sums = 43581c10e325cef3eb55a1a274c15a00d948833af14398fde831a2ba9791a6ea
+	sha256sums = dd04c10b6a9c78849608eebfd1f2a5f2a280b7413a24a7f0337d67bceab90cb4
 
 pkgname = blender-develop-git
 
diff --git a/PKGBUILD b/PKGBUILD
index eb591920968a..04d780424e38 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,7 +19,7 @@ _CMAKE_FLAGS+=( -DWITH_ALEMBIC_HDF5=ON )
 ((DISABLE_CUDA)) && optdepends+=('cuda: CUDA support in Cycles') || { makedepends+=('cuda') ; ((DISABLE_OPTIX)) || makedepends+=('optix>=7.0'); }
 
 pkgname=blender-develop-git
-pkgver=2.91.r98402.g8c10e56331d
+pkgver=2.91.r98801.gb522e834ec3
 pkgrel=1
 pkgdesc="Development version of Blender (non-conflicting version)"
 changelog=blender.changelog
@@ -54,7 +54,7 @@ sha256sums=('SKIP'
             'SKIP'
             '66b9bf3db441f35119ef0eb5f855142f2e773e8002ac0216e056bcc6f8ac409c'
             '12bd6db5c1fe14244fd7321e3d740941a36aa545ec21b02325e7553c9214778a'
-            '43581c10e325cef3eb55a1a274c15a00d948833af14398fde831a2ba9791a6ea')
+            'dd04c10b6a9c78849608eebfd1f2a5f2a280b7413a24a7f0337d67bceab90cb4')
 
 pkgver() {
   blender_version=$(grep -Po "BLENDER_VERSION \K[0-9]{3}" "$srcdir"/blender/source/blender/blenkernel/BKE_blender_version.h)
diff --git a/embree.patch b/embree.patch
index 8f3868f89c70..9fe60af14487 100644
--- a/embree.patch
+++ b/embree.patch
@@ -1,34 +1,31 @@
-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
+index 90cf23d3e13..f625efaa542 100644
 --- a/build_files/cmake/Modules/FindEmbree.cmake
 +++ b/build_files/cmake/Modules/FindEmbree.cmake
-@@ -72,7 +72,7 @@ ENDFOREACH()
+@@ -7,6 +7,9 @@
+ #  EMBREE_ROOT_DIR, The base directory to search for Embree.
+ #                        This can also be an environment variable.
+ #  EMBREEFOUND, If false, do not try to use Embree.
++#
++# also defined, but not for general use are
++#  EMBREE_LIBRARY, where to find the Embree library.
+ 
+ #=============================================================================
+ # Copyright 2018 Blender Foundation.
+@@ -67,14 +70,23 @@ FOREACH(COMPONENT ${_embree_FIND_COMPONENTS})
+ ENDFOREACH()
+ 
  
- FIND_LIBRARY(EMBREE_LIBRARY
-   NAMES
--    libembree3
++FIND_LIBRARY(EMBREE_LIBRARY
++  NAMES
 +    embree3
-   HINTS
-     ${_embree_SEARCH_DIRS}
-   PATH_SUFFIXES
-@@ -83,10 +83,10 @@ FIND_LIBRARY(EMBREE_LIBRARY
++  HINTS
++    ${_embree_SEARCH_DIRS}
++  PATH_SUFFIXES
++    lib64 lib
++)
++
+ # handle the QUIETLY and REQUIRED arguments and set EMBREE_FOUND to TRUE if
  # all listed variables are TRUE
  INCLUDE(FindPackageHandleStandardArgs)
  FIND_PACKAGE_HANDLE_STANDARD_ARGS(Embree DEFAULT_MSG
@@ -41,3 +38,20 @@ index d9d525d4586..03b509a28f3 100644
    SET(EMBREE_INCLUDE_DIRS ${EMBREE_INCLUDE_DIR})
  ENDIF(EMBREE_FOUND)
  
+diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt
+index 2316800e21e..591841152e2 100644
+--- a/intern/cycles/blender/CMakeLists.txt
++++ b/intern/cycles/blender/CMakeLists.txt
+@@ -67,6 +67,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