Merge remote-tracking branch 'upstream/main' into Automate-compressio…

…n-method-detection

.bazelversion

@@ -1 +1 @@
-6.3.2
+7.0.0

.github/workflows/bazel_build.yml

@@ -57,9 +57,9 @@ jobs:
       run: |
         bazelisk build //...
         bazelisk test //...
-        # Test bzlmod
-        bazelisk build --enable_bzlmod -- //...
-        bazelisk test --enable_bzlmod -- //...
+        # Test without bzlmod
+        bazelisk build --noenable_bzlmod -- //...
+        bazelisk test --noenable_bzlmod -- //...
 
   build_and_test_windows:
     name: Windows Server 2022 build <Visual Studio 2022>
@@ -78,9 +78,9 @@ jobs:
       run: |
         bazelisk build //...
         bazelisk test //...
-        # Test bzlmod
-        bazelisk build --enable_bzlmod -- //...
-        bazelisk test --enable_bzlmod -- //...
+        # Test without bzlmod
+        bazelisk build --noenable_bzlmod -- //...
+        bazelisk test --noenable_bzlmod -- //...
 
   build_and_test_macos:
     name: macOS 13 Bazel build <Apple Clang14>
@@ -99,6 +99,6 @@ jobs:
       run: |
         bazelisk build //...
         bazelisk test //...
-        # Test bzlmod
-        bazelisk build --enable_bzlmod -- //...
-        bazelisk test --enable_bzlmod -- //...
+        # Test without bzlmod
+        bazelisk build --noenable_bzlmod -- //...
+        bazelisk test --noenable_bzlmod -- //...

.github/workflows/release-notice.yml

@@ -0,0 +1,36 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright (c) Contributors to the OpenEXR Project.
+
+name: Publish Release Notice to ASWF Slack
+
+on:
+  release:
+    types:
+      - published
+      # published should cover both 'released' and 'prereleased'
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+
+    steps:
+    - name: 'Notify Slack #release-announcements'
+      id: slack1
+      with:
+        project_name: "OpenEXR"
+        slack_bot_token: ${{ secrets.SLACK_BOT_TOKEN }}
+        slack_channel: "#release-announcements"
+        project_logo: "https://artwork.aswf.io/projects/openexr/icon/color/openexr-icon-color.png"
+      uses: jmertic/slack-release-notifier@main
+
+    - name: 'Notify Slack #openexr'
+      id: slack2
+      with:
+        project_name: "OpenEXR"
+        slack_bot_token: ${{ secrets.SLACK_BOT_TOKEN }}
+        slack_channel: "#openexr"
+        project_logo: "https://artwork.aswf.io/other/aswf/text/aqua/aswf-text-aqua.png"
+        project_logo: "https://artwork.aswf.io/projects/openexr/icon/color/openexr-icon-color.png"
+      uses: jmertic/slack-release-notifier@main
+

.github/workflows/snyk-scan-pr.yml

@@ -0,0 +1,45 @@
+---
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright (c) Contributors to the OpenEXR Project.
+
+name: Snyk Scan Code
+
+on:
+  # https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions
+  pull_request:
+    branches:
+      - main
+    paths:
+      - '**.h'
+      - '**.c'
+      - '**.cpp'
+
+jobs:
+  snyk-scan-pr:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: snyk/actions/setup@master
+        id: snyk
+
+      - name: Snyk version
+        run: echo "${{ steps.snyk.outputs.version }}"
+
+      - name: Snyk Auth
+        run: snyk auth ${{ secrets.SNYK_TOKEN }}
+
+      - name: Snyk Scan Code
+        # Scan the C/C++ code for vulnerabilities using the Snyk CLI with the unmanaged flag
+        # https://docs.snyk.io/scan-using-snyk/supported-languages-and-frameworks/c-c++ for options
+        run: snyk test --unmanaged --print-dep-paths --org=${{ secrets.SNYK_ORG }}
+        env:
+          SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
+        continue-on-error: true # optional
+
+      - name: Monitor for Vulnerabilities
+        # To import the test results (issues and dependencies) in the Snyk CLI, run the snyk monitor --unmanaged command:
+        run: snyk monitor --unmanaged --org=${{ secrets.SNYK_ORG }}
+        env:
+          SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
+        continue-on-error: true # optional

.mailmap

@@ -0,0 +1,163 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright (c) Contributors to the OpenEXR Project.
+#
+# This file establishes email equivalences so we can resolve what look like
+# multiple authors, but actually are the same author who has used multiple
+# emails over the course of their involvement with the project.
+#
+# The format is any of the following:
+#     <CANONICAL-EMAIL> <alternate-email>
+#     CANONICAL-NAME <CANONICAL-EMAIL> <alternate-email>
+#     CANONICAL-NAME <CANONICAL-EMAIL> alternate-name <alternate-email>
+#
+# You can check for duplicates with this command:
+#     git shortlog -sne --all
+# That command (and others) will use this file to collapse the duplicates.
+#
+# If you see any duplicates we don't account for here, or if you look at your
+# own entry here and want a different name or email to be your canonical one
+# (we may not have guessed correctly and matched your preferences), please
+# file a PR with the edits to this file.
+
+Aaron Demolder <[email protected]>
+Abe Fettig <[email protected]>
+Aloys Baillet <[email protected]> aloysb <[email protected]>
+Andrew Kunz <[email protected]>
+Anton Dukhovnikov <[email protected]> Anton Dukhovnikov <[email protected]>
+Antonio Rojas <[email protected]>
+Aras Pranckevičius <[email protected]> Aras Pranckevičius <[email protected]>
+Aras Pranckevičius <[email protected]> Aras Pranckevičius <[email protected]>
+Arkady Shapkin <[email protected]>
+Arkell Rasiah <[email protected]> Arkell Rasiah <[email protected]>
+Arkell Rasiah <[email protected]> Arkell Rasiah <[email protected]>
+Axel Waggershauser <[email protected]>
+axxel <[email protected]>
+Balázs Oroszi <[email protected]>
+Barnaby Robson <[email protected]> Barnaby Robson <[email protected]>
+Ben Grimes <[email protected]>
+Bernd <[email protected]>
+Brendan Bolles <[email protected]>
+CAHEK7 <[email protected]>
+Cary Phillips <[email protected]> cary-ilm <[email protected]>
+Cary Phillips <[email protected]> Cary Phillips <[email protected]>
+Cary Phillips <[email protected]> seabeepea <[email protected]>
+Catherine <[email protected]>
+Chris Leu <[email protected]> cdleu430 <[email protected]>
+Christina Tempelaar-Lietz <[email protected]> ¨Christina Tempelaar-Lietz¨ <[email protected]>
+Christina Tempelaar-Lietz <[email protected]> xlietz <[email protected]>
+Christopher Horvath <[email protected]>
+Christopher Kulla <[email protected]>
+Christoph Gohlke <[email protected]>
+cia-rana <[email protected]>
+Cristian Martínez <[email protected]>
+Dan Horák <[email protected]>
+Daniel Kaneider <[email protected]>
+Darby Johnston <[email protected]>
+Dave Sawyer <[email protected]>
+David Korczynski <[email protected]>
+Developer-Ecosystem-Engineering <65677710+Developer-Ecosystem-Engineering@users.noreply.github.com>
+dgmzc <[email protected]>
+Diogo Teles Sant'Anna <[email protected]>
+Dirk Lemstra <[email protected]> dirk <[email protected]>
+dracwyrm <[email protected]>
+Drew Hess <[email protected]>
+Ed Hanway <[email protected]> Ed Hanway <[email protected]>
+Edward Kmett <[email protected]>
+Eric Sommerlade <[email protected]>
+Eric Wimmer <[email protected]>
+E Sommerlade <[email protected]>
+fgc <fgc>
+Florian Kainz <[email protected]>
+Grant Kim <[email protected]>
+Gregorio Litenstein <[email protected]>
+Gyula Gubacsi <[email protected]>
+Halfdan Ingvarsson <[email protected]>
+Harry Mallon <[email protected]>
+Huibean Luo <[email protected]>
+ianianda <[email protected]>
+Ibraheem Alhashim <[email protected]>
+Jack Kingsman <[email protected]>
+Jamie Kenyon <[email protected]>
+Jan Tojnar <[email protected]>
+jbradley <[email protected]>
+Jean-Francois Panisset <[email protected]>
+Jens Lindgren <[email protected]>
+Ji Hun Yu <[email protected]>
+Johannes Vollmer <[email protected]>
+John Loy <[email protected]>
+John Mertic <[email protected]>
+Jonathan Stone <[email protected]>
+Jose Luis Cercos-Pita <[email protected]> Jose Luis Cercós Pita <[email protected]>
+Joseph Goldstone <[email protected]> Joseph Goldstone <[email protected]>
+Juha Reunanen <[email protected]>
+Julian Amann <[email protected]>
+Juri Abramov <[email protected]>  Juri Abramov <[email protected]>
+Juri Abramov <[email protected]> JuriAbramov <[email protected]>
+Karl Hendrikse <[email protected]> karlhendrikse <[email protected]>
+Karl Rasche <[email protected]> Karl Rasche <[email protected]>
+Kevin Wheatley <[email protected]>
+Kimball Thurston <[email protected]>
+kwizart <[email protected]>
+Larry Gritz <[email protected]>
+Laurens Voerman <[email protected]>
+L. E. Segovia <[email protected]>
+Liam Fernandez <[email protected]>
+lilinjie <[email protected]>
+Lucy Wilkes <[email protected]>
+luzpaz <[email protected]>
+mancoast <[email protected]>
+mandree <[email protected]>
+Mark Reid <[email protected]>
+Mark Sisson <[email protected]>
+Martin Aumüller <[email protected]>
+Martin Husemann <[email protected]>
+Matthäus G. Chajdas <[email protected]>
+Matthias C. M. Troffaes <[email protected]>
+Matt Pharr <[email protected]>
+Md Sadman Chowdhury <[email protected]>
+Michael Thomas (malinka) <[email protected]>
+Nicholas Yue <[email protected]>
+Nick Porcino <[email protected]> meshula <[email protected]>
+Nick Porcino <[email protected]> Nick Porcino <[email protected]>
+Nick Porcino <[email protected]> Nick Porcino <[email protected]>
+Nick Porcino <[email protected]> nporcino-pixar <[email protected]>
+Nick Rasmussen <[email protected]> Nick Rasmussen <[email protected]>
+Nick Rasmussen <[email protected]> Nick Rasmussen <[email protected]>
+Nicolas Chauvet <[email protected]>
+Niklas Hambüchen <[email protected]>
+OgreTransporter <[email protected]>
+oleksii.vorobiov <[email protected]>
+Owen Thompson <[email protected]>
+patlefort <[email protected]>
+Paul Schneider <[email protected]>
+Peter Hillman <[email protected]> peterhillman <[email protected]>
+Peter Hillman <[email protected]> peterhillman <[email protected]>
+Peter Steneteg <[email protected]>
+Peter Urbanec <[email protected]>
+Phyrexian <[email protected]>
+Piotr Stanczyk <[email protected]> Piotr <[email protected]>
+Piotr Stanczyk <[email protected]> Piotr Stanczyk <[email protected]>
+Piotr Stanczyk <[email protected]> pstanczyk <[email protected]>
+Ralph Potter <[email protected]>
+r-a-sattarov <[email protected]>
+Rémi Achard <[email protected]>
+Reto Kromer <[email protected]>
+Richard Goedeken <[email protected]>
+Sergey Fedorov <[email protected]>
+Shawn Walker-Salas <[email protected]>
+Simon Boorer <[email protected]>
+Simon Otter <[email protected]>
+Srinath Ravichandran <[email protected]>
+Thanh Ha <[email protected]>
+Thomas Debesse <[email protected]>
+Thorsten Kaufmann <[email protected]>
+Timothy Lyanguzov <[email protected]>
+Transporter <[email protected]>
+Vertexwahn <[email protected]>
+Wenzel Jakob <[email protected]>
+Wojciech Jarosz <[email protected]> wjarosz <wjarosz>
+Xo Wang <[email protected]>
+Yaakov Selkowitz <[email protected]>
+Yining Karl Li <[email protected]>
+Yujie Shu <[email protected]> Yujie Shu (Intern) <[email protected]>
+zengwei2000 <[email protected]>

CHANGES.md

@@ -23,6 +23,8 @@
 * [Version 3.0.1](#version-301-april-1-2021) April 1, 2021
 * [Version 3.0.1-beta](#version-301-beta-march-28-2021) March 28, 2021
 * [Version 3.0.0-beta](#version-300-beta-march-16-2021) March 16, 2021
+* [Version 2.5.10](#version-2510-december-19-2023) December 19, 2023
+* [Version 2.5.9](#version-259-july-31-2023) July 31, 2023
 * [Version 2.5.8](#version-258-march-18-2022) March 18, 2022
 * [Version 2.5.7](#version-257-june-16-2021) June 16, 2021
 * [Version 2.5.6](#version-256-may-17-2021) May 17, 2021
@@ -1379,6 +1381,28 @@ Specific OSS-fuzz issues addressed include:
 * [791](https://github.com/AcademySoftwareFoundation/openexr/pull/791)  Initial removal of all Imath source files and minimal cmake adjustments
 * [769](https://github.com/AcademySoftwareFoundation/openexr/pull/769)  Bugfix/arkellr remove cvsignore files
 
+## Version 2.5.10 (December 19, 2023)
+
+Patch release that fixes a build failure on macOS prior to 10.6
+(fallback for missing `libdispatch`).
+
+### Merged Pull Requests
+
+* [1596] (https://github.com/AcademySoftwareFoundation/openexr/pull/1596)
+macOS: use libdispatch only where available
+
+## Version 2.5.9 (July 31, 2023)
+
+Patch release that fixes a compile failure with gcc-13 gcc 13 and
+problem with PyIlmBase's pkgconfig.
+
+### Merged Pull Requests
+
+* [1499](https://github.com/AcademySoftwareFoundation/openexr/pull/1499)
+fix build of 2.5 branch with GCC 13
+* [1253](https://github.com/AcademySoftwareFoundation/openexr/pull/1253)
+Adjust exec_prefix path for PyIlmBase's pkgconfig file
+
 ## Version 2.5.8 (March 18, 2022)
 
 Patch release that backports two fixes:

CONTRIBUTING.md

@@ -211,7 +211,7 @@ [email protected] mail list.
 
 ### Pull Requests
 
-Contributions should be submitted as Github pull requests. See
+Contributions should be submitted as GitHub pull requests. See
 [Creating a pull request](https://help.github.com/articles/creating-a-pull-request/)
 if you're unfamiliar with this concept. 
 
@@ -227,7 +227,7 @@ with a separate pull request.
 
 3. Push commits to your fork.
 
-4. Create a Github pull request from your topic branch.
+4. Create a GitHub pull request from your topic branch.
 
 5. Pull requests will be reviewed by project committers and contributors,
 who may discuss, offer constructive feedback, request changes, or approve