diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-03-23 14:33:22 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-03-23 14:33:22 -0700 |
| commit | 986ed6b918220963b8b6fde3e1e1eb0627e55427 (patch) | |
| tree | c8a19391ff6b91049ab64375cad77563d23a1707 | |
| parent | 3ff95e2a76719645633e2cac4d07b47ef790a3e2 (diff) | |
| download | vcpkg-986ed6b918220963b8b6fde3e1e1eb0627e55427.tar.gz vcpkg-986ed6b918220963b8b6fde3e1e1eb0627e55427.zip | |
[tiff] Add support for jpeg, lzma, and glut. Add c++ support.
| -rw-r--r-- | ports/tiff/CONTROL | 6 | ||||
| -rw-r--r-- | ports/tiff/fix-cxx-shared-libs.patch | 23 | ||||
| -rw-r--r-- | ports/tiff/portfile.cmake | 7 |
3 files changed, 31 insertions, 5 deletions
diff --git a/ports/tiff/CONTROL b/ports/tiff/CONTROL index 0c82029fb..d90a0858d 100644 --- a/ports/tiff/CONTROL +++ b/ports/tiff/CONTROL @@ -1,4 +1,4 @@ Source: tiff -Version: 4.0.6-2 -Build-Depends: zlib -Description: A library that supports the manipulation of TIFF image files
\ No newline at end of file +Version: 4.0.6-3 +Build-Depends: zlib, libjpeg-turbo, liblzma, freeglut +Description: A library that supports the manipulation of TIFF image files diff --git a/ports/tiff/fix-cxx-shared-libs.patch b/ports/tiff/fix-cxx-shared-libs.patch new file mode 100644 index 000000000..37389ca81 --- /dev/null +++ b/ports/tiff/fix-cxx-shared-libs.patch @@ -0,0 +1,23 @@ +From 4370dea04189fb9d9a94e1f4ee96ef2d24937fc9 Mon Sep 17 00:00:00 2001 +From: Mikhail Paulyshka <me@mixaill.tk> +Date: Thu, 23 Mar 2017 17:55:14 +0300 +Subject: [PATCH] fix shared libs building + +--- + libtiff/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libtiff/CMakeLists.txt b/libtiff/CMakeLists.txt +index 087dfa9..20fa8b4 100644 +--- a/libtiff/CMakeLists.txt ++++ b/libtiff/CMakeLists.txt +@@ -142,6 +142,7 @@ if(cxx) + add_library(tiffxx ${tiffxx_SOURCES} ${tiffxx_HEADERS}) + target_link_libraries(tiffxx tiff) + set_target_properties(tiffxx PROPERTIES SOVERSION ${SO_COMPATVERSION}) ++ set_target_properties(tiffxx PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON) + if(NOT CYGWIN) + # This property causes shared libraries on Linux to have the full version + # encoded into their final filename. We disable this on Cygwin because +-- +2.11.0.windows.1 diff --git a/ports/tiff/portfile.cmake b/ports/tiff/portfile.cmake index 281d681b9..6bbb27fe0 100644 --- a/ports/tiff/portfile.cmake +++ b/ports/tiff/portfile.cmake @@ -10,17 +10,20 @@ vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} PATCHES ${CMAKE_CURRENT_LIST_DIR}/add-component-options.patch - ${CMAKE_CURRENT_LIST_DIR}/fix-uwp.patch + ${CMAKE_CURRENT_LIST_DIR}/fix-uwp.patch + ${CMAKE_CURRENT_LIST_DIR}/fix-cxx-shared-libs.patch ) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS - -Dcxx=OFF -DBUILD_TOOLS=OFF -DBUILD_DOCS=OFF -DBUILD_CONTRIB=OFF -DBUILD_TESTS=OFF + -Djbig=OFF # This is disabled by default due to GPL/Proprietary licensing. + -Djpeg12=OFF ) vcpkg_install_cmake() |