diff options
| author | Phoebe <925731795@qq.com> | 2019-08-08 20:44:17 +0800 |
|---|---|---|
| committer | dan-shaw <51385773+dan-shaw@users.noreply.github.com> | 2019-08-08 05:44:17 -0700 |
| commit | 945717ce513081e381746763646eb504d7a68cac (patch) | |
| tree | 3d8657078212def5a6bd10524c5bcd3cccfa48b5 | |
| parent | f27820fa863fe17b98abf869477459609c69b32d (diff) | |
| download | vcpkg-945717ce513081e381746763646eb504d7a68cac.tar.gz vcpkg-945717ce513081e381746763646eb504d7a68cac.zip | |
[openimageio] Fix feature libraw build errors (#7419)
* [openimageio] Fix feature libraw build errors
* Update to master latest commit
| -rw-r--r-- | ports/openimageio/CONTROL | 2 | ||||
| -rw-r--r-- | ports/openimageio/portfile.cmake | 4 | ||||
| -rw-r--r-- | ports/openimageio/remove_wrong_dependency.patch | 30 |
3 files changed, 18 insertions, 18 deletions
diff --git a/ports/openimageio/CONTROL b/ports/openimageio/CONTROL index ceb4b9408..3b864bea0 100644 --- a/ports/openimageio/CONTROL +++ b/ports/openimageio/CONTROL @@ -1,5 +1,5 @@ Source: openimageio -Version: 2.0.8 +Version: 2019-08-08 Homepage: https://github.com/OpenImageIO/oiio Description: A library for reading and writing images, and a bunch of related classes, utilities, and application Build-Depends: libjpeg-turbo, tiff, libpng, openexr, boost-thread, boost-smart-ptr, boost-foreach, boost-regex, boost-type-traits, boost-static-assert, boost-unordered, boost-config, boost-algorithm, boost-filesystem, boost-system, boost-thread, boost-asio, boost-random, robin-map, boost-stacktrace diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake index e40441e4c..3053af3fa 100644 --- a/ports/openimageio/portfile.cmake +++ b/ports/openimageio/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OpenImageIO/oiio - REF Release-2.0.8 - SHA512 412d240916780b784b89d9eeb36b5b9451e8448100fce494c0d95f0b274506d2946cae0eb929dbe8118b8b04a8bd2a926270a971aad7d0542abcff5f35404953 + REF ad1ab61a56c63d770e4beb335efe8b1f1a9e36cd + SHA512 48ee7862583e7adb86b56b20634c34aebf83ef0a3a14ad96182494ce6a84cb027334840a6c4c335e9342110c3a36532e3eeae22a3ed7363cd91b27cb7ca58154 HEAD_REF master PATCHES fix_libraw.patch diff --git a/ports/openimageio/remove_wrong_dependency.patch b/ports/openimageio/remove_wrong_dependency.patch index 307ef1dec..5338c6563 100644 --- a/ports/openimageio/remove_wrong_dependency.patch +++ b/ports/openimageio/remove_wrong_dependency.patch @@ -1,15 +1,15 @@ -diff --git a/src/libOpenImageIO/CMakeLists.txt b/src/libOpenImageIO/CMakeLists.txt -index 61ed97b..4435426 100644 ---- a/src/libOpenImageIO/CMakeLists.txt -+++ b/src/libOpenImageIO/CMakeLists.txt -@@ -164,10 +164,6 @@ if (WIN32) - target_link_libraries (OpenImageIO psapi.lib) - endif () - --if (VISIBILITY_MAP_FILE) -- add_dependencies (OpenImageIO "${VISIBILITY_MAP_FILE}") --endif () -- - if (USE_EXTERNAL_PUGIXML) - target_link_libraries (OpenImageIO ${PUGIXML_LIBRARIES}) - endif () +diff --git a/src/libOpenImageIO/CMakeLists.txt b/src/libOpenImageIO/CMakeLists.txt
+index 5449675..cdd5235 100644
+--- a/src/libOpenImageIO/CMakeLists.txt
++++ b/src/libOpenImageIO/CMakeLists.txt
+@@ -171,10 +171,6 @@ elseif(MINGW)
+ target_link_libraries (OpenImageIO psapi ws2_32)
+ endif ()
+
+-if (VISIBILITY_MAP_FILE)
+- add_dependencies (OpenImageIO "${VISIBILITY_MAP_FILE}")
+-endif ()
+-
+ if (USE_EXTERNAL_PUGIXML)
+ target_link_libraries (OpenImageIO ${PUGIXML_LIBRARIES})
+ endif ()
|