Skip to content

Commit 619b045

Browse files
iriegerjcar87
andauthored
openimageio: add version 3.1.7.0 (#28792)
* OpenImageIO: Add version 3.1.7.0 * openimageio: keep 3.1.7.0 --------- Co-authored-by: Luis Caro Campos <[email protected]>
1 parent 88604f0 commit 619b045

File tree

3 files changed

+45
-4
lines changed

3 files changed

+45
-4
lines changed

recipes/openimageio/all/conandata.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
sources:
2-
"3.1.6.2":
3-
url: "https://github.com/AcademySoftwareFoundation/OpenImageIO/releases/download/v3.1.6.2/OpenImageIO-3.1.6.2.tar.gz"
4-
sha256: "a78156112c03b669827115ac34102b358569dc6d6872a45db719617eff33360b"
2+
"3.1.7.0":
3+
url: "https://github.com/AcademySoftwareFoundation/OpenImageIO/releases/download/v3.1.7.0/OpenImageIO-3.1.7.0.tar.gz"
4+
sha256: "d9b49b568c36993f6b3849bfafd9ac3178a56ff57efd8bd2c1dd81f7ae3ee318"
55
"2.5.19.1":
66
url: "https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/refs/tags/v2.5.19.1.tar.gz"
77
sha256: "adb73f270f2eaae81c3c7cde311239944ae9faf6d206552da4ee12d746628b26"
88
patches:
9+
"3.1.7.0":
10+
- patch_file: "patches/3.1.7.0-conan-fixes.patch"
911
"3.1.6.2":
1012
- patch_file: "patches/3.1.6.2-conan-fixes.patch"
1113
"2.5.19.1":
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index 3483b9e0a..a088ca758 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -288,7 +288,7 @@ if (OIIO_BUILD_TOOLS AND NOT BUILD_OIIOUTIL_ONLY)
6+
add_subdirectory (src/iinfo)
7+
add_subdirectory (src/maketx)
8+
add_subdirectory (src/oiiotool)
9+
- add_subdirectory (src/testtex)
10+
+ # add_subdirectory (src/testtex) # only used for testing, no need to build it
11+
add_subdirectory (src/iv)
12+
endif ()
13+
14+
diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
15+
index fc9cfc48d..b8717f864 100644
16+
--- a/src/cmake/externalpackages.cmake
17+
+++ b/src/cmake/externalpackages.cmake
18+
@@ -237,7 +237,7 @@ checked_find_package (fmt REQUIRED
19+
VERSION_MIN 7.0
20+
BUILD_LOCAL missing
21+
)
22+
-get_target_property(FMT_INCLUDE_DIR fmt::fmt-header-only INTERFACE_INCLUDE_DIRECTORIES)
23+
+#get_target_property(FMT_INCLUDE_DIR fmt::fmt-header-only INTERFACE_INCLUDE_DIRECTORIES)
24+
25+
26+
###########################################################################
27+
diff --git a/src/libutil/CMakeLists.txt b/src/libutil/CMakeLists.txt
28+
index 526aa6f02..a928252dc 100644
29+
--- a/src/libutil/CMakeLists.txt
30+
+++ b/src/libutil/CMakeLists.txt
31+
@@ -82,7 +82,7 @@ function (setup_oiio_util_library targetname)
32+
add_dependencies(${targetname} fmt_internal_target)
33+
else ()
34+
target_link_libraries (${targetname}
35+
- PUBLIC fmt::fmt-header-only)
36+
+ PUBLIC fmt::fmt)
37+
endif ()
38+
39+
if (WIN32)

recipes/openimageio/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
versions:
2-
"3.1.6.2":
2+
"3.1.7.0":
33
folder: all
44
"2.5.19.1":
55
folder: all

0 commit comments

Comments
 (0)