[Bf-blender-cvs] [6629f6ccc59] cycles_path_guiding: Deps: Switching to bugfix version of OpenPGL 0.4.0
Sebastian Herholz
noreply at git.blender.org
Fri Oct 14 13:34:18 CEST 2022
Commit: 6629f6ccc593d592a79c643edb830505f9e50624
Author: Sebastian Herholz
Date: Fri Oct 14 13:34:16 2022 +0200
Branches: cycles_path_guiding
https://developer.blender.org/rB6629f6ccc593d592a79c643edb830505f9e50624
Deps: Switching to bugfix version of OpenPGL 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 30e05e31138..b41264ac22b 100644
--- a/build_files/build_environment/cmake/openpgl.cmake
+++ b/build_files/build_environment/cmake/openpgl.cmake
@@ -4,7 +4,6 @@
# library itself does not depend on them, so should give no problems.
set(OPENPGL_EXTRA_ARGS
- -DOPENPGL_BUILD_PYTHON=OFF
-DOPENPGL_BUILD_STATIC=ON
-DOPENPGL_TBB_ROOT=${LIBDIR}/tbb
-DTBB_ROOT=${LIBDIR}/tbb
diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake
index 85821d5de0e..a59311b9e56 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.4.0-beta)
+set(OPENPGL_VERSION 40fa9f4ae16d0a00d9afa8bfbe95276b37f931cd)
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 1842d289e9b0efb6889640cd16e253eefecc2c1d01eea1c6bdec6fbcf9f166ae)
+set(OPENPGL_URI https://github.com/OpenPathGuidingLibrary/openpgl/archive/${OPENPGL_VERSION}.tar.gz)
+set(OPENPGL_HASH 46895cce761fc56ee20bedaf9ca94c7337e1e12a947d29a7a3edce0cda731571)
set(OPENPGL_HASH_TYPE SHA256)
set(OPENPGL_FILE openpgl-${OPENPGL_VERSION}.tar.gz)
More information about the Bf-blender-cvs
mailing list