Skip to content

Commit 7d13259

Browse files
committed
Fix OIIO build against OpenJPH for 2025
src/jpeg2000.imageio/CMakeLists.txt assumes the includes for openjph are in the same location as openjpeg which is not the case when building in Conan. This doesn't show up in 2026 since openexr 3.4.x declares a dependency on openjph and since OIIO has a dependency on openexr, it gets the include path that way. Signed-off-by: Jean-Francois Panisset <[email protected]>
1 parent aa017b8 commit 7d13259

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
All notable changes to this project will be documented in this file.
44

5-
# 2025-11-08
5+
# 2025-11-09
66

77
2024.5 / 2025.4 / 2026.2 releases. VFX Platform 2026 release is now feature complete.
88

99
- All releases
1010
- Add OpenJPH 0.24.5 package
11-
- OIIO builds against OpenJPH to handle JPEG-2000 j2c files ([#312](https://github.com/AcademySoftwareFoundation/aswf-docker/issues/312))
11+
- OIIO 3.x in 2025/2026 builds against OpenJPH to handle JPEG-2000 j2c files ([#312](https://github.com/AcademySoftwareFoundation/aswf-docker/issues/312))
1212
- Add build_XXX.sh in /usr/local and missing env vars to ci-XXX images to help test images ([307](https://github.com/AcademySoftwareFoundation/aswf-docker/issues/307))
1313
- Separate ci-imath image include Imath dependencies but not Imath itself ([306](https://github.com/AcademySoftwareFoundation/aswf-docker/issues/306))
1414
- 2024.4

packages/conan/recipes/oiio/patches/3.1.6.2-raw-jp2k-cmake.patch

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ diff --git src/jpeg2000.imageio/CMakeLists.txt src/jpeg2000.imageio/CMakeLists.t
1919
index d99dd79ac..bfda2778a 100644
2020
--- src/jpeg2000.imageio/CMakeLists.txt
2121
+++ src/jpeg2000.imageio/CMakeLists.txt
22-
@@ -2,10 +2,10 @@
22+
@@ -2,13 +2,16 @@
2323
# SPDX-License-Identifier: Apache-2.0
2424
# https://github.com/AcademySoftwareFoundation/OpenImageIO
2525

@@ -34,6 +34,12 @@ index d99dd79ac..bfda2778a 100644
3434
set(_jpeg2000_defs "USE_OPENJPEG")
3535

3636
if (openjph_FOUND)
37+
+ list(APPEND _jpeg2000_includes ${openjph_INCLUDE_DIR})
38+
+ list(APPEND _jpeg2000_lib_dirs ${openjph_LIB_DIRS_RELEASE})
39+
+ list(APPEND _jpeg2000_libs ${openjph_LIBS_RELEASE})
40+
list(APPEND _jpeg2000_defs "USE_OPENJPH")
41+
endif()
42+
3743
diff --git src/cmake/modules/FindLibRaw.cmake src/cmake/FindLibRaw.cmake
3844
index d99dd79ac..bfda2778a 100644
3945
--- src/cmake/modules/FindLibRaw.cmake

0 commit comments

Comments
 (0)