diff options
| author | Radwan Ibrahim <radwan.ibrahim@msn.com> | 2020-08-07 20:49:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-07 11:49:27 -0700 |
| commit | 025447ae0e2278cc73dc073b8dae8cb9f3022c50 (patch) | |
| tree | 7d8b3c56a0413c593338514880350efb7123321f | |
| parent | fde75f410eba535d74ee1009e78d8c385d5b6f4b (diff) | |
| download | vcpkg-025447ae0e2278cc73dc073b8dae8cb9f3022c50.tar.gz vcpkg-025447ae0e2278cc73dc073b8dae8cb9f3022c50.zip | |
[tiff] Update 4.0.10 to 4.1.0 (#12559)
* Update tiff 4.0.10 to 4.1.0
* Update portfile.cmake
Co-authored-by: Radwan Ibrahim <Radwan.Ibrahim@cosmonio.com>
Co-authored-by: Lily <47812810+LilyWangL@users.noreply.github.com>
Co-authored-by: wangli28 <wangli28@beyondsoft.com>
| -rw-r--r-- | ports/tiff/CONTROL | 2 | ||||
| -rw-r--r-- | ports/tiff/cmakelists.patch | 15 | ||||
| -rw-r--r-- | ports/tiff/portfile.cmake | 8 |
3 files changed, 5 insertions, 20 deletions
diff --git a/ports/tiff/CONTROL b/ports/tiff/CONTROL index d8f79b2f9..f37049768 100644 --- a/ports/tiff/CONTROL +++ b/ports/tiff/CONTROL @@ -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 diff --git a/ports/tiff/cmakelists.patch b/ports/tiff/cmakelists.patch index 597c980c5..a82de0452 100644 --- a/ports/tiff/cmakelists.patch +++ b/ports/tiff/cmakelists.patch @@ -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}") diff --git a/ports/tiff/portfile.cmake b/ports/tiff/portfile.cmake index 828e8ec0b..ab610d328 100644 --- a/ports/tiff/portfile.cmake +++ b/ports/tiff/portfile.cmake @@ -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( @@ -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) |