Skip to content

chore: openjph 0.21.3 -> 0.26.0 #1167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mcoliver wants to merge 7 commits into
base: main
Choose a base branch
from
Open

chore: openjph 0.21.3 -> 0.26.0 #1167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9acba66
openjph 0.21.3 -> 0.26.0
mcoliver Jan 22, 2026
5a37fcb
openjph now but the libs on linux in lib64
mcoliver Jan 22, 2026
25a2ebc
add debug support for openjph
mcoliver Jan 22, 2026
8cf62dd
fixed formatting
mcoliver Jan 22, 2026
ac50422
fix windows debug version name
mcoliver Jan 28, 2026
30b12b7
fix lib name
mcoliver Mar 3, 2026
2109455
use proper implname and path
mcoliver Mar 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmake/defaults/CYCOMMON.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,10 +192,10 @@ SET(RV_DEPS_OPENJPEG_DOWNLOAD_HASH

# openjph https://github.com/aous72/OpenJPH
SET(RV_DEPS_OPENJPH_VERSION
"0.21.3"
"0.26.0"
)
SET(RV_DEPS_OPENJPH_DOWNLOAD_HASH
"d0a3fb5f643a8948d5874624ff94a229"
"469e12ba5e953ce7002d02f9486c8721"
)

# otio https://github.com/AcademySoftwareFoundation/OpenTimelineIO
Expand Down
29 changes: 18 additions & 11 deletions cmake/dependencies/openjph.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,7 @@ PROCESSORCOUNT(_cpu_count)

# version 2+ requires changes to IOjp2 project
RV_CREATE_STANDARD_DEPS_VARIABLES("RV_DEPS_OPENJPH" "${RV_DEPS_OPENJPH_VERSION}" "make" "")
IF(RV_TARGET_LINUX)
# Overriding _lib_dir created in 'RV_CREATE_STANDARD_DEPS_VARIABLES' since this CMake-based project isn't using lib64
SET(_lib_dir
${_install_dir}/lib
)
ENDIF()

RV_SHOW_STANDARD_DEPS_VARIABLES()

SET(_download_url
Expand All @@ -27,17 +22,29 @@ SET(_download_url
SET(_download_hash
${RV_DEPS_OPENJPH_DOWNLOAD_HASH}
)
# https://github.com/aous72/OpenJPH/blob/8e597d11715552a6c63e3963d940fa29a4c5831b/src/core/CMakeLists.txt#L119
IF(CMAKE_BUILD_TYPE MATCHES "^Debug$")
IF(RV_TARGET_WINDOWS)
SET(RV_OPENJPH_DEBUG_POSTFIX
"d"
)
ELSE()
SET(RV_OPENJPH_DEBUG_POSTFIX
"_d"
)
ENDIF()
ENDIF()

IF(RV_TARGET_WINDOWS)
RV_MAKE_STANDARD_LIB_NAME("openjph.${_version_major}.${_version_minor}" "${RV_DEPS_OPENJPH_VERSION}" "SHARED" "")
SET(_libname
"openjph.${_version_major}.${_version_minor}.lib"
RV_MAKE_STANDARD_LIB_NAME("openjph.${_version_major}.${_version_minor}${RV_OPENJPH_DEBUG_POSTFIX}" "${RV_DEPS_OPENJPH_VERSION}" "SHARED" "")
SET(_implibname
"openjph.${_version_major}.${_version_minor}${RV_OPENJPH_DEBUG_POSTFIX}.lib"
)
SET(_implibpath
${_lib_dir}/${_libname}
${_lib_dir}/${_implibname}
)
ELSE()
RV_MAKE_STANDARD_LIB_NAME("openjph" "${RV_DEPS_OPENJPH_VERSION}" "SHARED" "")
RV_MAKE_STANDARD_LIB_NAME("openjph${RV_OPENJPH_DEBUG_POSTFIX}" "${RV_DEPS_OPENJPH_VERSION}" "SHARED" "")
ENDIF()
MESSAGE("****OPENJPH RV_MAKE_STANDARD_LIB_NAME IMPLIB _implibpath:${_implibpath} _implibname:${_implibname} _libname:${_libname} _libpath:${_libpath}")

Expand Down