-
Notifications
You must be signed in to change notification settings - Fork 7.4k
[openimageio] Update to version 2.2.7.0 #13966
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.
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
Closed
Closed
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
cce44e4
[openimageio] Update to 2.2.6.1
JonLiu1993 f2eeefb
Merge branch 'pr/13808' into update-openimageio
brukted 78fca0d
[openimageio] Update to 2.2.7.0
brukted e568802
Update CONTROL
brukted ed1f30c
Update ports/openimageio/CONTROL
brukted b062aac
Merge remote-tracking branch 'upstream/master' into update-openimageio
brukted cad5a12
Merge remote-tracking branch 'upstream/master' into update-openimageio
brukted File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,12 @@ | ||
| diff --git a/src/cmake/Config.cmake.in b/src/cmake/Config.cmake.in | ||
| index c578a1b..298362a 100644 | ||
| --- a/src/cmake/Config.cmake.in | ||
| +++ b/src/cmake/Config.cmake.in | ||
| @@ -14,6 +14,6 @@ set (@PROJECT_NAME@_PLUGIN_SEARCH_PATH "@PLUGIN_SEARCH_PATH_NATIVE@") | ||
| #...logic to determine installedPrefix from the own location... | ||
| #set (@PROJECT_NAME@_CONFIG_DIR "${installedPrefix}/@CONFIG_INSTALL_DIR@") | ||
|
|
||
| -include ("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") | ||
| +include("${CMAKE_CURRENT_LIST_DIR}/OpenImageIOTargets.cmake") | ||
|
|
||
| check_required_components ("@PROJECT_NAME@") | ||
| diff --git a/src/cmake/Config.cmake.in b/src/cmake/Config.cmake.in | ||
| index c578a1b..298362a 100644 | ||
| --- a/src/cmake/Config.cmake.in | ||
| +++ b/src/cmake/Config.cmake.in | ||
| @@ -14,6 +14,6 @@ set (@PROJECT_NAME@_PLUGIN_SEARCH_PATH "@PLUGIN_SEARCH_PATH_NATIVE@") | ||
| #...logic to determine installedPrefix from the own location... | ||
| #set (@PROJECT_NAME@_CONFIG_DIR "${installedPrefix}/@CONFIG_INSTALL_DIR@") | ||
| -include ("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") | ||
| +include("${CMAKE_CURRENT_LIST_DIR}/OpenImageIOTargets.cmake") | ||
| check_required_components ("@PROJECT_NAME@") |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake | ||
| index 4f1dfaf..1a17d1e 100644 | ||
| --- a/src/cmake/externalpackages.cmake | ||
| +++ b/src/cmake/externalpackages.cmake | ||
| @@ -385,5 +385,7 @@ macro (find_or_download_fmt) | ||
| checked_find_package (fmt REQUIRED) | ||
| endmacro() | ||
|
|
||
| -find_or_download_fmt() | ||
| +find_package(fmt CONFIG REQUIRED) | ||
| +get_property(FMT_INCLUDES TARGET fmt::fmt PROPERTY INTERFACE_INCLUDE_DIRECTORIES) | ||
| +checked_find_package (fmt CONFIG REQUIRED) | ||
| include_directories (${FMT_INCLUDES}) | ||
| diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake | ||
| index 1240f22..b7772e1 100644 | ||
| --- a/src/cmake/externalpackages.cmake | ||
| +++ b/src/cmake/externalpackages.cmake | ||
| @@ -387,5 +387,7 @@ macro (find_or_download_fmt) | ||
| checked_find_package (fmt REQUIRED) | ||
| endmacro() | ||
| -find_or_download_fmt() | ||
| +find_package(fmt CONFIG REQUIRED) | ||
| +get_property(FMT_INCLUDES TARGET fmt::fmt PROPERTY INTERFACE_INCLUDE_DIRECTORIES) | ||
| +checked_find_package (fmt CONFIG REQUIRED) | ||
| include_directories (${FMT_INCLUDES}) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| diff --git a/src/cmake/oiio_macros.cmake b/src/cmake/oiio_macros.cmake | ||
| index 9e54f67..d9c9437 100644 | ||
| --- a/src/cmake/oiio_macros.cmake | ||
| +++ b/src/cmake/oiio_macros.cmake | ||
| @@ -142,7 +142,7 @@ macro (fancy_add_executable) | ||
| target_link_libraries (${_target_NAME} PRIVATE ${_target_LINK_LIBRARIES}) | ||
| endif () | ||
| set_target_properties (${_target_NAME} PROPERTIES FOLDER "Tools") | ||
| - install_targets (${_target_NAME}) | ||
| + install(TARGETS ${_target_NAME} RUNTIME DESTINATION tools/openimageio) | ||
| else () | ||
| message (STATUS "${ColorRed}Disabling ${_target_NAME} ${ColorReset}") | ||
| endif () | ||
| diff --git a/src/cmake/oiio_macros.cmake b/src/cmake/oiio_macros.cmake | ||
| index 623eefa..8705e96 100644 | ||
| --- a/src/cmake/oiio_macros.cmake | ||
| +++ b/src/cmake/oiio_macros.cmake | ||
| @@ -127,7 +127,7 @@ macro (fancy_add_executable) | ||
| target_link_libraries (${_target_NAME} PRIVATE ${_target_LINK_LIBRARIES}) | ||
| endif () | ||
| set_target_properties (${_target_NAME} PROPERTIES FOLDER "Tools") | ||
| - install_targets (${_target_NAME}) | ||
| + install(TARGETS ${_target_NAME} RUNTIME DESTINATION tools/openimageio) | ||
| else () | ||
| message (STATUS "${ColorRed}Disabling ${_target_NAME} ${ColorReset}") | ||
| endif () |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| diff --git a/src/webp.imageio/CMakeLists.txt b/src/webp.imageio/CMakeLists.txt | ||
| index 9e01bd7..f9bce69 100644 | ||
| --- a/src/webp.imageio/CMakeLists.txt | ||
| +++ b/src/webp.imageio/CMakeLists.txt | ||
| @@ -2,9 +2,10 @@ | ||
| # SPDX-License-Identifier: BSD-3-Clause | ||
| # https://github.com/OpenImageIO/oiio/blob/master/LICENSE.md | ||
|
|
||
| -if (Webp_FOUND) | ||
| +if (WEBP_FOUND) | ||
| add_oiio_plugin (webpinput.cpp webpoutput.cpp | ||
| - LINK_LIBRARIES Webp::Webp | ||
| + INCLUDE_DIRS ${WEBP_INCLUDE_DIR} | ||
| + LINK_LIBRARIES ${WEBP_LIBRARY} | ||
| DEFINITIONS "-DUSE_WEBP=1") | ||
| else () | ||
| message (STATUS "WebP plugin will not be built") |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| diff --git a/src/cmake/compiler.cmake b/src/cmake/compiler.cmake | ||
| index 1468be3..ed4167a 100644 | ||
| --- a/src/cmake/compiler.cmake | ||
| +++ b/src/cmake/compiler.cmake | ||
| @@ -482,7 +482,7 @@ set (EXTRA_DSO_LINK_ARGS "" CACHE STRING "Extra command line definitions when bu | ||
| # | ||
| option (BUILD_SHARED_LIBS "Build shared libraries (set to OFF to build static libs)" ON) | ||
| if (NOT BUILD_SHARED_LIBS) | ||
| - add_definitions (-D${PROJ_NAME}_STATIC_DEFINE=1) | ||
| + add_definitions (-DOIIO_STATIC_DEFINE=1) | ||
| endif () | ||
|
|
||
|
|
||
| diff --git a/src/cmake/compiler.cmake b/src/cmake/compiler.cmake | ||
| index 12a8e81..15fe688 100644 | ||
| --- a/src/cmake/compiler.cmake | ||
| +++ b/src/cmake/compiler.cmake | ||
| @@ -505,7 +505,7 @@ endif () | ||
| # | ||
| option (BUILD_SHARED_LIBS "Build shared libraries (set to OFF to build static libs)" ON) | ||
| if (NOT BUILD_SHARED_LIBS) | ||
| - add_definitions (-D${PROJ_NAME}_STATIC_DEFINE=1) | ||
| + add_definitions (-DOIIO_STATIC_DEFINE=1) | ||
| endif () | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why do we now depend on python2? The feature
pybind11implies that it builds the python bindings. Further, it seems inappropriate to build bindings for a sunsetted version of the python interpreter.