Bump OpenJPH (#1978)

Author: palemieux

.github/workflows/ci_steps.yml

@@ -89,7 +89,7 @@ jobs:
       - name: Install OpenJPH
         # Pre-install OpenJPH so the builds validate finding the external installation
         if: ${{ inputs.OPENEXR_FORCE_INTERNAL_OPENJPH == 'OFF' }}
-        run: share/ci/scripts/install_openjph.sh master
+        run: share/ci/scripts/install_openjph.sh 0.21.0
         shell: bash
 
       - name: Install help2man

MODULE.bazel

@@ -38,6 +38,6 @@ archive_override(
         "//bazel:openjph_add_build_file.patch",
         "//bazel:openjph_module_dot_bazel.patch",
     ],
-    strip_prefix = "OpenJPH-add-export",
-    urls = ["https://github.com/palemieux/OpenJPH/archive/refs/heads/add-export.zip"],
+    strip_prefix = "OpenJPH-0.21.0",
+    urls = ["https://github.com/aous72/OpenJPH/archive/refs/tags/0.21.0.zip"],
 )

bazel/openjph_module_dot_bazel.patch

@@ -3,7 +3,7 @@
 @@ -0,0 +1,8 @@
 +module(
 +    name = "openjph",
-+    version = "0.20.0",
++    version = "0.21.0",
 +    compatibility_level = 1,
 +)
 +

cmake/OpenEXRSetup.cmake

@@ -306,11 +306,11 @@ message(STATUS "Locating OpenJPH")
 
 option(OPENEXR_FORCE_INTERNAL_OPENJPH "Force downloading OpenJPH from a git repo" OFF)
 
-set(OPENEXR_OJPH_REPO "https://github.com/palemieux/OpenJPH.git" CACHE STRING "OpenJPH Git repo URI")
-set(OPENEXR_OJPH_TAG "add-export" CACHE STRING "OpenJPH Git repo tag")
+set(OPENEXR_OJPH_REPO "https://github.com/aous72/OpenJPH.git" CACHE STRING "OpenJPH Git repo URI")
+set(OPENEXR_OJPH_TAG "0.21.0" CACHE STRING "OpenJPH Git repo tag")
 
 if (NOT OPENEXR_FORCE_INTERNAL_OPENJPH)
-  find_package(openjph 0.20 QUIET)
+  find_package(openjph 0.21 QUIET)
 
   if(openjph_FOUND)
     message(STATUS "Found OpenJPH using find_package.")
@@ -320,7 +320,7 @@ if (NOT OPENEXR_FORCE_INTERNAL_OPENJPH)
     find_package(PkgConfig)
     if(PKG_CONFIG_FOUND)
       include(FindPkgConfig)
-      pkg_check_modules(openjph IMPORTED_TARGET GLOBAL openjph=0.20)
+      pkg_check_modules(openjph IMPORTED_TARGET GLOBAL openjph=0.21)
       if(openjph_FOUND)
         set(EXR_OPENJPH_LIB PkgConfig::openjph)
         message(STATUS "Found OpenJPH using PkgConfig at ${deflate_LINK_LIBRARIES}")

share/ci/install_manifest/install_manifest.macos.5.txt

@@ -227,7 +227,7 @@ include/openjph/ojph_version.h
 lib/cmake/openjph/openjph-config-release.cmake
 lib/cmake/openjph/openjph-config.cmake
 lib/cmake/openjph/openjph-configVersion.cmake
-lib/libopenjph.0.20.0.dylib
-lib/libopenjph.0.20.dylib
+lib/libopenjph.0.21.0.dylib
+lib/libopenjph.0.21.dylib
 lib/libopenjph.dylib
 lib/pkgconfig/openjph.pc

share/ci/install_manifest/install_manifest.macos.7.txt

@@ -182,8 +182,8 @@ lib/libOpenEXRUtil-$MAJOR_$MINOR.$SOVERSION.dylib
 lib/libOpenEXRUtil-$MAJOR_$MINOR.dylib
 lib/libOpenEXRUtil.dylib
 lib/pkgconfig/OpenEXR.pc
-lib/libopenjph.0.20.0.dylib
-lib/libopenjph.0.20.dylib
+lib/libopenjph.0.21.0.dylib
+lib/libopenjph.0.21.dylib
 lib/libopenjph.dylib
 lib/pkgconfig/openjph.pc
 share/doc/OpenEXR/examples/deepExamples.cpp

share/ci/install_manifest/install_manifest.ubuntu.5.txt

@@ -228,6 +228,6 @@ lib64/cmake/openjph/openjph-config-release.cmake
 lib64/cmake/openjph/openjph-config.cmake
 lib64/cmake/openjph/openjph-configVersion.cmake
 lib64/libopenjph.so
-lib64/libopenjph.so.0.20
-lib64/libopenjph.so.0.20.0
+lib64/libopenjph.so.0.21
+lib64/libopenjph.so.0.21.0
 lib64/pkgconfig/openjph.pc

share/ci/install_manifest/install_manifest.windows.5.txt

@@ -202,7 +202,7 @@ lib/cmake/OpenEXR/OpenEXRConfigVersion.cmake
 lib/cmake/OpenEXR/OpenEXRTargets-release.cmake
 lib/cmake/OpenEXR/OpenEXRTargets.cmake
 lib/pkgconfig/Imath.pc
-bin/openjph.0.20.dll
+bin/openjph.0.21.dll
 include/openjph/ojph_arch.h
 include/openjph/ojph_arg.h
 include/openjph/ojph_base.h
@@ -216,5 +216,5 @@ include/openjph/ojph_version.h
 lib/cmake/openjph/openjph-config-release.cmake
 lib/cmake/openjph/openjph-config.cmake
 lib/cmake/openjph/openjph-configVersion.cmake
-lib/openjph.0.20.lib
+lib/openjph.0.21.lib
 lib/pkgconfig/openjph.pc

share/ci/scripts/install_openjph.sh

@@ -12,10 +12,10 @@ else
     SUDO="sudo"
 fi
 
-git clone -b add-export https://github.com/palemieux/OpenJPH.git
+git clone https://github.com/aous72/OpenJPH.git
 cd OpenJPH
 
-# git checkout ${TAG}
+git checkout ${TAG}
 
 cd build
 cmake -DOJPH_ENABLE_TIFF_SUPPORT=OFF -DCMAKE_BUILD_TYPE=Release ..