diff options
| author | Dale Stammen <dalestam@microsoft.com> | 2017-01-12 20:39:49 -0800 |
|---|---|---|
| committer | Dale Stammen <dalestam@microsoft.com> | 2017-01-12 20:39:49 -0800 |
| commit | 7676b8780db1e1e591c4fc7eba4f96f73c428cb4 (patch) | |
| tree | 6864d24f6ea1fc6acec7a54e0f2b7e80a54642dc /ports/tiff | |
| parent | 30429e68db721f542abf153293b49822c107870e (diff) | |
| parent | 9072f51d746b857dfda19844cc773181d6d42382 (diff) | |
| download | vcpkg-7676b8780db1e1e591c4fc7eba4f96f73c428cb4.tar.gz vcpkg-7676b8780db1e1e591c4fc7eba4f96f73c428cb4.zip | |
Merge branch 'master' into curl-uwp
Diffstat (limited to 'ports/tiff')
| -rw-r--r-- | ports/tiff/CONTROL | 2 | ||||
| -rw-r--r-- | ports/tiff/fix-uwp.patch | 25 | ||||
| -rw-r--r-- | ports/tiff/portfile.cmake | 1 |
3 files changed, 27 insertions, 1 deletions
diff --git a/ports/tiff/CONTROL b/ports/tiff/CONTROL index 65e3d37da..0c82029fb 100644 --- a/ports/tiff/CONTROL +++ b/ports/tiff/CONTROL @@ -1,4 +1,4 @@ Source: tiff -Version: 4.0.6-1 +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 diff --git a/ports/tiff/fix-uwp.patch b/ports/tiff/fix-uwp.patch new file mode 100644 index 000000000..6fce8d573 --- /dev/null +++ b/ports/tiff/fix-uwp.patch @@ -0,0 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 439e26a..05416d8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -187,6 +187,7 @@ endforeach(flag ${test_flags}) + + if(MSVC) + set(CMAKE_DEBUG_POSTFIX "d") ++ add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE) + endif() + + option(ld-version-script "Enable linker version script" ON) +diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c +index a0dc68b..3c4e101 100644 +--- a/libtiff/tif_dirread.c ++++ b/libtiff/tif_dirread.c +@@ -3690,7 +3690,7 @@ TIFFReadDirectory(TIFF* tif) + case TIFFTAG_SMAXSAMPLEVALUE: + { + +- double *data; ++ double *data = NULL; + enum TIFFReadDirEntryErr err; + uint32 saved_flags; + int m; diff --git a/ports/tiff/portfile.cmake b/ports/tiff/portfile.cmake index 345024fe0..281d681b9 100644 --- a/ports/tiff/portfile.cmake +++ b/ports/tiff/portfile.cmake @@ -10,6 +10,7 @@ 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 ) vcpkg_configure_cmake( |