diff options
| author | Kim Christensen <kimworking@gmail.com> | 2018-03-10 12:36:22 +0100 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-03-10 03:36:22 -0800 |
| commit | b7daa881f5941f7b4aaf7d8ad667b5a761c9b4cc (patch) | |
| tree | 23178ed2884e855425b35a1943470e23f497e987 | |
| parent | 667f34314f8a6edcb01c1bba72a9dc07ccd6a21c (diff) | |
| download | vcpkg-b7daa881f5941f7b4aaf7d8ad667b5a761c9b4cc.tar.gz vcpkg-b7daa881f5941f7b4aaf7d8ad667b5a761c9b4cc.zip | |
Update OpenExr to 2.2.1 (#2931)
| -rw-r--r-- | ports/ilmbase/CONTROL | 2 | ||||
| -rw-r--r-- | ports/ilmbase/portfile.cmake | 4 | ||||
| -rw-r--r-- | ports/openexr/CMakeLists.txt.patch | 20 | ||||
| -rw-r--r-- | ports/openexr/CONTROL | 2 | ||||
| -rw-r--r-- | ports/openexr/portfile.cmake | 4 |
5 files changed, 13 insertions, 19 deletions
diff --git a/ports/ilmbase/CONTROL b/ports/ilmbase/CONTROL index 2060d94d5..9e405df31 100644 --- a/ports/ilmbase/CONTROL +++ b/ports/ilmbase/CONTROL @@ -1,3 +1,3 @@ Source: ilmbase -Version: 2.2.0-1 +Version: 2.2.1-1 Description: Base libraries from ILM for OpenEXR diff --git a/ports/ilmbase/portfile.cmake b/ports/ilmbase/portfile.cmake index f81423afc..1752beb2c 100644 --- a/ports/ilmbase/portfile.cmake +++ b/ports/ilmbase/portfile.cmake @@ -2,8 +2,8 @@ if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") message(FATAL_ERROR "UWP build not supported") endif() -set(ILM_VERSION 2.2.0) -set(ILM_HASH 0bbad14ed2bd286dff3987b16ef8631470211da54f822cb3e29b7931807216845ded81c9bf41fd2d22a8b362e8b9904a5450f61f5a242e460083e86b846513f1) +set(ILM_VERSION 2.2.1) +set(ILM_HASH a08ddd9069b34a93612445a445a2ddf80c0e22349bcf221a3cc6e9f5575180b08a8b597009dacabf072360e7162e15964988bc79e8ec82cf3da6507148a75320) include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ilmbase-${ILM_VERSION}) diff --git a/ports/openexr/CMakeLists.txt.patch b/ports/openexr/CMakeLists.txt.patch index bb0d003ef..0ee0110d5 100644 --- a/ports/openexr/CMakeLists.txt.patch +++ b/ports/openexr/CMakeLists.txt.patch @@ -1,27 +1,20 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index d3e3365..a20580e 100644 +index 8c0a385..887ddf5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -152,13 +152,13 @@ FILE ( APPEND ${CMAKE_CURRENT_BINARY_DIR}/config/OpenEXRConfig.h " - IF (HAVE_GCC_INLINE_ASM_AVX) - FILE ( APPEND ${CMAKE_CURRENT_BINARY_DIR}/config/OpenEXRConfig.h "#define OPENEXR_IMF_HAVE_GCC_INLINE_ASM_AVX 1\n" ) - ENDIF() -- -+ - IF (HAVE_SYSCONF_NPROCESSORS_ONLN) +@@ -157,8 +157,8 @@ IF (HAVE_SYSCONF_NPROCESSORS_ONLN) FILE ( APPEND ${CMAKE_CURRENT_BINARY_DIR}/config/OpenEXRConfig.h "#define OPENEXR_IMF_HAVE_SYSCONF_NPROCESSORS_ONLN 1\n" ) ENDIF() -- + -SET (OPENEXR_LIBSUFFIX "") -SET (ILMBASE_LIBSUFFIX "") -+ +SET (OPENEXR_LIBSUFFIX "" CACHE STRING "Default suffix for OpenEXR") +SET (ILMBASE_LIBSUFFIX "" CACHE STRING "Default suffix for ILMBase") IF (NAMESPACE_VERSIONING) SET ( OPENEXR_LIBSUFFIX "-${OPENEXR_VERSION_API}" ) # assume same NAMESPACE_VERSION setting for IlmBase for now @@ -188,32 +188,6 @@ SET_TARGET_PROPERTIES ( IlmImfUtil - SOVERSION 22 + SOVERSION 23 OUTPUT_NAME "IlmImfUtil${OPENEXR_LIBSUFFIX}" ) - @@ -53,10 +46,11 @@ index d3e3365..a20580e 100644 ########################## # Installation -@@ -225,36 +199,3 @@ INSTALL ( FILES +@@ -224,37 +198,3 @@ INSTALL ( FILES + DESTINATION ${CMAKE_INSTALL_PREFIX}/include/OpenEXR ) - +- -# Documentation -INSTALL ( FILES - doc/TechnicalIntroduction.pdf diff --git a/ports/openexr/CONTROL b/ports/openexr/CONTROL index 2bc513755..752dafc6d 100644 --- a/ports/openexr/CONTROL +++ b/ports/openexr/CONTROL @@ -1,4 +1,4 @@ Source: openexr -Version: 2.2.0-4 +Version: 2.2.1-1 Description: OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial Light & Magic for use in computer imaging applications Build-Depends: zlib, ilmbase diff --git a/ports/openexr/portfile.cmake b/ports/openexr/portfile.cmake index b5b9c8d97..7e3b6603f 100644 --- a/ports/openexr/portfile.cmake +++ b/ports/openexr/portfile.cmake @@ -1,5 +1,5 @@ -set(OPENEXR_VERSION 2.2.0) -set(OPENEXR_HASH 017abbeeb6b814508180721bc8e8940094965c4c55b135a198c6bcb109a04bf7f72e4aee81ee72cb2185fe818a41d892b383e8d2d59f40c673198948cb79279a) +set(OPENEXR_VERSION 2.2.1) +set(OPENEXR_HASH 192100c6ac47534f3a93c55327d2ab90b07a8265156855086b326184328c257dcde12991b3f3f1831e2df4226fe884adcfe481c2f02a157c715aee665e89a480) include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openexr-${OPENEXR_VERSION}) |