From 81457bd63a77837cfa82a1bbcd3bf89e5e7d088f Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Sun, 23 Jan 2022 23:45:15 -0800 Subject: [PATCH 1/2] [openimageio] Remove vcpkg_fail_port_install. Separated out because it adds a supports expression to a feature. This port is not named in ci.baseline.txt. In support of https://github.com/microsoft/vcpkg/pull/21502 --- ports/openimageio/portfile.cmake | 7 ------- ports/openimageio/vcpkg.json | 2 ++ versions/baseline.json | 2 +- versions/o-/openimageio.json | 5 +++++ 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake index 1a0d7f9502126e..0e75e7d68ce765 100644 --- a/ports/openimageio/portfile.cmake +++ b/ports/openimageio/portfile.cmake @@ -1,10 +1,3 @@ -if("field3d" IN_LIST FEATURES) - vcpkg_fail_port_install( - ON_TARGET WINDOWS UWP - MESSAGE "The field3d feature is not supported on Windows" - ) -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OpenImageIO/oiio diff --git a/ports/openimageio/vcpkg.json b/ports/openimageio/vcpkg.json index 643a3c3d82bc7a..e386fea6147cf7 100644 --- a/ports/openimageio/vcpkg.json +++ b/ports/openimageio/vcpkg.json @@ -1,6 +1,7 @@ { "name": "openimageio", "version": "2.3.10.1", + "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", "dependencies": [ @@ -49,6 +50,7 @@ }, "field3d": { "description": "Enable field3D support for openimageio", + "supports": "!windows & !uwp", "dependencies": [ "field3d" ] diff --git a/versions/baseline.json b/versions/baseline.json index 89788d025abbed..46ce9eb94ae620 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5018,7 +5018,7 @@ }, "openimageio": { "baseline": "2.3.10.1", - "port-version": 0 + "port-version": 1 }, "openjpeg": { "baseline": "2.4.0", diff --git a/versions/o-/openimageio.json b/versions/o-/openimageio.json index decb4f15ab9cc2..b4b82cdc0a7461 100644 --- a/versions/o-/openimageio.json +++ b/versions/o-/openimageio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b39ecd3fe6413ad3f54584244e7050a501762b0b", + "version": "2.3.10.1", + "port-version": 1 + }, { "git-tree": "f5a6955a1595a5d3ea429059d9be4ddedc8e7cab", "version": "2.3.10.1", From 2e1921a26e72add404009b555aec0df97da89df5 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Mon, 24 Jan 2022 17:05:43 -0800 Subject: [PATCH 2/2] remove !uwp # Conflicts: # versions/o-/openimageio.json --- ports/openimageio/vcpkg.json | 2 +- versions/o-/openimageio.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/openimageio/vcpkg.json b/ports/openimageio/vcpkg.json index e386fea6147cf7..56fa0b60dbc58e 100644 --- a/ports/openimageio/vcpkg.json +++ b/ports/openimageio/vcpkg.json @@ -50,7 +50,7 @@ }, "field3d": { "description": "Enable field3D support for openimageio", - "supports": "!windows & !uwp", + "supports": "!windows", "dependencies": [ "field3d" ] diff --git a/versions/o-/openimageio.json b/versions/o-/openimageio.json index b4b82cdc0a7461..e8b216c472357a 100644 --- a/versions/o-/openimageio.json +++ b/versions/o-/openimageio.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "b39ecd3fe6413ad3f54584244e7050a501762b0b", + "git-tree": "00b94623cc9528075483e57034da95bb356c6848", "version": "2.3.10.1", "port-version": 1 },