3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-28 03:10:57 +08:00
Code Issues Projects Releases Wiki Activity

[tiff] Fix UWP builds for version 4.0.7

Browse Source
This commit is contained in:
Robert Schumacher 2017-04-19 01:02:24 -07:00
parent 86e2c35725
commit 280a6c6d7f
4 changed files with 15 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/tiff/CONTROL
View File

@ -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

12
ports/tiff/crt-secure-no-deprecate.patch Normal file
View File

@ -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)

25
ports/tiff/fix-uwp.patch
View File

@ -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;

2
ports/tiff/portfile.cmake
View File

@ -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(