[Bf-blender-cvs] [31ba4dd82e2] master: Build: bump OSL version to hash in 1.13 which is under development

Brecht Van Lommel noreply at git.blender.org
Tue Dec 13 18:54:16 CET 2022


Commit: 31ba4dd82e2fff2a79c398b1ec1bfa523d107def
Author: Brecht Van Lommel
Date:   Tue Dec 13 18:53:12 2022 +0100
Branches: master
https://developer.blender.org/rB31ba4dd82e2fff2a79c398b1ec1bfa523d107def

Build: bump OSL version to hash in 1.13 which is under development

This includes string table changes to make the Cycles OptiX support work.

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

M	build_files/build_environment/cmake/versions.cmake

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

diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake
index 097f632b356..870f2da9abe 100644
--- a/build_files/build_environment/cmake/versions.cmake
+++ b/build_files/build_environment/cmake/versions.cmake
@@ -195,9 +195,12 @@ set(TIFF_HASH_TYPE MD5)
 set(TIFF_FILE tiff-${TIFF_VERSION}.tar.gz)
 set(TIFF_CPE "cpe:2.3:a:libtiff:libtiff:${TIFF_VERSION}:*:*:*:*:*:*:*")
 
-set(OSL_VERSION 1.12.7.1)
-set(OSL_URI https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/archive/v${OSL_VERSION}.tar.gz)
-set(OSL_HASH 53211da86c34ba6e0344998c1a6d219c)
+# Recent commit from 1.13.0.2 under development, which includes string table
+# changes that make the Cycles OptiX implementation work. Official 1.12 OSL
+# releases should also build but without OptiX support.
+set(OSL_VERSION 1a7670600c8b08c2443a78d03c8c27e9a1149140)
+set(OSL_URI https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/archive/${OSL_VERSION}.tar.gz)
+set(OSL_HASH 7b6d6716b05d1addb92a8f47280bf77f)
 set(OSL_HASH_TYPE MD5)
 set(OSL_FILE OpenShadingLanguage-${OSL_VERSION}.tar.gz)



More information about the Bf-blender-cvs mailing list