Skip to content

[tiff] Update 4.0.10 to 4.1.0 #12559

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
strega-nil merged 3 commits into from
Aug 7, 2020
Merged

[tiff] Update 4.0.10 to 4.1.0 #12559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b6e000
Update tiff 4.0.10 to 4.1.0
Jul 24, 2020
2a3c97d
Update portfile.cmake
LilyWangL Jul 27, 2020
1077806
Merge branch 'master' of https://github.com/microsoft/vcpkg into tiff…
LilyWangL Aug 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/tiff/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: tiff
Version: 4.0.10-9
Version: 4.1.0
Build-Depends: zlib, libjpeg-turbo, liblzma
Homepage: https://download.osgeo.org/libtiff
Description: A library that supports the manipulation of TIFF image files
Expand Down
15 changes: 0 additions & 15 deletions ports/tiff/cmakelists.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,21 +73,6 @@ diff --git a/libtiff/CMakeLists.txt b/libtiff/CMakeLists.txt
index 1cf1b75..4ee29f6 100644
--- a/libtiff/CMakeLists.txt
+++ b/libtiff/CMakeLists.txt
@@ -104,11 +104,11 @@ set(tiffxx_HEADERS
set(tiffxx_SOURCES
tif_stream.cxx)

-if(WIN32_IO)
- extra_dist(tif_unix.c)
+if(USE_WIN32_FILEIO)
+ extra_dist(tif_win32.c)
list(APPEND tiff_SOURCES tif_win32.c)
else()
- extra_dist(tif_win32.c)
+ extra_dist(tif_unix.c)
list(APPEND tiff_SOURCES tif_unix.c)
endif()

@@ -143,7 +143,7 @@ install(FILES ${tiff_HEADERS} ${nodist_tiff_HEADERS}
DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}")

Expand Down
8 changes: 4 additions & 4 deletions ports/tiff/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
set(LIBTIFF_VERSION 4.0.10)
set(LIBTIFF_VERSION 4.1.0)

vcpkg_download_distfile(ARCHIVE
URLS "http://download.osgeo.org/libtiff/tiff-${LIBTIFF_VERSION}.tar.gz"
FILENAME "tiff-${LIBTIFF_VERSION}.tar.gz"
SHA512 d213e5db09fd56b8977b187c5a756f60d6e3e998be172550c2892dbdb4b2a8e8c750202bc863fe27d0d1c577ab9de1710d15e9f6ed665aadbfd857525a81eea8
SHA512 fd541dcb11e3d5afaa1ec2f073c9497099727a52f626b338ef87dc93ca2e23ca5f47634015a4beac616d4e8f05acf7b7cd5797fb218758cc2ad31b390491c5a6
)

vcpkg_extract_source_archive_ex(
Expand Down Expand Up @@ -49,8 +49,8 @@ file(REMOVE_RECURSE
)


file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/tiff)
file(INSTALL ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/tiff RENAME copyright)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
file(INSTALL ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

if ("tool" IN_LIST FEATURES)
file(GLOB TIFF_TOOLS ${CURRENT_PACKAGES_DIR}/bin/*.exe)
Expand Down