From 09e4e6ce992a311fa3bab15cdb732572a53e3e4e Mon Sep 17 00:00:00 2001 From: efesxzc Date: Wed, 22 May 2024 01:22:38 +0500 Subject: [PATCH 01/17] [tinytiff] add new port --- ports/tinytiff/portfile.cmake | 41 +++++++++++++++++++++++++++++++++++ ports/tinytiff/usage | 4 ++++ ports/tinytiff/vcpkg.json | 22 +++++++++++++++++++ 3 files changed, 67 insertions(+) create mode 100644 ports/tinytiff/portfile.cmake create mode 100644 ports/tinytiff/usage create mode 100644 ports/tinytiff/vcpkg.json diff --git a/ports/tinytiff/portfile.cmake b/ports/tinytiff/portfile.cmake new file mode 100644 index 00000000000000..a70b039f8ffd54 --- /dev/null +++ b/ports/tinytiff/portfile.cmake @@ -0,0 +1,41 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jkriege2/TinyTIFF + REF ${VERSION} + SHA512 28fb3d1ef1630a4d20da021ccca93f99df8bd29462525be312dfb028239176ca940a43407b2db10488d891a1fbca65d8a59bc6cc097765389f35021e8b423885 + HEAD_REF master +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(BUILD_SHARED_LIBS OFF) +else() + set(BUILD_SHARED_LIBS ON) +endif() + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "winapi" TinyTIFF_USE_WINAPI_FOR_FILEIO +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DTinyTIFF_BUILD_TESTS=OFF + -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/TinyTIFF) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/TinyTIFFXX) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/tinytiff/usage b/ports/tinytiff/usage new file mode 100644 index 00000000000000..162cf3bc5ea0d0 --- /dev/null +++ b/ports/tinytiff/usage @@ -0,0 +1,4 @@ +tinytiff provides CMake targets: + + find_package(TinyTIFF REQUIRED) + target_link_libraries(main PRIVATE TinyTIFF::TinyTIFF) \ No newline at end of file diff --git a/ports/tinytiff/vcpkg.json b/ports/tinytiff/vcpkg.json new file mode 100644 index 00000000000000..1bec3c73a862d5 --- /dev/null +++ b/ports/tinytiff/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "tinytiff", + "version": "4.0.0.0", + "port-version": 0, + "description": "Lightweight TIFF reader/writer library", + "homepage": "http://jkriege2.github.io/TinyTIFF/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "winapi": { + "description": "Use WIN-API for File-IO" + } + } +} From a4dc7ef2cee182d642f07b13a617ac1388ce2494 Mon Sep 17 00:00:00 2001 From: efesxzc Date: Wed, 22 May 2024 01:26:18 +0500 Subject: [PATCH 02/17] update portfile.cmake --- ports/tinytiff/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/tinytiff/portfile.cmake b/ports/tinytiff/portfile.cmake index a70b039f8ffd54..c7324aeac3be73 100644 --- a/ports/tinytiff/portfile.cmake +++ b/ports/tinytiff/portfile.cmake @@ -28,7 +28,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/TinyTIFF) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/TinyTIFF DO_NOT_DELETE_PARENT_CONFIG_PATH) vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/TinyTIFFXX) vcpkg_copy_pdbs() From 5dd84b44c404d2185af4570365c431413127dc74 Mon Sep 17 00:00:00 2001 From: efesxzc Date: Wed, 22 May 2024 18:23:17 +0500 Subject: [PATCH 03/17] add patch for msvc support also, add checking for 'winapi' feature --- ports/tinytiff/msvc-message-support.patch | 34 +++++++++++++++++++++++ ports/tinytiff/portfile.cmake | 20 +++++++++---- 2 files changed, 48 insertions(+), 6 deletions(-) create mode 100644 ports/tinytiff/msvc-message-support.patch diff --git a/ports/tinytiff/msvc-message-support.patch b/ports/tinytiff/msvc-message-support.patch new file mode 100644 index 00000000000000..2a5514eb880168 --- /dev/null +++ b/ports/tinytiff/msvc-message-support.patch @@ -0,0 +1,34 @@ +diff --git a/src/tinytiffreader.c b/src/tinytiffreader.c +index 82cafee..026083a 100644 +--- a/src/tinytiffreader.c ++++ b/src/tinytiffreader.c +@@ -56,7 +56,11 @@ + + #ifdef TINYTIFF_USE_WINAPI_FOR_FILEIO + # include +-# warning COMPILING TinyTIFFReader with WinAPI ++# ifdef _MSC_VER ++# pragma message(__FILE__ "(): COMPILING TinyTIFFWriter with WinAPI") ++# else ++# warning COMPILING TinyTIFFWriter with WinAPI ++# endif // _MSC_VER + # define TinyTIFFReader_POSTYPE DWORD + #else + # define TinyTIFFReader_POSTYPE fpos_t +diff --git a/src/tinytiffwriter.c b/src/tinytiffwriter.c +index 416e800..04b9ee4 100644 +--- a/src/tinytiffwriter.c ++++ b/src/tinytiffwriter.c +@@ -50,7 +50,11 @@ + + #ifdef TINYTIFF_USE_WINAPI_FOR_FILEIO + # include +-# warning COMPILING TinyTIFFWriter with WinAPI ++# ifdef _MSC_VER ++# pragma message(__FILE__ "(): COMPILING TinyTIFFWriter with WinAPI") ++# else ++# warning COMPILING TinyTIFFWriter with WinAPI ++# endif // _MSC_VER + # define TinyTIFFWriter_POSTYPE DWORD + #else + # define TinyTIFFWriter_POSTYPE fpos_t diff --git a/ports/tinytiff/portfile.cmake b/ports/tinytiff/portfile.cmake index c7324aeac3be73..3aae3ed8174462 100644 --- a/ports/tinytiff/portfile.cmake +++ b/ports/tinytiff/portfile.cmake @@ -1,3 +1,13 @@ +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "winapi" TinyTIFF_USE_WINAPI_FOR_FILEIO +) + +if(NOT VCPKG_TARGET_IS_WINDOWS AND TinyTIFF_USE_WINAPI_FOR_FILEIO) + message(FATAL_ERROR "Can't build ${PORT}:${TARGET_TRIPLET} with 'winapi' feature.") +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jkriege2/TinyTIFF @@ -12,18 +22,16 @@ else() set(BUILD_SHARED_LIBS ON) endif() -vcpkg_check_features( - OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - "winapi" TinyTIFF_USE_WINAPI_FOR_FILEIO -) - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DTinyTIFF_BUILD_TESTS=OFF -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} + -DTinyTIFF_USE_WINAPI_FOR_FILEIO=${TinyTIFF_USE_WINAPI_FOR_FILEIO} + PATCHES + # without this patch, the MSVC compiler will crash during the build process + "msvc-message-support.patch" ) vcpkg_cmake_install() From 2b1d90516fcb5dc6f5537a7c92288717501add04 Mon Sep 17 00:00:00 2001 From: efesxzc Date: Wed, 22 May 2024 18:34:05 +0500 Subject: [PATCH 04/17] vcpkg x-add-version --- ports/tinytiff/vcpkg.json | 1 - versions/baseline.json | 4 ++++ versions/t-/tinytiff.json | 9 +++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 versions/t-/tinytiff.json diff --git a/ports/tinytiff/vcpkg.json b/ports/tinytiff/vcpkg.json index 1bec3c73a862d5..3819e560ebd234 100644 --- a/ports/tinytiff/vcpkg.json +++ b/ports/tinytiff/vcpkg.json @@ -1,7 +1,6 @@ { "name": "tinytiff", "version": "4.0.0.0", - "port-version": 0, "description": "Lightweight TIFF reader/writer library", "homepage": "http://jkriege2.github.io/TinyTIFF/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 9a70e2da564c3c..ea30a1d6e6d064 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8744,6 +8744,10 @@ "baseline": "1.1", "port-version": 6 }, + "tinytiff": { + "baseline": "4.0.0.0", + "port-version": 0 + }, "tinytoml": { "baseline": "20180219", "port-version": 3 diff --git a/versions/t-/tinytiff.json b/versions/t-/tinytiff.json new file mode 100644 index 00000000000000..ef901a03062aca --- /dev/null +++ b/versions/t-/tinytiff.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "1736e1de6394319b39422033e019cd9293486c74", + "version": "4.0.0.0", + "port-version": 0 + } + ] +} From ade33386c183a38dc88f1ccece30809af0d9eb8f Mon Sep 17 00:00:00 2001 From: efesxzc Date: Wed, 22 May 2024 22:51:35 +0500 Subject: [PATCH 05/17] add license --- ports/tinytiff/vcpkg.json | 1 + versions/t-/tinytiff.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/tinytiff/vcpkg.json b/ports/tinytiff/vcpkg.json index 3819e560ebd234..01058cf52733a6 100644 --- a/ports/tinytiff/vcpkg.json +++ b/ports/tinytiff/vcpkg.json @@ -3,6 +3,7 @@ "version": "4.0.0.0", "description": "Lightweight TIFF reader/writer library", "homepage": "http://jkriege2.github.io/TinyTIFF/", + "license": "LGPL-3.0", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/t-/tinytiff.json b/versions/t-/tinytiff.json index ef901a03062aca..9e7a2afea5edeb 100644 --- a/versions/t-/tinytiff.json +++ b/versions/t-/tinytiff.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "1736e1de6394319b39422033e019cd9293486c74", + "git-tree": "e6ad73dfea0c0f6cd89038c1a0fc3a263c5d36d4", "version": "4.0.0.0", "port-version": 0 } From a660a88fd615afbe5bf60ee27858894aa9fd6a68 Mon Sep 17 00:00:00 2001 From: EfesX Date: Thu, 23 May 2024 00:26:28 +0500 Subject: [PATCH 06/17] Update ports/tinytiff/portfile.cmake ...handled by vcpkg_cmake_configure Co-authored-by: Kai Pastor --- ports/tinytiff/portfile.cmake | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ports/tinytiff/portfile.cmake b/ports/tinytiff/portfile.cmake index 3aae3ed8174462..7834353be486c3 100644 --- a/ports/tinytiff/portfile.cmake +++ b/ports/tinytiff/portfile.cmake @@ -16,12 +16,6 @@ vcpkg_from_github( HEAD_REF master ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(BUILD_SHARED_LIBS OFF) -else() - set(BUILD_SHARED_LIBS ON) -endif() - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS From 89e5fcf40583edec497c03dae425372d61a58f7b Mon Sep 17 00:00:00 2001 From: EfesX Date: Thu, 23 May 2024 00:45:43 +0500 Subject: [PATCH 07/17] Apply suggestions from code review Co-authored-by: Kai Pastor --- ports/tinytiff/portfile.cmake | 10 ++-------- ports/tinytiff/vcpkg.json | 3 ++- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/ports/tinytiff/portfile.cmake b/ports/tinytiff/portfile.cmake index 7834353be486c3..9faf5f62f0d8fa 100644 --- a/ports/tinytiff/portfile.cmake +++ b/ports/tinytiff/portfile.cmake @@ -1,13 +1,9 @@ vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - "winapi" TinyTIFF_USE_WINAPI_FOR_FILEIO + winapi TinyTIFF_USE_WINAPI_FOR_FILEIO ) -if(NOT VCPKG_TARGET_IS_WINDOWS AND TinyTIFF_USE_WINAPI_FOR_FILEIO) - message(FATAL_ERROR "Can't build ${PORT}:${TARGET_TRIPLET} with 'winapi' feature.") -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jkriege2/TinyTIFF @@ -21,8 +17,6 @@ vcpkg_cmake_configure( OPTIONS ${FEATURE_OPTIONS} -DTinyTIFF_BUILD_TESTS=OFF - -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} - -DTinyTIFF_USE_WINAPI_FOR_FILEIO=${TinyTIFF_USE_WINAPI_FOR_FILEIO} PATCHES # without this patch, the MSVC compiler will crash during the build process "msvc-message-support.patch" @@ -31,7 +25,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/TinyTIFF DO_NOT_DELETE_PARENT_CONFIG_PATH) -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/TinyTIFFXX) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/TinyTIFFXX PACKAGE_NAME tinytiffxx) vcpkg_copy_pdbs() diff --git a/ports/tinytiff/vcpkg.json b/ports/tinytiff/vcpkg.json index 01058cf52733a6..12899fde19db95 100644 --- a/ports/tinytiff/vcpkg.json +++ b/ports/tinytiff/vcpkg.json @@ -16,7 +16,8 @@ ], "features": { "winapi": { - "description": "Use WIN-API for File-IO" + "description": "Use WIN-API for File-IO", + "supports": "windows" } } } From b51931d04349c4f077de115dd0f6b710c1e1315b Mon Sep 17 00:00:00 2001 From: efesxzc Date: Thu, 23 May 2024 01:02:41 +0500 Subject: [PATCH 08/17] edit patch --- ...ssage-support.patch => msvc-support.patch} | 30 +++++++------------ ports/tinytiff/portfile.cmake | 2 +- 2 files changed, 11 insertions(+), 21 deletions(-) rename ports/tinytiff/{msvc-message-support.patch => msvc-support.patch} (56%) diff --git a/ports/tinytiff/msvc-message-support.patch b/ports/tinytiff/msvc-support.patch similarity index 56% rename from ports/tinytiff/msvc-message-support.patch rename to ports/tinytiff/msvc-support.patch index 2a5514eb880168..0e1c93f06ceb62 100644 --- a/ports/tinytiff/msvc-message-support.patch +++ b/ports/tinytiff/msvc-support.patch @@ -1,34 +1,24 @@ -diff --git a/src/tinytiffreader.c b/src/tinytiffreader.c -index 82cafee..026083a 100644 ---- a/src/tinytiffreader.c -+++ b/src/tinytiffreader.c -@@ -56,7 +56,11 @@ +diff --git a/src/tinytiffreader.c b/src/tinytiffreader.c +index 2cf2aa8..2bcedde 100644 +--- a/src/tinytiffreader.c ++++ b/src/tinytiffreader.c +@@ -56,7 +56,6 @@ #ifdef TINYTIFF_USE_WINAPI_FOR_FILEIO # include -# warning COMPILING TinyTIFFReader with WinAPI -+# ifdef _MSC_VER -+# pragma message(__FILE__ "(): COMPILING TinyTIFFWriter with WinAPI") -+# else -+# warning COMPILING TinyTIFFWriter with WinAPI -+# endif // _MSC_VER # define TinyTIFFReader_POSTYPE DWORD #else # define TinyTIFFReader_POSTYPE fpos_t -diff --git a/src/tinytiffwriter.c b/src/tinytiffwriter.c -index 416e800..04b9ee4 100644 ---- a/src/tinytiffwriter.c -+++ b/src/tinytiffwriter.c -@@ -50,7 +50,11 @@ +diff --git a/src/tinytiffwriter.c b/src/tinytiffwriter.c +index 1b25379..3e83823 100644 +--- a/src/tinytiffwriter.c ++++ b/src/tinytiffwriter.c +@@ -50,7 +50,6 @@ #ifdef TINYTIFF_USE_WINAPI_FOR_FILEIO # include -# warning COMPILING TinyTIFFWriter with WinAPI -+# ifdef _MSC_VER -+# pragma message(__FILE__ "(): COMPILING TinyTIFFWriter with WinAPI") -+# else -+# warning COMPILING TinyTIFFWriter with WinAPI -+# endif // _MSC_VER # define TinyTIFFWriter_POSTYPE DWORD #else # define TinyTIFFWriter_POSTYPE fpos_t diff --git a/ports/tinytiff/portfile.cmake b/ports/tinytiff/portfile.cmake index 9faf5f62f0d8fa..e2207efff4a719 100644 --- a/ports/tinytiff/portfile.cmake +++ b/ports/tinytiff/portfile.cmake @@ -19,7 +19,7 @@ vcpkg_cmake_configure( -DTinyTIFF_BUILD_TESTS=OFF PATCHES # without this patch, the MSVC compiler will crash during the build process - "msvc-message-support.patch" + "msvc-support.patch" ) vcpkg_cmake_install() From a6e029e16d0cf3db396d334244be30380842e52a Mon Sep 17 00:00:00 2001 From: efesxzc Date: Thu, 23 May 2024 01:06:11 +0500 Subject: [PATCH 09/17] update usage --- ports/tinytiff/usage | 7 +++++-- versions/t-/tinytiff.json | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ports/tinytiff/usage b/ports/tinytiff/usage index 162cf3bc5ea0d0..09fa42a7152e03 100644 --- a/ports/tinytiff/usage +++ b/ports/tinytiff/usage @@ -1,4 +1,7 @@ tinytiff provides CMake targets: - find_package(TinyTIFF REQUIRED) - target_link_libraries(main PRIVATE TinyTIFF::TinyTIFF) \ No newline at end of file + find_package(TinyTIFF CONFIG REQUIRED) + find_package(TinyTIFFXX CONFIG REQUIRED) + + target_link_libraries(main PRIVATE TinyTIFF::TinyTIFF TinyTIFF::TinyTIFFXX) + \ No newline at end of file diff --git a/versions/t-/tinytiff.json b/versions/t-/tinytiff.json index 9e7a2afea5edeb..f1fcfb1f004ff1 100644 --- a/versions/t-/tinytiff.json +++ b/versions/t-/tinytiff.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "e6ad73dfea0c0f6cd89038c1a0fc3a263c5d36d4", + "git-tree": "d4dff82c920cc17fb05d923c60dc3a70195eb036", "version": "4.0.0.0", "port-version": 0 } From c37ec1e27cdc9be584bd81144d7ec67c1302dce7 Mon Sep 17 00:00:00 2001 From: EfesX Date: Thu, 23 May 2024 16:19:46 +0500 Subject: [PATCH 10/17] Update ports/tinytiff/portfile.cmake Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> --- ports/tinytiff/portfile.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/tinytiff/portfile.cmake b/ports/tinytiff/portfile.cmake index e2207efff4a719..213d5fccc44144 100644 --- a/ports/tinytiff/portfile.cmake +++ b/ports/tinytiff/portfile.cmake @@ -18,8 +18,7 @@ vcpkg_cmake_configure( ${FEATURE_OPTIONS} -DTinyTIFF_BUILD_TESTS=OFF PATCHES - # without this patch, the MSVC compiler will crash during the build process - "msvc-support.patch" + "msvc-support.patch" # without this patch, the MSVC compiler will crash during the build process ) vcpkg_cmake_install() From ec8c3595eebe3cf4253636df7bed2aeb0f0cc06d Mon Sep 17 00:00:00 2001 From: efesxzc Date: Thu, 23 May 2024 17:48:45 +0500 Subject: [PATCH 11/17] vcpkg x-add-version --- versions/t-/tinytiff.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/t-/tinytiff.json b/versions/t-/tinytiff.json index f1fcfb1f004ff1..fc25dc136bb8a1 100644 --- a/versions/t-/tinytiff.json +++ b/versions/t-/tinytiff.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "d4dff82c920cc17fb05d923c60dc3a70195eb036", + "git-tree": "f88fe698653bfc0927c66837a909652e57021b40", "version": "4.0.0.0", "port-version": 0 } From 0fb8544f327777deb627c607390bcfe6ea38d8f4 Mon Sep 17 00:00:00 2001 From: efesxzc Date: Thu, 23 May 2024 20:44:12 +0500 Subject: [PATCH 12/17] new version of tinytiff --- ports/tinytiff/msvc-support.patch | 24 ------------------------ ports/tinytiff/portfile.cmake | 4 +--- ports/tinytiff/vcpkg.json | 2 +- 3 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 ports/tinytiff/msvc-support.patch diff --git a/ports/tinytiff/msvc-support.patch b/ports/tinytiff/msvc-support.patch deleted file mode 100644 index 0e1c93f06ceb62..00000000000000 --- a/ports/tinytiff/msvc-support.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/tinytiffreader.c b/src/tinytiffreader.c -index 2cf2aa8..2bcedde 100644 ---- a/src/tinytiffreader.c -+++ b/src/tinytiffreader.c -@@ -56,7 +56,6 @@ - - #ifdef TINYTIFF_USE_WINAPI_FOR_FILEIO - # include --# warning COMPILING TinyTIFFReader with WinAPI - # define TinyTIFFReader_POSTYPE DWORD - #else - # define TinyTIFFReader_POSTYPE fpos_t -diff --git a/src/tinytiffwriter.c b/src/tinytiffwriter.c -index 1b25379..3e83823 100644 ---- a/src/tinytiffwriter.c -+++ b/src/tinytiffwriter.c -@@ -50,7 +50,6 @@ - - #ifdef TINYTIFF_USE_WINAPI_FOR_FILEIO - # include --# warning COMPILING TinyTIFFWriter with WinAPI - # define TinyTIFFWriter_POSTYPE DWORD - #else - # define TinyTIFFWriter_POSTYPE fpos_t diff --git a/ports/tinytiff/portfile.cmake b/ports/tinytiff/portfile.cmake index 213d5fccc44144..6369309daffb88 100644 --- a/ports/tinytiff/portfile.cmake +++ b/ports/tinytiff/portfile.cmake @@ -8,7 +8,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jkriege2/TinyTIFF REF ${VERSION} - SHA512 28fb3d1ef1630a4d20da021ccca93f99df8bd29462525be312dfb028239176ca940a43407b2db10488d891a1fbca65d8a59bc6cc097765389f35021e8b423885 + SHA512 9a6a00a1278e7040bf3057f069e6d4f106a15982c78c84112edfdbe8ca9a28d849fc63636d8011696dbf4059c5d9b205743fd77ece859d08b9dd33945835be54 HEAD_REF master ) @@ -17,8 +17,6 @@ vcpkg_cmake_configure( OPTIONS ${FEATURE_OPTIONS} -DTinyTIFF_BUILD_TESTS=OFF - PATCHES - "msvc-support.patch" # without this patch, the MSVC compiler will crash during the build process ) vcpkg_cmake_install() diff --git a/ports/tinytiff/vcpkg.json b/ports/tinytiff/vcpkg.json index 12899fde19db95..11840d0f70b49b 100644 --- a/ports/tinytiff/vcpkg.json +++ b/ports/tinytiff/vcpkg.json @@ -1,6 +1,6 @@ { "name": "tinytiff", - "version": "4.0.0.0", + "version": "4.0.1.0", "description": "Lightweight TIFF reader/writer library", "homepage": "http://jkriege2.github.io/TinyTIFF/", "license": "LGPL-3.0", From 157c4affb2f07ec442a3fcfb051704e9d8b6e0df Mon Sep 17 00:00:00 2001 From: efesxzc Date: Thu, 23 May 2024 20:48:15 +0500 Subject: [PATCH 13/17] vcpkg x-add-version. --- versions/baseline.json | 2 +- versions/t-/tinytiff.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index ea30a1d6e6d064..b9ece5b4d18e70 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8745,7 +8745,7 @@ "port-version": 6 }, "tinytiff": { - "baseline": "4.0.0.0", + "baseline": "4.0.1.0", "port-version": 0 }, "tinytoml": { diff --git a/versions/t-/tinytiff.json b/versions/t-/tinytiff.json index fc25dc136bb8a1..b63b425e1418a5 100644 --- a/versions/t-/tinytiff.json +++ b/versions/t-/tinytiff.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "43a5cc041d063ffcaacb5bc8d32afe577ae760ab", + "version": "4.0.1.0", + "port-version": 0 + }, { "git-tree": "f88fe698653bfc0927c66837a909652e57021b40", "version": "4.0.0.0", From c2b5708c0fd652afbb621b21474afdd294e38391 Mon Sep 17 00:00:00 2001 From: EfesX Date: Fri, 24 May 2024 20:19:11 +0500 Subject: [PATCH 14/17] Update versions/t-/tinytiff.json Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> --- versions/t-/tinytiff.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/versions/t-/tinytiff.json b/versions/t-/tinytiff.json index b63b425e1418a5..cb315729d3dcf2 100644 --- a/versions/t-/tinytiff.json +++ b/versions/t-/tinytiff.json @@ -4,11 +4,5 @@ "git-tree": "43a5cc041d063ffcaacb5bc8d32afe577ae760ab", "version": "4.0.1.0", "port-version": 0 - }, - { - "git-tree": "f88fe698653bfc0927c66837a909652e57021b40", - "version": "4.0.0.0", - "port-version": 0 } - ] } From 1f57ede0a7bba30ec8e553efde0224cc8aab9c91 Mon Sep 17 00:00:00 2001 From: efesxzc Date: Fri, 24 May 2024 20:21:56 +0500 Subject: [PATCH 15/17] fix tinytiff.json --- versions/t-/tinytiff.json | 1 + 1 file changed, 1 insertion(+) diff --git a/versions/t-/tinytiff.json b/versions/t-/tinytiff.json index cb315729d3dcf2..376f3d9f5d9c0a 100644 --- a/versions/t-/tinytiff.json +++ b/versions/t-/tinytiff.json @@ -5,4 +5,5 @@ "version": "4.0.1.0", "port-version": 0 } + ] } From 3c14cf2a0f2b249cb2c0d8fe2470d17a03c7bd3a Mon Sep 17 00:00:00 2001 From: EfesX Date: Thu, 30 May 2024 19:52:39 +0500 Subject: [PATCH 16/17] fix the link --- ports/tinytiff/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/tinytiff/vcpkg.json b/ports/tinytiff/vcpkg.json index 11840d0f70b49b..c1abef9152f941 100644 --- a/ports/tinytiff/vcpkg.json +++ b/ports/tinytiff/vcpkg.json @@ -2,7 +2,7 @@ "name": "tinytiff", "version": "4.0.1.0", "description": "Lightweight TIFF reader/writer library", - "homepage": "http://jkriege2.github.io/TinyTIFF/", + "homepage": "https://jkriege2.github.io/TinyTIFF/", "license": "LGPL-3.0", "dependencies": [ { From de9669ea9fb3868660b36a63570edb49b2c1c859 Mon Sep 17 00:00:00 2001 From: efesxzc Date: Thu, 30 May 2024 19:55:44 +0500 Subject: [PATCH 17/17] vcpkg x-add-version --- versions/t-/tinytiff.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/t-/tinytiff.json b/versions/t-/tinytiff.json index 376f3d9f5d9c0a..244b99a3fdc855 100644 --- a/versions/t-/tinytiff.json +++ b/versions/t-/tinytiff.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "43a5cc041d063ffcaacb5bc8d32afe577ae760ab", + "git-tree": "4ec7ed1ab9c45c0b75ff706757c10061acaa0d75", "version": "4.0.1.0", "port-version": 0 }