Skip to content

Commit 923e5c0

Browse files
committed
Bump OpenJPH to 0.21.2
Signed-off-by: Pierre-Anthony Lemieux <pal@palemieux.com>
1 parent 813c7cb commit 923e5c0

File tree

8 files changed

+18
-15
lines changed

8 files changed

+18
-15
lines changed

.github/workflows/ci_steps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
- name: Install OpenJPH
9090
# Pre-install OpenJPH so the builds validate finding the external installation
9191
if: ${{ inputs.OPENEXR_FORCE_INTERNAL_OPENJPH == 'OFF' }}
92-
run: share/ci/scripts/install_openjph.sh 0.21.0
92+
run: share/ci/scripts/install_openjph.sh 0.21.2
9393
shell: bash
9494

9595
- name: Install help2man

MODULE.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,6 @@ archive_override(
3838
"//bazel:openjph_add_build_file.patch",
3939
"//bazel:openjph_module_dot_bazel.patch",
4040
],
41-
strip_prefix = "OpenJPH-0.21.0",
42-
urls = ["https://github.com/aous72/OpenJPH/archive/refs/tags/0.21.0.zip"],
41+
strip_prefix = "OpenJPH-0.21.2",
42+
urls = ["https://github.com/aous72/OpenJPH/archive/refs/tags/0.21.2.zip"],
4343
)

bazel/openjph_module_dot_bazel.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
@@ -0,0 +1,8 @@
44
+module(
55
+ name = "openjph",
6-
+ version = "0.21.0",
6+
+ version = "0.21.2",
77
+ compatibility_level = 1,
88
+)
99
+
10-
+bazel_dep(name = "rules_cc", version = "0.1.0")
10+
+bazel_dep(name = "rules_cc", version = "0.1.1")
1111
+bazel_dep(name = "rules_license", version = "1.0.0")

cmake/OpenEXRSetup.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ message(STATUS "Locating OpenJPH")
307307
option(OPENEXR_FORCE_INTERNAL_OPENJPH "Force downloading OpenJPH from a git repo" OFF)
308308

309309
set(OPENEXR_OJPH_REPO "https://github.com/aous72/OpenJPH.git" CACHE STRING "OpenJPH Git repo URI")
310-
set(OPENEXR_OJPH_TAG "0.21.0" CACHE STRING "OpenJPH Git repo tag")
310+
set(OPENEXR_OJPH_TAG "0.21.2" CACHE STRING "OpenJPH Git repo tag")
311311

312312
if (NOT OPENEXR_FORCE_INTERNAL_OPENJPH)
313313
find_package(openjph 0.21 QUIET)

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,10 +224,11 @@ include/openjph/ojph_mem.h
224224
include/openjph/ojph_message.h
225225
include/openjph/ojph_params.h
226226
include/openjph/ojph_version.h
227-
lib/cmake/openjph/openjph-config-release.cmake
227+
lib/cmake/openjph/openjph-targets-release.cmake
228+
lib/cmake/openjph/openjph-targets.cmake
228229
lib/cmake/openjph/openjph-config.cmake
229-
lib/cmake/openjph/openjph-configVersion.cmake
230-
lib/libopenjph.0.21.0.dylib
230+
lib/cmake/openjph/openjph-config-version.cmake
231+
lib/libopenjph.0.21.2.dylib
231232
lib/libopenjph.0.21.dylib
232233
lib/libopenjph.dylib
233234
lib/pkgconfig/openjph.pc

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ lib/libOpenEXRUtil-$MAJOR_$MINOR.$SOVERSION.dylib
182182
lib/libOpenEXRUtil-$MAJOR_$MINOR.dylib
183183
lib/libOpenEXRUtil.dylib
184184
lib/pkgconfig/OpenEXR.pc
185-
lib/libopenjph.0.21.0.dylib
185+
lib/libopenjph.0.21.2.dylib
186186
lib/libopenjph.0.21.dylib
187187
lib/libopenjph.dylib
188188
lib/pkgconfig/openjph.pc

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,10 +224,11 @@ include/openjph/ojph_mem.h
224224
include/openjph/ojph_message.h
225225
include/openjph/ojph_params.h
226226
include/openjph/ojph_version.h
227-
lib64/cmake/openjph/openjph-config-release.cmake
227+
lib64/cmake/openjph/openjph-targets-release.cmake
228+
lib64/cmake/openjph/openjph-targets.cmake
228229
lib64/cmake/openjph/openjph-config.cmake
229-
lib64/cmake/openjph/openjph-configVersion.cmake
230+
lib64/cmake/openjph/openjph-config-version.cmake
230231
lib64/libopenjph.so
231232
lib64/libopenjph.so.0.21
232-
lib64/libopenjph.so.0.21.0
233+
lib64/libopenjph.so.0.21.2
233234
lib64/pkgconfig/openjph.pc

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,8 +213,9 @@ include/openjph/ojph_mem.h
213213
include/openjph/ojph_message.h
214214
include/openjph/ojph_params.h
215215
include/openjph/ojph_version.h
216-
lib/cmake/openjph/openjph-config-release.cmake
216+
lib/cmake/openjph/openjph-targets-release.cmake
217+
lib/cmake/openjph/openjph-targets.cmake
217218
lib/cmake/openjph/openjph-config.cmake
218-
lib/cmake/openjph/openjph-configVersion.cmake
219+
lib/cmake/openjph/openjph-config-version.cmake
219220
lib/openjph.0.21.lib
220221
lib/pkgconfig/openjph.pc

0 commit comments

Comments
 (0)