Merge branch 'blender-v3.6-release' into main

build_files/build_environment/cmake/python.cmake

@@ -81,14 +81,14 @@ else()
   set(PYTHON_BINARY ${LIBDIR}/python/bin/python${PYTHON_SHORT_VERSION})
   # Link against zlib statically (Unix). Avoid rpath issues (macOS).
   set(PYTHON_PATCH ${PATCH_CMD} --verbose -p1 -d ${BUILD_DIR}/python/src/external_python < ${PATCH_DIR}/python_unix.diff)
-  set(PYTHON_CONFIGURE_EXTRA_ARGS "--with-openssl=${LIBDIR}/ssl")
+  set(PYTHON_CONFIGURE_EXTRA_ARGS "")
   set(PYTHON_CFLAGS "-I${LIBDIR}/sqlite/include -I${LIBDIR}/bzip2/include -I${LIBDIR}/lzma/include -I${LIBDIR}/zlib/include ${PLATFORM_CFLAGS}")
   set(PYTHON_LDFLAGS "-L${LIBDIR}/ffi/lib -L${LIBDIR}/sqlite/lib -L${LIBDIR}/bzip2/lib -L${LIBDIR}/lzma/lib -L${LIBDIR}/zlib/lib ${PLATFORM_LDFLAGS}")
   set(PYTHON_CONFIGURE_EXTRA_ENV
     export CFLAGS=${PYTHON_CFLAGS} &&
     export CPPFLAGS=${PYTHON_CFLAGS} &&
     export LDFLAGS=${PYTHON_LDFLAGS} &&
-    export PKG_CONFIG_PATH=${LIBDIR}/ffi/lib/pkgconfig)
+    export PKG_CONFIG_PATH=${LIBDIR}/ffi/lib/pkgconfig:${LIBDIR}/ssl/lib64/pkgconfig)
 
   # NOTE: untested on APPLE so far.
   if(NOT APPLE)

build_files/build_environment/cmake/tiff.cmake

@@ -13,6 +13,7 @@ set(TIFF_EXTRA_ARGS
   -Djbig=OFF
   -Dzstd=OFF
   -Dwebp=OFF
+  -Dtiff-tests=OFF
 )
 
 ExternalProject_Add(external_tiff

build_files/build_environment/cmake/versions.cmake

@@ -189,9 +189,9 @@ set(ROBINMAP_HASH c08ec4b1bf1c85eb0d6432244a6a89862229da1cb834f3f90fba8dc35d8c8e
 set(ROBINMAP_HASH_TYPE SHA256)
 set(ROBINMAP_FILE robinmap-${ROBINMAP_VERSION}.tar.gz)
 
-set(TIFF_VERSION 4.4.0)
+set(TIFF_VERSION 4.5.1)
 set(TIFF_URI http://download.osgeo.org/libtiff/tiff-${TIFF_VERSION}.tar.gz)
-set(TIFF_HASH 376f17f189e9d02280dfe709b2b2bbea)
+set(TIFF_HASH d08c5f9eee6350fffc239e5993d92779)
 set(TIFF_HASH_TYPE MD5)
 set(TIFF_FILE tiff-${TIFF_VERSION}.tar.gz)
 set(TIFF_CPE "cpe:2.3:a:libtiff:libtiff:${TIFF_VERSION}:*:*:*:*:*:*:*")
@@ -210,11 +210,11 @@ set(OSL_FILE OpenShadingLanguage-${OSL_VERSION}.tar.gz)
 # BZIP2, FFI, SQLITE and change the versions in this file as well. For compliance
 # reasons there can be no exceptions to this.
 
-set(PYTHON_VERSION 3.10.11)
+set(PYTHON_VERSION 3.10.12)
 set(PYTHON_SHORT_VERSION 3.10)
 set(PYTHON_SHORT_VERSION_NO_DOTS 310)
 set(PYTHON_URI https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tar.xz)
-set(PYTHON_HASH 1bf8481a683e0881e14d52e0f23633a6)
+set(PYTHON_HASH 49b0342476b984e106d308c25d657f12)
 set(PYTHON_HASH_TYPE MD5)
 set(PYTHON_FILE Python-${PYTHON_VERSION}.tar.xz)
 set(PYTHON_CPE "cpe:2.3:a:python:python:${PYTHON_VERSION}:-:*:*:*:*:*:*")
@@ -376,9 +376,9 @@ set(JEMALLOC_HASH 3d41fbf006e6ebffd489bdb304d009ae)
 set(JEMALLOC_HASH_TYPE MD5)
 set(JEMALLOC_FILE jemalloc-${JEMALLOC_VERSION}.tar.bz2)
 
-set(XML2_VERSION 2.10.3)
+set(XML2_VERSION 2.10.4)
 set(XML2_URI https://download.gnome.org/sources/libxml2/2.10/libxml2-${XML2_VERSION}.tar.xz)
-set(XML2_HASH f9edac7fac232b3657a003fd9a5bbe42)
+set(XML2_HASH 76808c467a58c31e2dbd511e71d5fd13)
 set(XML2_HASH_TYPE MD5)
 set(XML2_FILE libxml2-${XML2_VERSION}.tar.xz)
 set(XML2_CPE "cpe:2.3:a:xmlsoft:libxml2:${XML2_VERSION}:*:*:*:*:*:*:*")
@@ -455,9 +455,9 @@ set(LZMA_HASH_TYPE SHA256)
 set(LZMA_FILE xz-${LZMA_VERSION}.tar.bz2)
 
 # NOTE: Python's build has been modified to use our ssl version.
-set(SSL_VERSION 1.1.1t)
+set(SSL_VERSION 3.0.9)
 set(SSL_URI https://www.openssl.org/source/openssl-${SSL_VERSION}.tar.gz)
-set(SSL_HASH 8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b)
+set(SSL_HASH eb1ab04781474360f77c318ab89d8c5a03abc38e63d65a603cabbf1b00a1dc90)
 set(SSL_HASH_TYPE SHA256)
 set(SSL_FILE openssl-${SSL_VERSION}.tar.gz)
 set(SSL_CPE "cpe:2.3:a:openssl:openssl:${SSL_VERSION}:*:*:*:*:*:*:*")

build_files/build_environment/linux/linux_rocky8_setup.sh

@@ -105,6 +105,10 @@ PACKAGES_FOR_LIBS=(
     ncurses-devel
     # Required by: `external_ispc` (when building with CLANG).
     libstdc++-static
+
+    # Required by: `external_ssl` (build dependencies).
+    perl-IPC-Cmd
+    perl-Pod-Html
 )
 
 # Additional packages needed for building Blender.

release/bin/blender-launcher

@@ -0,0 +1,12 @@
+#!/bin/sh
+BF_DIST_BIN=$(dirname "$0")
+BF_PROGRAM="blender"
+
+# Add own lib folder first, because Steam or other environments may set an
+# LD_LIBRARY_PATH that has priority over the runpath in the Blender excutable,
+# but contains incompatible libraries.
+LD_LIBRARY_PATH=${BF_DIST_BIN}/lib:${LD_LIBRARY_PATH}
+
+export LD_LIBRARY_PATH
+
+exec "$BF_DIST_BIN/$BF_PROGRAM" ${1+"$@"}

source/creator/CMakeLists.txt

@@ -645,6 +645,7 @@ if(UNIX AND NOT APPLE)
 
       install(
         PROGRAMS
+        ${CMAKE_SOURCE_DIR}/release/bin/blender-launcher
         ${CMAKE_SOURCE_DIR}/release/bin/blender-softwaregl
         DESTINATION "."
       )

tools/check_blender_release/check_static_binaries.py

@@ -53,7 +53,7 @@ ALLOWED_LIBS = (
     "libfreetype.so",
 )
 
-IGNORE_FILES = ("blender-softwaregl", )
+IGNORE_FILES = ("blender-launcher", "blender-softwaregl", )
 IGNORE_EXTENSION = (".sh", ".py", )