diff options
| author | Cheney Wang <38240633+Cheney-W@users.noreply.github.com> | 2021-09-07 21:09:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-07 21:09:32 -0700 |
| commit | 4814a512905e288df1b5d544e60775abcc5a1ca0 (patch) | |
| tree | 043d0a4c6ac50cb565a3281537f0645f7762521d | |
| parent | f63a6a53b464b6e84acc1b6328f876f2672f325f (diff) | |
| download | vcpkg-4814a512905e288df1b5d544e60775abcc5a1ca0.tar.gz vcpkg-4814a512905e288df1b5d544e60775abcc5a1ca0.zip | |
[openimageio] update version to 2.3.7.2 (#19961)
* [openimageio] update version to 2.3.7.2
* Disable the test in vcpkg
Co-authored-by: Cheney-Wang <v-xincwa@microsoft.com>
| -rw-r--r-- | ports/openimageio/disable-test.patch | 18 | ||||
| -rw-r--r-- | ports/openimageio/portfile.cmake | 5 | ||||
| -rw-r--r-- | ports/openimageio/vcpkg.json | 3 | ||||
| -rw-r--r-- | versions/baseline.json | 4 | ||||
| -rw-r--r-- | versions/o-/openimageio.json | 5 |
5 files changed, 29 insertions, 6 deletions
diff --git a/ports/openimageio/disable-test.patch b/ports/openimageio/disable-test.patch new file mode 100644 index 000000000..fc46c40b4 --- /dev/null +++ b/ports/openimageio/disable-test.patch @@ -0,0 +1,18 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 54fe7d9..65f47fd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -281,11 +281,12 @@ install (EXPORT OIIO_EXPORTED_TARGETS
+ FILE ${OIIO_TARGETS_EXPORT_NAME}
+ NAMESPACE ${PROJECT_NAME}::)
+
+-
++if (0)
+ if (NOT ${PROJECT_NAME}_IS_SUBPROJECT)
+ oiio_setup_test_data()
+ oiio_add_all_tests()
+ endif ()
++endif ()
+
+ if (NOT ${PROJECT_NAME}_IS_SUBPROJECT)
+ include (packaging)
diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake index 86c2899d8..496ec5c43 100644 --- a/ports/openimageio/portfile.cmake +++ b/ports/openimageio/portfile.cmake @@ -8,12 +8,13 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OpenImageIO/oiio - REF 099c8585e3add6f58fab9aa438a491fa55d3f67e # 2.2.17.0 - SHA512 36e3aef52e082fcff64a16d10ad372a6335b3562c3d6e62aac88173476ae6c3694ac565084d50551724f47be83a7a8182e608c81c7a787392e576d9c401f65f5 + REF 9f74cf4d9813bfdcad5bca08b4ff75a25d056cb0 # 2.3.7.2 + SHA512 cebc388e842e983f010c5f3bf57bed3fe1ae9d2eac79019472f8431b194d6a8b156b27cc5688bd0998aa2d01959d47bcdc7e637417f755433ffe32c491cdc376 HEAD_REF master PATCHES fix-config-cmake.patch fix_static_build.patch + disable-test.patch ) file(REMOVE_RECURSE "${SOURCE_PATH}/ext") diff --git a/ports/openimageio/vcpkg.json b/ports/openimageio/vcpkg.json index c89d105d6..78ab842b9 100644 --- a/ports/openimageio/vcpkg.json +++ b/ports/openimageio/vcpkg.json @@ -1,7 +1,6 @@ { "name": "openimageio", - "version": "2.2.17.0", - "port-version": 1, + "version": "2.3.7.2", "description": "A library for reading and writing images, and a bunch of related classes, utilities, and application.", "homepage": "https://github.com/OpenImageIO/oiio", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index c737de997..b2bc2818a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4713,8 +4713,8 @@ "port-version": 1 }, "openimageio": { - "baseline": "2.2.17.0", - "port-version": 1 + "baseline": "2.3.7.2", + "port-version": 0 }, "openjpeg": { "baseline": "2.3.1", diff --git a/versions/o-/openimageio.json b/versions/o-/openimageio.json index 97fa6210a..e68d13dda 100644 --- a/versions/o-/openimageio.json +++ b/versions/o-/openimageio.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "6da138c7530d19649391636a660a06aac51db135", + "version": "2.3.7.2", + "port-version": 0 + }, + { "git-tree": "1567eaa1f67e0996635f0d4213b55e9b97882acf", "version": "2.2.17.0", "port-version": 1 |