Skip to content
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

[openimageio] add libheif as an optional dependency, remove libsquish as a dependency #29218

Merged
merged 7 commits into from
Feb 1, 2023
Merged

[openimageio] add libheif as an optional dependency, remove libsquish as a dependency #29218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3412812
[openimageio] add libheif as an optional dependncy
russelltg Jan 27, 2023
4ac8ecb
fmt
russelltg Jan 27, 2023
9fe3947
x-add-version
russelltg Jan 27, 2023
f4b50b8
optional libheif find_dependency
russelltg Jan 27, 2023
c86abd0
./vcpkg x-add-version --all --overwrite-version
russelltg Jan 27, 2023
19cb0ba
also remove libsquish from dep list
russelltg Jan 27, 2023
fec102a
x-add-version
russelltg Jan 27, 2023
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
7 changes: 4 additions & 3 deletions ports/openimageio/fix-dependencies.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@ diff --git a/src/cmake/Config.cmake.in b/src/cmake/Config.cmake.in
index 0a6afeb..2a67ee3 100644
--- a/src/cmake/Config.cmake.in
+++ b/src/cmake/Config.cmake.in
@@ -2,6 +2,22 @@
@@ -2,6 +2,23 @@

include(CMakeFindDependencyMacro)

+find_dependency(libheif CONFIG)
+if (@USE_LIBHEIF@)
+ find_dependency(libheif CONFIG)
+endif()
+find_dependency(PNG)
+find_dependency(unofficial-libsquish CONFIG)
+if(@USE_OPENCV@)
+ find_dependency(OpenCV CONFIG)
+endif()
Expand Down
3 changes: 2 additions & 1 deletion ports/openimageio/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
opencv USE_OPENCV
openjpeg USE_OPENJPEG
webp USE_WEBP
libheif USE_LIBHEIF
pybind11 USE_PYTHON
tools OIIO_BUILD_TOOLS
tools USE_OPENGL
Expand Down Expand Up @@ -68,7 +69,7 @@ vcpkg_cmake_configure(
-DINSTALL_DOCS=OFF
-DENABLE_INSTALL_testtex=OFF
"-DFMT_INCLUDES=${CURRENT_INSTALLED_DIR}/include"
"-DREQUIRED_DEPS=fmt;JPEG;Libheif;Libsquish;PNG;Robinmap"
"-DREQUIRED_DEPS=fmt;JPEG;PNG;Robinmap"
MAYBE_UNUSED_VARIABLES
ENABLE_INSTALL_testtex
)
Expand Down
10 changes: 7 additions & 3 deletions ports/openimageio/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "openimageio",
"version": "2.4.5.0",
"port-version": 3,
"port-version": 4,
"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 All @@ -20,10 +20,8 @@
"boost-thread",
"boost-type-traits",
"fmt",
"libheif",
"libjpeg-turbo",
"libpng",
"libsquish",
"openexr",
"robin-map",
"tiff",
Expand Down Expand Up @@ -62,6 +60,12 @@
"giflib"
]
},
"libheif": {
"description": "Enable heif support for openimageio",
"dependencies": [
"libheif"
]
},
"libraw": {
"description": "Enable RAW image files support",
"dependencies": [
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5618,7 +5618,7 @@
},
"openimageio": {
"baseline": "2.4.5.0",
"port-version": 3
"port-version": 4
},
"openjpeg": {
"baseline": "2.5.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/o-/openimageio.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3c8df049a8e7b1c3e48006e78c4f5a9d451860a0",
"version": "2.4.5.0",
"port-version": 4
},
{
"git-tree": "d89c769d1b813eadd08173e4e9d18049ac8c1d23",
"version": "2.4.5.0",
Expand Down