From 3412812f6873bf074f2b65a58680ce52d40b22e2 Mon Sep 17 00:00:00 2001 From: Russell Greene Date: Fri, 27 Jan 2023 10:11:46 -0700 Subject: [PATCH 1/7] [openimageio] add libheif as an optional dependncy --- ports/openimageio/portfile.cmake | 3 ++- ports/openimageio/vcpkg.json | 9 +++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake index afbdd0b5842309..91633515bf2552 100644 --- a/ports/openimageio/portfile.cmake +++ b/ports/openimageio/portfile.cmake @@ -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 @@ -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;Libsquish;PNG;Robinmap" MAYBE_UNUSED_VARIABLES ENABLE_INSTALL_testtex ) diff --git a/ports/openimageio/vcpkg.json b/ports/openimageio/vcpkg.json index ee72251f1ee75a..3d22489a1693a2 100644 --- a/ports/openimageio/vcpkg.json +++ b/ports/openimageio/vcpkg.json @@ -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", @@ -20,7 +20,6 @@ "boost-thread", "boost-type-traits", "fmt", - "libheif", "libjpeg-turbo", "libpng", "libsquish", @@ -38,6 +37,12 @@ "zlib" ], "features": { + "libheif": { + "description": "Enable heif support for openimageio", + "dependencies": [ + "libheif" + ] + }, "ffmpeg": { "description": "Enable ffmpeg support for openimageio", "dependencies": [ From 4ac8ecb0bc0549d4980150dee339ddb0ec2c830e Mon Sep 17 00:00:00 2001 From: Russell Greene Date: Fri, 27 Jan 2023 10:13:08 -0700 Subject: [PATCH 2/7] fmt --- ports/openimageio/vcpkg.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ports/openimageio/vcpkg.json b/ports/openimageio/vcpkg.json index 3d22489a1693a2..3b4cc3909ee6f1 100644 --- a/ports/openimageio/vcpkg.json +++ b/ports/openimageio/vcpkg.json @@ -37,12 +37,6 @@ "zlib" ], "features": { - "libheif": { - "description": "Enable heif support for openimageio", - "dependencies": [ - "libheif" - ] - }, "ffmpeg": { "description": "Enable ffmpeg support for openimageio", "dependencies": [ @@ -67,6 +61,12 @@ "giflib" ] }, + "libheif": { + "description": "Enable heif support for openimageio", + "dependencies": [ + "libheif" + ] + }, "libraw": { "description": "Enable RAW image files support", "dependencies": [ From 9fe3947dab5dcbca58e287cad7f8dcb343a66678 Mon Sep 17 00:00:00 2001 From: Russell Greene Date: Fri, 27 Jan 2023 10:13:16 -0700 Subject: [PATCH 3/7] x-add-version --- versions/baseline.json | 2 +- versions/o-/openimageio.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 67a8be3b730ad2..32a8998a92a08b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5618,7 +5618,7 @@ }, "openimageio": { "baseline": "2.4.5.0", - "port-version": 3 + "port-version": 4 }, "openjpeg": { "baseline": "2.5.0", diff --git a/versions/o-/openimageio.json b/versions/o-/openimageio.json index ec8a2d8aab1ae0..1e581c7e1a6fe2 100644 --- a/versions/o-/openimageio.json +++ b/versions/o-/openimageio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "13afc5b97d4af52174e30adf32b821b5f19404c5", + "version": "2.4.5.0", + "port-version": 4 + }, { "git-tree": "d89c769d1b813eadd08173e4e9d18049ac8c1d23", "version": "2.4.5.0", From f4b50b804294528bcbbe747fc67eef1231b660bd Mon Sep 17 00:00:00 2001 From: Russell Greene Date: Fri, 27 Jan 2023 12:22:55 -0700 Subject: [PATCH 4/7] optional libheif find_dependency --- ports/openimageio/fix-dependencies.patch | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ports/openimageio/fix-dependencies.patch b/ports/openimageio/fix-dependencies.patch index d923cc7a40918f..cfcaa937d79851 100644 --- a/ports/openimageio/fix-dependencies.patch +++ b/ports/openimageio/fix-dependencies.patch @@ -2,11 +2,13 @@ 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,24 @@ 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@) From c86abd0504c3f6cb2265f1193be18a0c30ee9c4e Mon Sep 17 00:00:00 2001 From: Russell Greene Date: Fri, 27 Jan 2023 12:23:14 -0700 Subject: [PATCH 5/7] ./vcpkg x-add-version --all --overwrite-version --- versions/o-/openimageio.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/o-/openimageio.json b/versions/o-/openimageio.json index 1e581c7e1a6fe2..784b26e5c77fdd 100644 --- a/versions/o-/openimageio.json +++ b/versions/o-/openimageio.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "13afc5b97d4af52174e30adf32b821b5f19404c5", + "git-tree": "95bf3bbb0b939b6d495fe8933b7ebbc83cd54540", "version": "2.4.5.0", "port-version": 4 }, From 19cb0ba7b29b024a44f222d817c2a78d5e2b0308 Mon Sep 17 00:00:00 2001 From: Russell Greene Date: Fri, 27 Jan 2023 12:40:47 -0700 Subject: [PATCH 6/7] also remove libsquish from dep list --- ports/openimageio/fix-dependencies.patch | 3 +-- ports/openimageio/portfile.cmake | 2 +- ports/openimageio/vcpkg.json | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ports/openimageio/fix-dependencies.patch b/ports/openimageio/fix-dependencies.patch index cfcaa937d79851..59dcea643676ee 100644 --- a/ports/openimageio/fix-dependencies.patch +++ b/ports/openimageio/fix-dependencies.patch @@ -2,7 +2,7 @@ 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,24 @@ +@@ -2,6 +2,23 @@ include(CMakeFindDependencyMacro) @@ -10,7 +10,6 @@ index 0a6afeb..2a67ee3 100644 + find_dependency(libheif CONFIG) +endif() +find_dependency(PNG) -+find_dependency(unofficial-libsquish CONFIG) +if(@USE_OPENCV@) + find_dependency(OpenCV CONFIG) +endif() diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake index 91633515bf2552..77470555025e5a 100644 --- a/ports/openimageio/portfile.cmake +++ b/ports/openimageio/portfile.cmake @@ -69,7 +69,7 @@ vcpkg_cmake_configure( -DINSTALL_DOCS=OFF -DENABLE_INSTALL_testtex=OFF "-DFMT_INCLUDES=${CURRENT_INSTALLED_DIR}/include" - "-DREQUIRED_DEPS=fmt;JPEG;Libsquish;PNG;Robinmap" + "-DREQUIRED_DEPS=fmt;JPEG;PNG;Robinmap" MAYBE_UNUSED_VARIABLES ENABLE_INSTALL_testtex ) diff --git a/ports/openimageio/vcpkg.json b/ports/openimageio/vcpkg.json index 3b4cc3909ee6f1..96e24fa1de4483 100644 --- a/ports/openimageio/vcpkg.json +++ b/ports/openimageio/vcpkg.json @@ -22,7 +22,6 @@ "fmt", "libjpeg-turbo", "libpng", - "libsquish", "openexr", "robin-map", "tiff", From fec102a455a1add956c40492435376163c38b8c6 Mon Sep 17 00:00:00 2001 From: Russell Greene Date: Fri, 27 Jan 2023 12:41:04 -0700 Subject: [PATCH 7/7] x-add-version --- versions/o-/openimageio.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/o-/openimageio.json b/versions/o-/openimageio.json index 784b26e5c77fdd..104700d1b9aa8f 100644 --- a/versions/o-/openimageio.json +++ b/versions/o-/openimageio.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "95bf3bbb0b939b6d495fe8933b7ebbc83cd54540", + "git-tree": "3c8df049a8e7b1c3e48006e78c4f5a9d451860a0", "version": "2.4.5.0", "port-version": 4 },