Skip to content

Commit

Permalink
[openimageio] Fix dependency libraw (#38071)
Browse files Browse the repository at this point in the history
- [x] Changes comply with the [maintainer
guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
- [ ] SHA512s are updated for each updated download.
- [ ] The "supports" clause reflects platforms that may be fixed by this
new version.
- [x] Any fixed [CI
baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt)
entries are removed from that file.
- [x] Any patches that are no longer applied are deleted from the port's
directory.
- [x] The version database is fixed by rerunning `./vcpkg x-add-version
--all` and committing the result.
- [x] Only one version is added to each modified port's versions file.

Fixes #38065

---------

Co-authored-by: jyu49 <yu_jack@apple.com>
Co-authored-by: Cheney-Wang <850426846@qq.com>
  • Loading branch information
3 people committed Apr 11, 2024
1 parent 734d2de commit 94a48a4
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 2 deletions.
14 changes: 14 additions & 0 deletions ports/openimageio/fix-dependency-libraw.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/src/cmake/Config.cmake.in b/src/cmake/Config.cmake.in
index 4aee211..fa71d86 100644
--- a/src/cmake/Config.cmake.in
+++ b/src/cmake/Config.cmake.in
@@ -25,6 +25,9 @@ endif()
if(@USE_WEBP@)
find_dependency(WebP CONFIG)
endif()
+if(@USE_LIBRAW@)
+ find_dependency(LibRaw)
+endif()

# add here all the find_dependency() whenever switching to config based dependencies
if (NOT @OPENIMAGEIO_CONFIG_DO_NOT_FIND_IMATH@ AND NOT OPENIMAGEIO_CONFIG_DO_NOT_FIND_IMATH)
1 change: 1 addition & 0 deletions ports/openimageio/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ vcpkg_from_github(
imath-version-guard.patch
fix-openimageio_include_dir.patch
fix-openexr-target-missing.patch
fix-dependency-libraw.patch
)

file(REMOVE_RECURSE "${SOURCE_PATH}/ext")
Expand Down
2 changes: 1 addition & 1 deletion ports/openimageio/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "openimageio",
"version": "2.5.8.0",
"port-version": 1,
"port-version": 2,
"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 @@ -6462,7 +6462,7 @@
},
"openimageio": {
"baseline": "2.5.8.0",
"port-version": 1
"port-version": 2
},
"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": "574b313e28f87f2312a4cee4ab5f71e03bdf781f",
"version": "2.5.8.0",
"port-version": 2
},
{
"git-tree": "16578d434e24f9e9bc2e4f47eb81314b503777c9",
"version": "2.5.8.0",
Expand Down

0 comments on commit 94a48a4

Please sign in to comment.