Skip to content

Commit

Permalink
[openimageio] Fix linking of giflib (#37070)
Browse files Browse the repository at this point in the history
OpenImageIO 2.5 uses now GIF targets (see

AcademySoftwareFoundation/OpenImageIO@004cbb0).

Adapt our patch accordingly (missing in #36638).
  • Loading branch information
jreichel-nvidia committed Mar 5, 2024
1 parent 683c1df commit facf98f
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 3 deletions.
7 changes: 5 additions & 2 deletions ports/openimageio/fix-dependencies.patch
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
diff -u -r a/src/cmake/Config.cmake.in b/src/cmake/Config.cmake.in
--- a/src/cmake/Config.cmake.in
+++ b/src/cmake/Config.cmake.in
@@ -6,6 +6,23 @@
@@ -6,6 +6,26 @@

include(CMakeFindDependencyMacro)

+if (@USE_LIBHEIF@)
+if(@USE_GIF@)
+ find_dependency(GIF)
+endif()
+if(@USE_LIBHEIF@)
+ find_dependency(libheif CONFIG)
+endif()
+find_dependency(PNG)
Expand Down
1 change: 1 addition & 0 deletions ports/openimageio/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "openimageio",
"version": "2.5.8.0",
"port-version": 1,
"description": "A library for reading and writing images, and a bunch of related classes, utilities, and application.",
"homepage": "https://github.com/OpenImageIO/oiio",
"license": "BSD-3-Clause",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -6410,7 +6410,7 @@
},
"openimageio": {
"baseline": "2.5.8.0",
"port-version": 0
"port-version": 1
},
"openjpeg": {
"baseline": "2.5.2",
Expand Down
5 changes: 5 additions & 0 deletions versions/o-/openimageio.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "16578d434e24f9e9bc2e4f47eb81314b503777c9",
"version": "2.5.8.0",
"port-version": 1
},
{
"git-tree": "c5dd8fe433ee655c7368c063d01eac043f9d0553",
"version": "2.5.8.0",
Expand Down

0 comments on commit facf98f

Please sign in to comment.