Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSybren A. Stüvel <sybren@blender.org>2022-01-27 17:09:46 +0300
committerSybren A. Stüvel <sybren@blender.org>2022-01-27 17:10:05 +0300
commit5730668dea092ace6e4bd4e92e75df351656ea23 (patch)
tree17e7133a8125bb82a1ec6d1b88270ce9a6202f6a /build_files
parent8a20aec40305eba12900d2ed3a63610c6cc3a3e3 (diff)
Downgrade Python zstandard module to 0.16.0
Downgrade the Python zstandard from 0.17.0 to 0.16.0. The Python package should be linked against the exact same version of libzstd as Blender is, otherwise it will refuse to load from within the Blender executable. Python zstandard 0.17.0 links to 1.5.1, whereas we need 1.5.0.
Diffstat (limited to 'build_files')
-rw-r--r--build_files/build_environment/cmake/versions.cmake4
1 files changed, 3 insertions, 1 deletions
diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake
index 83b8c2c5e8b..c5f9aecabbf 100644
--- a/build_files/build_environment/cmake/versions.cmake
+++ b/build_files/build_environment/cmake/versions.cmake
@@ -221,7 +221,9 @@ set(URLLIB3_VERSION 1.26.8)
set(CERTIFI_VERSION 2021.10.8)
set(REQUESTS_VERSION 2.27.1)
set(CYTHON_VERSION 0.29.26)
-set(ZSTANDARD_VERSION 0.17.0 )
+# The version of the zstd library used to build the Python package should match ZSTD_VERSION defined below.
+# At this time of writing, 0.17.0 was already released, but built against zstd 1.5.1, while we use 1.5.0.
+set(ZSTANDARD_VERSION 0.16.0)
set(NUMPY_VERSION 1.22.0)
set(NUMPY_SHORT_VERSION 1.22)