diff options
| author | Victor Romero <romerosanchezv@gmail.com> | 2019-02-26 08:16:20 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-26 08:16:20 -0800 |
| commit | bd94d1e254aede85506e07a632d1a7aafd538115 (patch) | |
| tree | 3b99452b7346175aca0d514dafc8324eb07364b8 /ports/ilmbase | |
| parent | ecff2997f686d9169e3d088541fda7aa2ea62011 (diff) | |
| download | vcpkg-bd94d1e254aede85506e07a632d1a7aafd538115.tar.gz vcpkg-bd94d1e254aede85506e07a632d1a7aafd538115.zip | |
[freeimage, libwebp, OpenEXR, OpenVDB] Updates (#5417)
* [libwebp] update to v1.0.2, greatly simplify port, remove unnecessary custom find_package script in favour of original Config files for cmake
* [libwebp] enable building of all tools
* [libwebp] install cmake config file in expected path
* [libwebp] add compatibility layer inside CMake Config file
* [libwebp] fix libwebpmux library name
* [OpenEXR] Update to v2.3.0, enable tools, improve cmake module while still maintaining backwards compatibility (there's an official one distributed with the package but it is completely different, for now it is avoided)
* [OpenEXR] remove unused patches
* [OpenEXR] remove forced definition, could hide problems downstream
* [freeimage] add compatibility with latest OpenEXR
* [freeimage] bump control
* [OpenEXR] restore ilmbase as an empty package to permit clean update
* [OpenVDB] update to v6.0
* [OpenEXR] disable building on UWP platform
* [openexr] Fix tools suffixes
* [openexr] Fix Linux build paths
Diffstat (limited to 'ports/ilmbase')
| -rw-r--r-- | ports/ilmbase/CONTROL | 7 | ||||
| -rw-r--r-- | ports/ilmbase/fix-parallel-build.patch | 54 | ||||
| -rw-r--r-- | ports/ilmbase/portfile.cmake | 50 |
3 files changed, 5 insertions, 106 deletions
diff --git a/ports/ilmbase/CONTROL b/ports/ilmbase/CONTROL index 9e405df31..51ea5dffc 100644 --- a/ports/ilmbase/CONTROL +++ b/ports/ilmbase/CONTROL @@ -1,3 +1,4 @@ -Source: ilmbase -Version: 2.2.1-1 -Description: Base libraries from ILM for OpenEXR +Source: ilmbase
+Version: 2.3.0
+Build-Depends: openexr
+Description: empty package, linking to newer one
diff --git a/ports/ilmbase/fix-parallel-build.patch b/ports/ilmbase/fix-parallel-build.patch deleted file mode 100644 index 85c773f31..000000000 --- a/ports/ilmbase/fix-parallel-build.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff --git a/Half/CMakeLists.txt b/Half/CMakeLists.txt -index 6f9714d..0c43904 100644 ---- a/Half/CMakeLists.txt -+++ b/Half/CMakeLists.txt -@@ -2,10 +2,10 @@ - - ADD_EXECUTABLE ( eLut eLut.cpp ) - --ADD_CUSTOM_COMMAND ( -- TARGET eLut POST_BUILD -+ADD_CUSTOM_TARGET ( make_eLut - COMMAND eLut > ${CMAKE_CURRENT_BINARY_DIR}/eLut.h - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -+ DEPENDS eLut - ) - SET_SOURCE_FILES_PROPERTIES( - ${CMAKE_CURRENT_BINARY_DIR}/eLut.h -@@ -13,25 +13,16 @@ SET_SOURCE_FILES_PROPERTIES( - ) - - ADD_EXECUTABLE ( toFloat toFloat.cpp ) --ADD_CUSTOM_COMMAND ( -- TARGET toFloat POST_BUILD -+ADD_CUSTOM_TARGET ( make_toFloat - COMMAND toFloat > ${CMAKE_CURRENT_BINARY_DIR}/toFloat.h - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -+ DEPENDS toFloat - ) - SET_SOURCE_FILES_PROPERTIES( - ${CMAKE_CURRENT_BINARY_DIR}/toFloat.h - PROPERTIES HEADER_FILE_ONLY TRUE - ) - --SET_SOURCE_FILES_PROPERTIES( -- half.cpp -- PROPERTIES -- OBJECT_DEPENDS -- ${CMAKE_CURRENT_BINARY_DIR}/eLut.h -- OBJECT_DEPENDS -- ${CMAKE_CURRENT_BINARY_DIR}/toFloat.h -- ) -- - IF(BUILD_SHARED_LIBS) - ADD_DEFINITIONS(-DHALF_EXPORTS) - ENDIF() -@@ -41,7 +32,7 @@ ADD_LIBRARY ( Half ${LIB_TYPE} - ) - - --ADD_DEPENDENCIES ( Half toFloat eLut ) -+ADD_DEPENDENCIES ( Half make_toFloat make_eLut ) - - INSTALL ( TARGETS - Half diff --git a/ports/ilmbase/portfile.cmake b/ports/ilmbase/portfile.cmake index 1752beb2c..9aefc8241 100644 --- a/ports/ilmbase/portfile.cmake +++ b/ports/ilmbase/portfile.cmake @@ -1,49 +1 @@ -if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - message(FATAL_ERROR "UWP build not supported") -endif() - -set(ILM_VERSION 2.2.1) -set(ILM_HASH a08ddd9069b34a93612445a445a2ddf80c0e22349bcf221a3cc6e9f5575180b08a8b597009dacabf072360e7162e15964988bc79e8ec82cf3da6507148a75320) - -include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ilmbase-${ILM_VERSION}) -vcpkg_download_distfile(ARCHIVE - URLS "http://download.savannah.nongnu.org/releases/openexr/ilmbase-${ILM_VERSION}.tar.gz" - FILENAME "ilmbase-${ILM_VERSION}.tar.gz" - SHA512 ${ILM_HASH}) - -vcpkg_extract_source_archive(${ARCHIVE}) -vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH} - PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-parallel-build.patch) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA) -vcpkg_install_cmake() - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - foreach(SUBDIR "" "/debug") - file(GLOB DLLS ${CURRENT_PACKAGES_DIR}${SUBDIR}/lib/*.dll) - file(COPY ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}${SUBDIR}/bin) - file(REMOVE ${DLLS}) - endforeach() -endif() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - -vcpkg_copy_pdbs() - -foreach(HEADER halfExport.h IexExport.h IexMathFloatExc.h IlmThreadExport.h ImathExport.h) - file(READ ${CURRENT_PACKAGES_DIR}/include/OpenEXR/${HEADER} HEADER_FILE) - if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - string(REPLACE "defined(OPENEXR_DLL)" "1" HEADER_FILE "${HEADER_FILE}") - else() - string(REPLACE "defined(OPENEXR_DLL)" "0" HEADER_FILE "${HEADER_FILE}") - endif() - file(WRITE ${CURRENT_PACKAGES_DIR}/include/OpenEXR/${HEADER} "${HEADER_FILE}") -endforeach() - -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ilmbase) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/ilmbase/LICENSE ${CURRENT_PACKAGES_DIR}/share/ilmbase/copyright) +set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
|
