diff --git a/ports/tinyexif/portfile.cmake b/ports/tinyexif/portfile.cmake index db8be4af32..abd740d327 100644 --- a/ports/tinyexif/portfile.cmake +++ b/ports/tinyexif/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cdcseacave/TinyEXIF REF ${VERSION} - SHA512 cb4e1f15758bb65465e2234065e3b46493200278e7c2e12fa7b4e31e7bff52a93158f07252a642829bad1a7da5e47612aca33fb833f3188595c6bc56cc950f63 - HEAD_REF 1.0.4 + SHA512 8e2c0b4f1edcec0dbf4cb6164034520cc1ba23d4681af62dd558f759cb6a184c0f53ce24a41eb21f3f164b46429692f5267c175b4b8a8b15485764927329b047 + HEAD_REF master ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" LINK_CRT_STATIC) @@ -24,4 +24,10 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") +# Upstream is MIT for its own contributions, but portions derive from easyexif +# and remain additionally subject to its BSD-2-Clause terms; both notices ship +# in the source tree and both must be installed. +vcpkg_install_copyright(FILE_LIST + "${SOURCE_PATH}/LICENSE" + "${SOURCE_PATH}/LICENSE.easyexif" +) diff --git a/ports/tinyexif/vcpkg.json b/ports/tinyexif/vcpkg.json index acb0dac5db..7f3577e271 100644 --- a/ports/tinyexif/vcpkg.json +++ b/ports/tinyexif/vcpkg.json @@ -1,9 +1,9 @@ { "name": "tinyexif", - "version": "1.0.4", + "version": "1.1.0", "description": "tiny ISO-compliant C++ EXIF and XMP parsing library for JPEG images", "homepage": "https://github.com/cdcseacave/TinyEXIF", - "license": "MIT", + "license": "MIT AND BSD-2-Clause", "dependencies": [ "tinyxml2", { diff --git a/versions/baseline.json b/versions/baseline.json index d4cc16467d..0aaf207178 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -10233,7 +10233,7 @@ "port-version": 0 }, "tinyexif": { - "baseline": "1.0.4", + "baseline": "1.1.0", "port-version": 0 }, "tinyexpr": { diff --git a/versions/t-/tinyexif.json b/versions/t-/tinyexif.json index e92849d584..b8a93fa562 100644 --- a/versions/t-/tinyexif.json +++ b/versions/t-/tinyexif.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "88ae065f01efaf8713daaa633bb6997d167e42be", + "version": "1.1.0", + "port-version": 0 + }, { "git-tree": "68ddf12f8f20a8616b8a45b76c2be99d01ce15b1", "version": "1.0.4",