From 60b9bf9a2593573a2db2896909b4dfdcf3a14c82 Mon Sep 17 00:00:00 2001 From: Vertexwahn Date: Tue, 8 Nov 2022 08:57:40 +0100 Subject: [PATCH] Switch to Imath 3.1.6 for Bazel build Signed-off-by: Vertexwahn --- .bazelversion | 2 +- bazel/third_party/Imath.BUILD | 8 ++++---- bazel/third_party/openexr_deps.bzl | 12 ++++-------- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/.bazelversion b/.bazelversion index c7cb1311a6..84197c8946 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -5.3.1 +5.3.2 diff --git a/bazel/third_party/Imath.BUILD b/bazel/third_party/Imath.BUILD index 00ab420eec..3613f25d31 100644 --- a/bazel/third_party/Imath.BUILD +++ b/bazel/third_party/Imath.BUILD @@ -8,14 +8,14 @@ expand_template( out = "src/Imath/ImathConfig.h", substitutions = { "@IMATH_INTERNAL_NAMESPACE@": "Imath_3_1", - "@IMATH_LIB_VERSION@": "3.1.5", + "@IMATH_LIB_VERSION@": "3.1.6", "@IMATH_NAMESPACE_CUSTOM@": "0", "@IMATH_NAMESPACE@": "Imath", - "@IMATH_PACKAGE_NAME@": "Imath 3.1.5", + "@IMATH_PACKAGE_NAME@": "Imath 3.1.6", "@IMATH_VERSION_MAJOR@": "3", "@IMATH_VERSION_MINOR@": "1", - "@IMATH_VERSION_PATCH@": "5", - "@IMATH_VERSION@": "3.1.5", + "@IMATH_VERSION_PATCH@": "6", + "@IMATH_VERSION@": "3.1.6", "#cmakedefine IMATH_HALF_USE_LOOKUP_TABLE": "#define IMATH_HALF_USE_LOOKUP_TABLE", "#cmakedefine IMATH_ENABLE_API_VISIBILITY": "#define IMATH_ENABLE_API_VISIBILITY", "#cmakedefine IMATH_HAVE_LARGE_STACK": "/* #undef IMATH_HAVE_LARGE_STACK */", diff --git a/bazel/third_party/openexr_deps.bzl b/bazel/third_party/openexr_deps.bzl index 7c1b2df61b..6b761330d5 100644 --- a/bazel/third_party/openexr_deps.bzl +++ b/bazel/third_party/openexr_deps.bzl @@ -21,17 +21,13 @@ def openexr_deps(): ], ) - # sha256 was determined using: - # curl -sL https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v3.1.5.tar.gz --output Imath-3.1.5.tar.gz - # sha256sum Imath-3.1.5.tar.gz - # If the hash is incorrect Bazel will report an error and show the actual hash of the file. maybe( http_archive, name = "Imath", build_file = "@com_openexr//:bazel/third_party/Imath.BUILD", - strip_prefix = "Imath-3.1.5", - sha256 = "1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb", - urls = ["https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v3.1.5.tar.gz"], + strip_prefix = "Imath-3.1.6", + sha256 = "ea5592230f5ab917bea3ceab266cf38eb4aa4a523078d46eac0f5a89c52304db", + urls = ["https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v3.1.6.tar.gz"], ) maybe( @@ -42,4 +38,4 @@ def openexr_deps(): "https://github.com/bazelbuild/bazel-skylib/releases/download/1.3.0/bazel-skylib-1.3.0.tar.gz", ], sha256 = "74d544d96f4a5bb630d465ca8bbcfe231e3594e5aae57e1edbf17a6eb3ca2506", - ) \ No newline at end of file + )