diff --git a/ports/openimageio/fix-msvc-build.patch b/ports/openimageio/fix-msvc-build.patch deleted file mode 100644 index 0643adf94b..0000000000 --- a/ports/openimageio/fix-msvc-build.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/python/py_oiio.cpp b/src/python/py_oiio.cpp -index 6031d2c23..e71105da5 100644 ---- a/src/python/py_oiio.cpp -+++ b/src/python/py_oiio.cpp -@@ -153,7 +153,7 @@ oiio_bufinfo::oiio_bufinfo(const py::buffer_info& pybuf, int nchans, int width, - format = TypeUnknown; // No idea what's going on -- error - error = Strutil::fmt::format( - "Python array shape is [{:,}] but expecting h={}, w={}, ch={}", -- cspan(pybuf.shape), height, width, nchans); -+ cspan(pybuf.shape), height, width, nchans); - } - } else if (pixeldims == 1) { - // Reading a 1D scanline span diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake index 2fb3851231..78a7aad113 100644 --- a/ports/openimageio/portfile.cmake +++ b/ports/openimageio/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OpenImageIO/oiio REF "v${VERSION}" - SHA512 e8b232bb3c1bb66cc6c4f023dcf6e29633a1aee64c49a2860c2157c0885960c40114ee3988d4f132e6e55670b8b1e01b5b4cd4462651ae047a89d22de527581c + SHA512 9325beefce55b66a58fcfc2ce93e1406558ed5f6cc37cb1e8e04aee470c4f30a14483bebfb311c329f7868afb6c508a052661c6b12d819a69f707c1a30cd9549 HEAD_REF master PATCHES fix-dependencies.patch @@ -11,7 +11,6 @@ vcpkg_from_github( imath-version-guard.patch fix-openimageio_include_dir.patch fix-openexr-target-missing.patch - fix-msvc-build.patch ) file(REMOVE_RECURSE "${SOURCE_PATH}/ext") diff --git a/ports/openimageio/vcpkg.json b/ports/openimageio/vcpkg.json index 7283dcbce4..c76049d4a7 100644 --- a/ports/openimageio/vcpkg.json +++ b/ports/openimageio/vcpkg.json @@ -1,6 +1,6 @@ { "name": "openimageio", - "version": "2.4.11.1", + "version": "2.4.13.0", "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", diff --git a/versions/baseline.json b/versions/baseline.json index 7e4397e3fe..7ec0258412 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6037,7 +6037,7 @@ "port-version": 4 }, "openimageio": { - "baseline": "2.4.11.1", + "baseline": "2.4.13.0", "port-version": 0 }, "openjpeg": { diff --git a/versions/o-/openimageio.json b/versions/o-/openimageio.json index ccf0a9de9e..6ad6ba5c30 100644 --- a/versions/o-/openimageio.json +++ b/versions/o-/openimageio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1d6d564f1848ae68ece423fa0597c8a5fe6c9d5d", + "version": "2.4.13.0", + "port-version": 0 + }, { "git-tree": "7c06030b088b87143ff7a85c23af606bbd967496", "version": "2.4.11.1",