mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-18 13:57:50 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Update OpenExr to 2.2.1 (#2931)

Browse Source
This commit is contained in:
Kim Christensen 2018-03-10 12:36:22 +01:00 committed by Robert Schumacher
parent 667f34314f
commit b7daa881f5
5 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/ilmbase/CONTROL
View File

@ -1,3 +1,3 @@
Source: ilmbase Source: ilmbase
Version: 2.2.0-1 Version: 2.2.1-1
Description: Base libraries from ILM for OpenEXR Description: Base libraries from ILM for OpenEXR

4
ports/ilmbase/portfile.cmake
View File

@ -2,8 +2,8 @@ if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
message(FATAL_ERROR "UWP build not supported") message(FATAL_ERROR "UWP build not supported")
endif() endif()
set(ILM_VERSION 2.2.0) set(ILM_VERSION 2.2.1)
set(ILM_HASH 0bbad14ed2bd286dff3987b16ef8631470211da54f822cb3e29b7931807216845ded81c9bf41fd2d22a8b362e8b9904a5450f61f5a242e460083e86b846513f1) set(ILM_HASH a08ddd9069b34a93612445a445a2ddf80c0e22349bcf221a3cc6e9f5575180b08a8b597009dacabf072360e7162e15964988bc79e8ec82cf3da6507148a75320)
include(vcpkg_common_functions) include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ilmbase-${ILM_VERSION}) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ilmbase-${ILM_VERSION})

20
ports/openexr/CMakeLists.txt.patch
View File

@ -1,27 +1,20 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index d3e3365..a20580e 100644 index 8c0a385..887ddf5 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -152,13 +152,13 @@ FILE ( APPEND ${CMAKE_CURRENT_BINARY_DIR}/config/OpenEXRConfig.h " @@ -157,8 +157,8 @@ IF (HAVE_SYSCONF_NPROCESSORS_ONLN)
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)
FILE ( APPEND ${CMAKE_CURRENT_BINARY_DIR}/config/OpenEXRConfig.h "#define OPENEXR_IMF_HAVE_SYSCONF_NPROCESSORS_ONLN 1\n" ) FILE ( APPEND ${CMAKE_CURRENT_BINARY_DIR}/config/OpenEXRConfig.h "#define OPENEXR_IMF_HAVE_SYSCONF_NPROCESSORS_ONLN 1\n" )
ENDIF() ENDIF()
-
-SET (OPENEXR_LIBSUFFIX "") -SET (OPENEXR_LIBSUFFIX "")
-SET (ILMBASE_LIBSUFFIX "") -SET (ILMBASE_LIBSUFFIX "")
+
+SET (OPENEXR_LIBSUFFIX "" CACHE STRING "Default suffix for OpenEXR") +SET (OPENEXR_LIBSUFFIX "" CACHE STRING "Default suffix for OpenEXR")
+SET (ILMBASE_LIBSUFFIX "" CACHE STRING "Default suffix for ILMBase") +SET (ILMBASE_LIBSUFFIX "" CACHE STRING "Default suffix for ILMBase")
IF (NAMESPACE_VERSIONING) IF (NAMESPACE_VERSIONING)
SET ( OPENEXR_LIBSUFFIX "-${OPENEXR_VERSION_API}" ) SET ( OPENEXR_LIBSUFFIX "-${OPENEXR_VERSION_API}" )
# assume same NAMESPACE_VERSION setting for IlmBase for now # assume same NAMESPACE_VERSION setting for IlmBase for now
@@ -188,32 +188,6 @@ SET_TARGET_PROPERTIES ( IlmImfUtil @@ -188,32 +188,6 @@ SET_TARGET_PROPERTIES ( IlmImfUtil
SOVERSION 22 SOVERSION 23
OUTPUT_NAME "IlmImfUtil${OPENEXR_LIBSUFFIX}" OUTPUT_NAME "IlmImfUtil${OPENEXR_LIBSUFFIX}"
) )
- -
@ -53,10 +46,11 @@ index d3e3365..a20580e 100644
########################## ##########################
# Installation # Installation
@@ -225,36 +199,3 @@ INSTALL ( FILES @@ -224,37 +198,3 @@ INSTALL ( FILES
DESTINATION
${CMAKE_INSTALL_PREFIX}/include/OpenEXR ${CMAKE_INSTALL_PREFIX}/include/OpenEXR
) )
-
-# Documentation -# Documentation
-INSTALL ( FILES -INSTALL ( FILES
- doc/TechnicalIntroduction.pdf - doc/TechnicalIntroduction.pdf

2
ports/openexr/CONTROL
View File

@ -1,4 +1,4 @@
Source: openexr 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 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 Build-Depends: zlib, ilmbase

4
ports/openexr/portfile.cmake
View File

@ -1,5 +1,5 @@
set(OPENEXR_VERSION 2.2.0) set(OPENEXR_VERSION 2.2.1)
set(OPENEXR_HASH 017abbeeb6b814508180721bc8e8940094965c4c55b135a198c6bcb109a04bf7f72e4aee81ee72cb2185fe818a41d892b383e8d2d59f40c673198948cb79279a) set(OPENEXR_HASH 192100c6ac47534f3a93c55327d2ab90b07a8265156855086b326184328c257dcde12991b3f3f1831e2df4226fe884adcfe481c2f02a157c715aee665e89a480)
include(vcpkg_common_functions) include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openexr-${OPENEXR_VERSION}) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openexr-${OPENEXR_VERSION})