From 3986751fc8950afc06a9800faa935956a780a2c1 Mon Sep 17 00:00:00 2001 From: Oskari Timperi Date: Tue, 30 Jun 2020 12:05:00 +0300 Subject: [PATCH 1/3] [libexif] Update to 0.6.22 From the release page on github: > It largely contains stability, security and bugfixes. > > Some EXIF 2.3 tags have been added. > > It is ABI compatible to 0.6.21 release. --- ports/libexif/CONTROL | 4 ++-- ports/libexif/portfile.cmake | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/libexif/CONTROL b/ports/libexif/CONTROL index f3e4e41058107c..7bf6d64b6de8ed 100644 --- a/ports/libexif/CONTROL +++ b/ports/libexif/CONTROL @@ -1,5 +1,5 @@ Source: libexif -Version: 0.6.21-2 +Version: 0.6.22 Homepage: https://libexif.github.io/ Description: a library for parsing, editing, and saving EXIF data -Supports: !uwp \ No newline at end of file +Supports: !uwp diff --git a/ports/libexif/portfile.cmake b/ports/libexif/portfile.cmake index 11f7080d1e88f9..bdb1bef1405fbf 100644 --- a/ports/libexif/portfile.cmake +++ b/ports/libexif/portfile.cmake @@ -7,8 +7,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libexif/libexif - REF libexif-0_6_21-release - SHA512 aecba54eb9c8b4ce29d11985a547074b381d72027b563c7aef865852b661a6f18a258c748fca6b16198344f4a86568b658071ac95cc1d332f576c6160e1f257d + REF libexif-0_6_22-release + SHA512 6c63abe2734c9e83fb04adb00bdd77f687165007c0efd0279df26c101363b990604050c430c7dd73dfa8735dd2fd196334d321bdb114d4869998f21e7bed5b43 HEAD_REF master PATCHES add-missing-_stdint-h.patch ) From d1d58afa540a82d2288060d7b00fd762d37593c1 Mon Sep 17 00:00:00 2001 From: Oskari Timperi Date: Tue, 30 Jun 2020 13:32:15 +0300 Subject: [PATCH 2/3] [libexif] Fixes to portfile.cmake - don't include vcpkg_commong_functions - use the PORT variable when installing copyright file --- ports/libexif/portfile.cmake | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ports/libexif/portfile.cmake b/ports/libexif/portfile.cmake index bdb1bef1405fbf..aee845c79a66fc 100644 --- a/ports/libexif/portfile.cmake +++ b/ports/libexif/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") message(FATAL_ERROR "libexif currently only supports being built for desktop") endif() @@ -27,4 +25,4 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libexif RENAME copyright) +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) From b411378f2cdade10b1997eaf3de458940919f918 Mon Sep 17 00:00:00 2001 From: Oskari Timperi Date: Wed, 1 Jul 2020 08:42:16 +0300 Subject: [PATCH 3/3] [libexif] Use vcpkg_fail_port_install --- ports/libexif/portfile.cmake | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ports/libexif/portfile.cmake b/ports/libexif/portfile.cmake index aee845c79a66fc..4869c40b5099fc 100644 --- a/ports/libexif/portfile.cmake +++ b/ports/libexif/portfile.cmake @@ -1,6 +1,4 @@ -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - message(FATAL_ERROR "libexif currently only supports being built for desktop") -endif() +vcpkg_fail_port_install(ON_TARGET uwp) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH