[Bf-blender-cvs] [b2627dff497] master: Build: Upgrading OpenPGL version to 0.4.0

[Sebastian Herholz]

Commit: b2627dff4971ee9912fe8b41a09fcfa861eaadbb
Author: Sebastian Herholz
Date:   Thu Oct 13 17:45:14 2022 +0200
Branches: master
https://developer.blender.org/rBb2627dff4971ee9912fe8b41a09fcfa861eaadbb

Build: Upgrading OpenPGL version to 0.4.0

===================================================================

M	build_files/build_environment/cmake/openpgl.cmake
M	build_files/build_environment/cmake/versions.cmake

===================================================================

diff --git a/build_files/build_environment/cmake/openpgl.cmake b/build_files/build_environment/cmake/openpgl.cmake
index 18dd5c5399a..30e05e31138 100644
--- a/build_files/build_environment/cmake/openpgl.cmake
+++ b/build_files/build_environment/cmake/openpgl.cmake
@@ -8,7 +8,6 @@ set(OPENPGL_EXTRA_ARGS
     -DOPENPGL_BUILD_STATIC=ON
     -DOPENPGL_TBB_ROOT=${LIBDIR}/tbb
     -DTBB_ROOT=${LIBDIR}/tbb
-    -Dembree_DIR=${LIBDIR}/embree/lib/cmake/embree-${EMBREE_VERSION}
     -DCMAKE_DEBUG_POSTFIX=_d
 )
 
@@ -31,7 +30,6 @@ ExternalProject_Add(external_openpgl
 add_dependencies(
     external_openpgl
     external_tbb
-    external_embree
 )
 
 if(WIN32)
diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake
index 6e36db1e387..85821d5de0e 100644
--- a/build_files/build_environment/cmake/versions.cmake
+++ b/build_files/build_environment/cmake/versions.cmake
@@ -561,10 +561,10 @@ set(BROTLI_HASH_TYPE SHA256)
 set(BROTLI_FILE brotli-v${BROTLI_VERSION}.tar.gz)
 set(BROTLI_CPE "cpe:2.3:a:google:brotli:${BROTLI_VERSION}:*:*:*:*:*:*:*")
 
-set(OPENPGL_VERSION v0.3.1-beta)
-set(OPENPGL_SHORT_VERSION 0.3.1)
+set(OPENPGL_VERSION v0.4.0-beta)
+set(OPENPGL_SHORT_VERSION 0.4.0)
 set(OPENPGL_URI https://github.com/OpenPathGuidingLibrary/openpgl/archive/refs/tags/${OPENPGL_VERSION}.tar.gz)
-set(OPENPGL_HASH 3830098c485c962018932766199527aab453a8029528dbbc04d4454d82431e2c)
+set(OPENPGL_HASH 1842d289e9b0efb6889640cd16e253eefecc2c1d01eea1c6bdec6fbcf9f166ae)
 set(OPENPGL_HASH_TYPE SHA256)
 set(OPENPGL_FILE openpgl-${OPENPGL_VERSION}.tar.gz)