diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-04-19 01:02:24 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-04-19 01:02:35 -0700 |
| commit | 280a6c6d7f55fb61858c0b90fa80a52883ec5801 (patch) | |
| tree | a0c71fbed08fcc26c966f1b8d110c6c35c3faf98 | |
| parent | 86e2c3572516751eb7e8693e14b9fca7d52bb884 (diff) | |
| download | vcpkg-280a6c6d7f55fb61858c0b90fa80a52883ec5801.tar.gz vcpkg-280a6c6d7f55fb61858c0b90fa80a52883ec5801.zip | |
[tiff] Fix UWP builds for version 4.0.7
| -rw-r--r-- | ports/tiff/CONTROL | 4 | ||||
| -rw-r--r-- | ports/tiff/crt-secure-no-deprecate.patch | 12 | ||||
| -rw-r--r-- | ports/tiff/fix-uwp.patch | 25 | ||||
| -rw-r--r-- | ports/tiff/portfile.cmake | 2 |
4 files changed, 15 insertions, 28 deletions
diff --git a/ports/tiff/CONTROL b/ports/tiff/CONTROL index efbbf97bd..dfebf3cc8 100644 --- a/ports/tiff/CONTROL +++ b/ports/tiff/CONTROL @@ -1,4 +1,4 @@ Source: tiff -Version: 4.0.7 -Build-Depends: zlib, libjpeg-turbo, liblzma, freeglut +Version: 4.0.7-1 +Build-Depends: zlib, libjpeg-turbo, liblzma [windows], freeglut [windows] Description: A library that supports the manipulation of TIFF image files diff --git a/ports/tiff/crt-secure-no-deprecate.patch b/ports/tiff/crt-secure-no-deprecate.patch new file mode 100644 index 000000000..476a931a9 --- /dev/null +++ b/ports/tiff/crt-secure-no-deprecate.patch @@ -0,0 +1,12 @@ +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 -D_CRT_SECURE_NO_WARNINGS /wd4996) + endif() + + option(ld-version-script "Enable linker version script" ON) diff --git a/ports/tiff/fix-uwp.patch b/ports/tiff/fix-uwp.patch deleted file mode 100644 index 6fce8d573..000000000 --- a/ports/tiff/fix-uwp.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 6fd01652f..708fb70ad 100644 --- a/ports/tiff/portfile.cmake +++ b/ports/tiff/portfile.cmake @@ -14,8 +14,8 @@ 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-cxx-shared-libs.patch + ${CMAKE_CURRENT_LIST_DIR}/crt-secure-no-deprecate.patch ) vcpkg_configure_cmake( |