From 848b0865633dc3c07de23fbefeb18063b833888b Mon Sep 17 00:00:00 2001
From: Vertexwahn <julian.amann@tum.de>
Date: Sat, 4 Mar 2023 09:00:43 +0100
Subject: [PATCH] Bazel Support: Switch to Imath 3.1.7

Signed-off-by: Vertexwahn <julian.amann@tum.de>
---
 .bazelversion                      |  2 +-
 bazel/third_party/Imath.BUILD      |  8 ++++----
 bazel/third_party/openexr_deps.bzl | 15 +++++++--------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/.bazelversion b/.bazelversion
index 84197c8946..09b254e90c 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-5.3.2
+6.0.0
diff --git a/bazel/third_party/Imath.BUILD b/bazel/third_party/Imath.BUILD
index 3613f25d31..4f65c67578 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.6",
+        "@IMATH_LIB_VERSION@": "3.1.7",
         "@IMATH_NAMESPACE_CUSTOM@": "0",
         "@IMATH_NAMESPACE@": "Imath",
-        "@IMATH_PACKAGE_NAME@": "Imath 3.1.6",
+        "@IMATH_PACKAGE_NAME@": "Imath 3.1.7",
         "@IMATH_VERSION_MAJOR@": "3",
         "@IMATH_VERSION_MINOR@": "1",
-        "@IMATH_VERSION_PATCH@": "6",
-        "@IMATH_VERSION@": "3.1.6",
+        "@IMATH_VERSION_PATCH@": "7",
+        "@IMATH_VERSION@": "3.1.7",
         "#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 6b761330d5..f6038e300e 100644
--- a/bazel/third_party/openexr_deps.bzl
+++ b/bazel/third_party/openexr_deps.bzl
@@ -25,17 +25,16 @@ def openexr_deps():
         http_archive,
         name = "Imath",
         build_file = "@com_openexr//:bazel/third_party/Imath.BUILD",
-        strip_prefix = "Imath-3.1.6",
-        sha256 = "ea5592230f5ab917bea3ceab266cf38eb4aa4a523078d46eac0f5a89c52304db",
-        urls = ["https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v3.1.6.tar.gz"],
+        strip_prefix = "Imath-3.1.7",
+        sha256 = "bff1fa140f4af0e7f02c6cb78d41b9a7d5508e6bcdfda3a583e35460eb6d4b47",
+        urls = ["https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v3.1.7.tar.gz"],
     )
 
-    maybe(
-        http_archive,
+    http_archive(
         name = "bazel_skylib",
+        sha256 = "b8a1527901774180afc798aeb28c4634bdccf19c4d98e7bdd1ce79d1fe9aaad7",
         urls = [
-            "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.3.0/bazel-skylib-1.3.0.tar.gz",
-            "https://github.com/bazelbuild/bazel-skylib/releases/download/1.3.0/bazel-skylib-1.3.0.tar.gz",
+            "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/bazel-skylib-1.4.1.tar.gz",
+            "https://github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/bazel-skylib-1.4.1.tar.gz",
         ],
-        sha256 = "74d544d96f4a5bb630d465ca8bbcfe231e3594e5aae57e1edbf17a6eb3ca2506",
     )