Merge branch 'main' into dependabot/github_actions/actions/checkout-6.0.1

Author: cary-ilm

.github/workflows/codeql.yml

@@ -65,7 +65,7 @@ jobs:
       # cary: Pin the version to the SHA for 2.18.0, since there appears to
       # be a problem with 2.18.1 leading to a "No space left on
       # device" failure
-      uses: github/codeql-action/init@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
+      uses: github/codeql-action/init@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
       with:
         # cary: the "linked" setting is necessary to force the run to pick up
         # the version specified in the action.
@@ -96,6 +96,6 @@ jobs:
 
     - name: Perform CodeQL Analysis
       # Pin the version to the SHA for 2.18.0 
-      uses: github/codeql-action/analyze@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
+      uses: github/codeql-action/analyze@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/release-sign.yml

@@ -55,7 +55,7 @@ jobs:
         run: git archive --format=tar.gz -o ${OPENEXR_TARBALL} --prefix ${OPENEXR_PREFIX} ${TAG}
 
       - name: Sign archive with Sigstore
-        uses: sigstore/gh-action-sigstore-python@f832326173235dcb00dd5d92cd3f353de3188e6c # v3.1.0
+        uses: sigstore/gh-action-sigstore-python@a5caf349bc536fbef3668a10ed7f5cd309a4b53d # v3.2.0
         with:
           inputs: ${{ env.OPENEXR_TARBALL }}
           upload-signing-artifacts: false

.github/workflows/scorecard.yml

@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
+        uses: github/codeql-action/upload-sarif@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
         with:
           sarif_file: results.sarif

BUILD.bazel

@@ -62,6 +62,7 @@ expand_template(
         "@OPENEXR_VERSION_MINOR@": "4",
         "@OPENEXR_VERSION_PATCH@": "0",
         "#cmakedefine OPENEXR_ENABLE_API_VISIBILITY": "#define OPENEXR_ENABLE_API_VISIBILITY",
+        "#cmakedefine OPENEXR_CORE_FUNCTIONS_EMBEDDED": "/* #undef OPENEXR_CORE_FUNCTIONS_EMBEDDED */",
         "#cmakedefine OPENEXR_HAVE_LARGE_STACK 1": "/* #undef OPENEXR_HAVE_LARGE_STACK */",
     },
     template = "cmake/OpenEXRConfig.h.in",

MODULE.bazel

@@ -7,7 +7,7 @@ module(
 )
 
 bazel_dep(name = "bazel_skylib", version = "1.8.2")
-bazel_dep(name = "imath", version = "3.2.2")
+bazel_dep(name = "imath", version = "3.2.2.bcr.1")
 bazel_dep(name = "libdeflate", version = "1.25")
 bazel_dep(name = "openjph", version = "0.25.3")
 bazel_dep(name = "platforms", version = "1.0.0")

cmake/CMakeLists.txt

@@ -63,6 +63,11 @@ if (OPENEXR_USE_DEFAULT_VISIBILITY)
 else()
   set(OPENEXR_ENABLE_API_VISIBILITY ON)
 endif()
+if (OPENEXR_FORCE_EMBEDDED_CORE)
+  set(OPENEXR_CORE_FUNCTIONS_EMBEDDED ON)
+else()
+  set(OPENEXR_CORE_FUNCTIONS_EMBEDDED OFF)
+endif()
 
 if (UNIX AND NOT APPLE AND NOT BEOS)
   find_library(OPENEXR_EXTRA_MATH_LIB m)

cmake/LibraryDefine.cmake

@@ -4,7 +4,7 @@
 # NB: This function has a number of Imath-specific names/variables
 # in it, so be careful copying...
 function(OPENEXR_DEFINE_LIBRARY libname)
-  set(options)
+  set(options EMBEDDED)
   set(oneValueArgs PRIV_EXPORT CURDIR CURBINDIR)
   set(multiValueArgs SOURCES HEADERS DEPENDENCIES PRIVATE_DEPS)
   cmake_parse_arguments(OPENEXR_CURLIB "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
@@ -13,7 +13,12 @@ function(OPENEXR_DEFINE_LIBRARY libname)
     set(_openexr_extra_flags "$<$<COMPILE_LANGUAGE:CXX>:/EHsc>" "$<$<COMPILE_LANGUAGE:CXX>:/MP>")
   endif()
   set(objlib ${libname})
-  add_library(${objlib}
+  if(OPENEXR_CURLIB_EMBEDDED)
+    set(libopts STATIC)
+  else()
+    set(libopts)
+  endif()
+  add_library(${objlib} ${libopts}
     ${OPENEXR_CURLIB_HEADERS}
     ${OPENEXR_CURLIB_SOURCES})
 
@@ -24,7 +29,9 @@ function(OPENEXR_DEFINE_LIBRARY libname)
                           PRIVATE cxx_std_${OPENEXR_CXX_STANDARD}
                           INTERFACE cxx_std_17 )
 
-  if(OPENEXR_CURLIB_PRIV_EXPORT AND BUILD_SHARED_LIBS)
+  if(OPENEXR_CURLIB_EMBEDDED)
+    set(libopts)
+  elseif(OPENEXR_CURLIB_PRIV_EXPORT AND BUILD_SHARED_LIBS)
     target_compile_definitions(${objlib} PRIVATE ${OPENEXR_CURLIB_PRIV_EXPORT})
     if(WIN32)
       target_compile_definitions(${objlib} PUBLIC OPENEXR_DLL)
@@ -46,7 +53,7 @@ function(OPENEXR_DEFINE_LIBRARY libname)
     CXX_EXTENSIONS OFF
     POSITION_INDEPENDENT_CODE ON
   )
-  if (NOT OPENEXR_USE_DEFAULT_VISIBILITY)
+  if (OPENEXR_CURLIB_EMBEDDED OR NOT OPENEXR_USE_DEFAULT_VISIBILITY)
     set_target_properties(${objlib} PROPERTIES
       C_VISIBILITY_PRESET hidden
       CXX_VISIBILITY_PRESET hidden
@@ -60,7 +67,7 @@ function(OPENEXR_DEFINE_LIBRARY libname)
   endif()
   set_property(TARGET ${objlib} PROPERTY PUBLIC_HEADER ${OPENEXR_CURLIB_HEADERS})
 
-  if(BUILD_SHARED_LIBS)
+  if(BUILD_SHARED_LIBS AND NOT OPENEXR_CURLIB_EMBEDDED)
     set_target_properties(${libname} PROPERTIES
       SOVERSION ${OPENEXR_LIB_SOVERSION}
       VERSION ${OPENEXR_LIB_VERSION}
@@ -70,7 +77,6 @@ function(OPENEXR_DEFINE_LIBRARY libname)
       OUTPUT_NAME "${libname}${OPENEXR_LIB_SUFFIX}"
       RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
   )
-  add_library(${PROJECT_NAME}::${libname} ALIAS ${libname})
 
   if(OPENEXR_INSTALL)
     install(TARGETS ${libname}
@@ -83,7 +89,9 @@ function(OPENEXR_DEFINE_LIBRARY libname)
         DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENEXR_OUTPUT_SUBDIR}
     )
   endif()
-  if(BUILD_SHARED_LIBS AND (NOT "${OPENEXR_LIB_SUFFIX}" STREQUAL "") AND NOT WIN32)
+  if(OPENEXR_CURLIB_EMBEDDED)
+    set(libopts)
+  elseif(BUILD_SHARED_LIBS AND (NOT "${OPENEXR_LIB_SUFFIX}" STREQUAL "") AND NOT WIN32)
     string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
     set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${OPENEXR_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX})
     set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX})
@@ -93,4 +101,6 @@ function(OPENEXR_DEFINE_LIBRARY libname)
     set(verlibname)
     set(baselibname)
   endif()
+
+  add_library(${PROJECT_NAME}::${libname} ALIAS ${libname})
 endfunction()

cmake/OpenEXRConfig.h.in

@@ -93,6 +93,8 @@
 // tagged
 #cmakedefine OPENEXR_ENABLE_API_VISIBILITY
 
+#cmakedefine OPENEXR_CORE_FUNCTIONS_EMBEDDED
+
 /// \defgroup ExportMacros Macros to manage symbol visibility
 ///
 /// See website/SymbolVisibility.rst for more discussion about the

cmake/OpenEXRSetup.cmake

@@ -256,8 +256,6 @@ endif()
 #######################################
 
 option(OPENEXR_FORCE_INTERNAL_OPENJPH "Force downloading OpenJPH from a git repo" OFF)
-set(OPENEXR_OPENJPH_REPO "https://github.com/aous72/OpenJPH.git" CACHE STRING "OpenJPH git repo URI")
-set(OPENEXR_OPENJPH_TAG "master" CACHE STRING "OpenJPH git repo tag")
 
 if (NOT OPENEXR_FORCE_INTERNAL_OPENJPH)
   find_package(openjph CONFIG QUIET)
@@ -276,68 +274,21 @@ if (NOT OPENEXR_FORCE_INTERNAL_OPENJPH)
       pkg_check_modules(openjph IMPORTED_TARGET GLOBAL QUIET openjph=0.21)
       if(openjph_FOUND)
         set(EXR_OPENJPH_LIB PkgConfig::openjph)
-        message(STATUS "Using OpenJPH from ${openjph_LINK_LIBRARIES}")
+        message(STATUS "Using OpenJPH ${openjph_VERSION} from ${openjph_LINK_LIBRARIES}")
       endif()
     endif()
   endif()
 endif()
 
-if(NOT EXR_OPENJPH_LIB)
-  # Using internal OpenJPH
-  if(OPENEXR_FORCE_INTERNAL_OPENJPH)
-    message(STATUS "OpenJPH forced internal, fetching from ${OPENEXR_OPENJPH_REPO} @ ${OPENEXR_OPENJPH_TAG}")
-  else()
-    message(STATUS "OpenJPH was not found, fetching from ${OPENEXR_OPENJPH_REPO} @ ${OPENEXR_OPENJPH_TAG}")
-  endif()
-
-  include(FetchContent)
-  FetchContent_Declare(
-    openjph
-    GIT_REPOSITORY ${OPENEXR_OPENJPH_REPO}
-    GIT_TAG        ${OPENEXR_OPENJPH_TAG}
-  )
-
-  set(OJPH_BUILD_TESTS OFF CACHE BOOL "" FORCE)
-  set(OJPH_ENABLE_TIFF_SUPPORT OFF CACHE BOOL "" FORCE)
-  set(OJPH_BUILD_EXECUTABLES OFF CACHE BOOL "" FORCE)
-  FetchContent_MakeAvailable(openjph)
-  install(
-    TARGETS openjph
-    EXPORT ${PROJECT_NAME}
-  )
-  set_target_properties(openjph PROPERTIES
-    POSITION_INDEPENDENT_CODE ON
-    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
-  )
-
-  # OpenEXR expects OpenJPH headers to live in an openjph folder,
-  # so OpenEXR's include looks like:
-  #   #include <openjph/openjph_arch.h>
-  # However, when building OpenJPH via FetchContent, the headers
-  # reside in src/core/common directory in the OpenJPH source tree.
-  # Create a symlink called "openjph" that points to "common", so the
-  # OpenEXR includes see the files they expect.
-  # Then add that as the include directory.
-  #
-  # NOTE: This can go away when we vendor in the OpenJPH code and
-  # retire the FetchContent altogether.
-  file(CREATE_LINK
-    "${openjph_SOURCE_DIR}/src/core/common"
-    "${openjph_SOURCE_DIR}/src/core/openjph"
-    RESULT openjph_create_link_result
-    SYMBOLIC
-  )
-  # Creating a symlink may fail, for example on Windows without developer
-  # mode enabled, so fallback to copying in that case.
-  if (NOT openjph_create_link_result EQUAL 0)
-    file(COPY
-      "${openjph_SOURCE_DIR}/src/core/common/"
-      DESTINATION "${openjph_SOURCE_DIR}/src/core/openjph"
-    )
-  endif()
-  include_directories("${openjph_SOURCE_DIR}/src/core")
+if(EXR_OPENJPH_LIB)
+  # Using external library
+  # For OpenEXR.pc.in for static build
+  set(EXR_OPENJPH_PKGCONFIG_REQUIRES "openjph >= 0.21.0")
+else()
+  # Using internal openjph
 
   # extract the openjph version variables from ojph_version.h
+  set(openjph_SOURCE_DIR "${CMAKE_SOURCE_DIR}/external/openjph")
   set(openjph_version "${openjph_SOURCE_DIR}/src/core/common/ojph_version.h")
   if(EXISTS "${openjph_version}")
     file(STRINGS "${openjph_version}" _openjph_major REGEX "#define OPENJPH_VERSION_MAJOR")
@@ -348,31 +299,15 @@ if(NOT EXR_OPENJPH_LIB)
     string(REGEX REPLACE ".*OPENJPH_VERSION_PATCH[ \t]+([0-9]+).*" "\\1" openjph_VERSION_PATCH "${_openjph_patch}")
   endif()
 
-  set(EXR_OPENJPH_LIB openjph)
-endif()
-
-if (NOT EXR_OPENJPH_LIB)
-  message(ERROR "Failed to find OpenJPH")
-endif()
-
-if (openjph_VERSION VERSION_LESS "0.23")
-  # OpenJPH 0.22 and before incorrectly appends "openjph" to INTERFACE_INCLUDE_DIRECTORIES
-  # so OpenEXR's "#include <openjph/ojph_arch.h>" does not work.
-  # Strip the "openjph" from the setting in this case. This allows the
-  # #include statements in OpenEXRCore/internal_ht.cpp  to work properly for all openjph versions.
-  get_target_property(OPENJPH_INCLUDE_DIR openjph INTERFACE_INCLUDE_DIRECTORIES)
-  if (NOT OPENJPH_INCLUDE_DIR)
-    message(FATAL_ERROR "failed to set openjph header directory, version ${openjph_VERSION}")
+  set(openjph_VERSION "${openjph_VERSION_MAJOR}.${openjph_VERSION_MINOR}.${openjph_VERSION_PATCH}")
+  
+  if(OPENEXR_FORCE_INTERNAL_OPENJPH)
+    message(STATUS "openjph forced internal, using vendored code (${openjph_VERSION})")
+  else()
+    message(STATUS "openjph was not found, using vendored code (${openjph_VERSION})")
   endif()
-  string(REGEX REPLACE "/openjph/?$" "" OPENJPH_PARENT_INCLUDE_DIR "${OPENJPH_INCLUDE_DIR}")
-  set_target_properties(openjph PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES "${OPENJPH_PARENT_INCLUDE_DIR}"
-  )
-  unset(OPENJPH_INCLUDE_DIR)
-  unset(OPENJPH_PARENT_INCLUDE_DIR)
-endif()
 
-set(EXR_OPENJPH_PKGCONFIG_REQUIRES "openjph >= 0.21.0")
+endif()
 
 #######################################
 # Find or install Imath