Skip to content

openimageio: Add version 3.1.11.0 #29693

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
irieger wants to merge 1 commit into
base: master
Choose a base branch
from
+45 −90
Open

openimageio: Add version 3.1.11.0 #29693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions recipes/openimageio/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
sources:
"3.1.10.0":
url: "https://github.com/AcademySoftwareFoundation/OpenImageIO/releases/download/v3.1.10.0/OpenImageIO-3.1.10.0.tar.gz"
sha256: "370d3e178dd0634febdbd441cf04bcda38eac2e6cec57490af17a3e214993703"
"3.1.11.0":
url: "https://github.com/AcademySoftwareFoundation/OpenImageIO/releases/download/v3.1.11.0/OpenImageIO-3.1.11.0.tar.gz"
sha256: "c547db09f45bc2b66bdbaa1d21c8e418beaa471ad9a9c4b1ef0a772cf9eb323d"
"2.5.19.1":
url: "https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/refs/tags/v2.5.19.1.tar.gz"
sha256: "adb73f270f2eaae81c3c7cde311239944ae9faf6d206552da4ee12d746628b26"
patches:
"3.1.10.0":
- patch_file: "patches/3.1.10.0-conan-fixes.patch"
"3.1.11.0":
- patch_file: "patches/3.1.11.0-conan-fixes.patch"
"2.5.19.1":
- patch_file: "patches/2.5.19.1-conan-fixes.patch"
84 changes: 0 additions & 84 deletions recipes/openimageio/all/patches/3.1.10.0-conan-fixes.patch
View file
Open in desktop

This file was deleted.

39 changes: 39 additions & 0 deletions recipes/openimageio/all/patches/3.1.11.0-conan-fixes.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
diff --git CMakeLists.txt CMakeLists.txt
index a5fcfdbd4..a86afae9e 100644
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -288,7 +288,7 @@ if (OIIO_BUILD_TOOLS AND NOT BUILD_OIIOUTIL_ONLY)
add_subdirectory (src/iinfo)
add_subdirectory (src/maketx)
add_subdirectory (src/oiiotool)
- add_subdirectory (src/testtex)
+ #add_subdirectory (src/testtex) # only used for testing, no need to build it
add_subdirectory (src/iv)
endif ()

diff --git src/cmake/externalpackages.cmake src/cmake/externalpackages.cmake
index 8aba22812..702f7a44c 100644
--- src/cmake/externalpackages.cmake
+++ src/cmake/externalpackages.cmake
@@ -238,7 +238,7 @@ checked_find_package (fmt REQUIRED
VERSION_MIN 7.0
BUILD_LOCAL missing
)
-get_target_property(FMT_INCLUDE_DIR fmt::fmt-header-only INTERFACE_INCLUDE_DIRECTORIES)
+#get_target_property(FMT_INCLUDE_DIR fmt::fmt-header-only INTERFACE_INCLUDE_DIRECTORIES)


###########################################################################
diff --git src/libutil/CMakeLists.txt src/libutil/CMakeLists.txt
index 2a159e449..64b3ee17e 100644
--- src/libutil/CMakeLists.txt
+++ src/libutil/CMakeLists.txt
@@ -88,7 +88,7 @@ function (setup_oiio_util_library targetname)
add_dependencies(${targetname} fmt_internal_target)
else ()
target_link_libraries (${targetname}
- PUBLIC fmt::fmt-header-only)
+ PUBLIC fmt::fmt)
endif ()

if (WIN32)
2 changes: 1 addition & 1 deletion recipes/openimageio/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
versions:
"3.1.10.0":
"3.1.11.0":
folder: all
"2.5.19.1":
folder: all