diff --git a/OpenEXR.spec b/OpenEXR.spec index 4677f4b7e2fae16331b45e6214c0acab28ccb726..560066e616d7fb85cda2713feedc867226b70e33 100644 --- a/OpenEXR.spec +++ b/OpenEXR.spec @@ -1,10 +1,13 @@ Name: OpenEXR Summary: A high dynamic-range (HDR) image file format for use in computer imaging applications Version: 3.1.5 -Release: 2 +Release: 3 License: BSD-3-Clause URL: http://www.openexr.com/ Source0: https://github.com/AcademySoftwareFoundation/openexr/archive/v%{version}/openexr-%{version}.tar.gz + +Patch0000: backport-fix-Bazel-Imath-version-defines-1256.patch + BuildRequires: gcc-c++ zlib-devel pkgconfig python3-devel BuildRequires: cmake gcc boost-devel pkgconfig(Imath) @@ -68,6 +71,9 @@ This package contains libraries and header files for development of %{name}. %{_libdir}/pkgconfig/OpenEXR.pc %changelog +* Thu Dec 29 2022 yaoguangzhong - 3.1.5-3 +- backport fix Bazel Imath version defines + * Tue May 10 2022 Ge Wang - 3.1.5-2 - license compliance rectification diff --git a/backport-fix-Bazel-Imath-version-defines-1256.patch b/backport-fix-Bazel-Imath-version-defines-1256.patch new file mode 100644 index 0000000000000000000000000000000000000000..c131b548596784762e2a0e8578b54e6d171be654 --- /dev/null +++ b/backport-fix-Bazel-Imath-version-defines-1256.patch @@ -0,0 +1,67 @@ +From ea51ede26f3be8df7021204dc827d236aaf08187 Mon Sep 17 00:00:00 2001 +From: Vertexwahn +Date: Tue, 3 May 2022 02:43:31 +0200 +Subject: [PATCH] Fix Bazel Imath version defines (#1256) + +Signed-off-by: Julian Amann +--- + .bazelversion | 2 +- + .github/workflows/bazel_build.yml | 4 ++-- + bazel/third_party/Imath.BUILD | 8 ++++---- + 3 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/.bazelversion b/.bazelversion +index 831446cb..ac14c3df 100644 +--- a/.bazelversion ++++ b/.bazelversion +@@ -1 +1 @@ +-5.1.0 ++5.1.1 +diff --git a/.github/workflows/bazel_build.yml b/.github/workflows/bazel_build.yml +index 52876178..f5406fb8 100644 +--- a/.github/workflows/bazel_build.yml ++++ b/.github/workflows/bazel_build.yml +@@ -34,7 +34,7 @@ jobs: + steps: + - uses: actions/checkout@v3 + +- - name: Mount bazel cache ++ - name: Mount Bazel cache + uses: actions/cache@v2 + with: + path: "/home/runner/.cache/bazel" +@@ -51,7 +51,7 @@ jobs: + steps: + - uses: actions/checkout@v3 + +- - name: Mount bazel cache ++ - name: Mount Bazel cache + uses: actions/cache@v2 + with: + path: "/home/runner/.cache/bazel" +diff --git a/bazel/third_party/Imath.BUILD b/bazel/third_party/Imath.BUILD +index 6e483138..f3d8bda3 100644 +--- a/bazel/third_party/Imath.BUILD ++++ b/bazel/third_party/Imath.BUILD +@@ -7,14 +7,14 @@ generate_header( + name = "ImathConfig.h", + substitutions = { + "@IMATH_INTERNAL_NAMESPACE@": "Imath_3_1", +- "@IMATH_LIB_VERSION@": "3.1.4", ++ "@IMATH_LIB_VERSION@": "3.1.5", + "@IMATH_NAMESPACE_CUSTOM@": "0", + "@IMATH_NAMESPACE@": "Imath", +- "@IMATH_PACKAGE_NAME@": "Imath 3.1.4", ++ "@IMATH_PACKAGE_NAME@": "Imath 3.1.5", + "@IMATH_VERSION_MAJOR@": "3", + "@IMATH_VERSION_MINOR@": "1", +- "@IMATH_VERSION_PATCH@": "4", +- "@IMATH_VERSION@": "3.1.4", ++ "@IMATH_VERSION_PATCH@": "5", ++ "@IMATH_VERSION@": "3.1.5", + "#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 */", +-- +2.27.0 +