From 63bf368611f989607da0d143a2a36d612f80213b Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Thu, 27 Jan 2022 02:50:43 -0800 Subject: [PATCH 1/4] [libheif] Fix usage --- ports/libheif/portfile.cmake | 6 ++++++ ports/libheif/vcpkg.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ports/libheif/portfile.cmake b/ports/libheif/portfile.cmake index 212d310ecae5fc..bde4f5b17332dd 100644 --- a/ports/libheif/portfile.cmake +++ b/ports/libheif/portfile.cmake @@ -25,6 +25,12 @@ if(NOT VCPKG_BUILD_TYPE) endif() vcpkg_fixup_pkgconfig() +if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libheif/heif.h" "!defined(LIBHEIF_STATIC_BUILD)" "1") +else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libheif/heif.h" "!defined(LIBHEIF_STATIC_BUILD)" "0") +endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libheif/vcpkg.json b/ports/libheif/vcpkg.json index 1bdd57d4412d98..e7500ef4bccb4b 100644 --- a/ports/libheif/vcpkg.json +++ b/ports/libheif/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libheif", "version": "1.12.0", - "port-version": 1, + "port-version": 2, "description": "Open h.265 video codec implementation.", "homepage": "http://www.libheif.org/", "dependencies": [ From c0ef977e662bbb76d693e123487d78e481741bd0 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Thu, 27 Jan 2022 02:51:12 -0800 Subject: [PATCH 2/4] version --- versions/baseline.json | 2 +- versions/l-/libheif.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 18a1624563e25c..47755a31a25794 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3554,7 +3554,7 @@ }, "libheif": { "baseline": "1.12.0", - "port-version": 1 + "port-version": 2 }, "libhsplasma": { "baseline": "2021.06.08", diff --git a/versions/l-/libheif.json b/versions/l-/libheif.json index f899442759cc4c..98cf48afe3738f 100644 --- a/versions/l-/libheif.json +++ b/versions/l-/libheif.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e4e446a1e44ae10312f84f304438f287f468f199", + "version": "1.12.0", + "port-version": 2 + }, { "git-tree": "738b6fc8b77a7fa90cd5966358dc3be684a832c1", "version": "1.12.0", From 9852bd23715bc5d8b28fde022cfa7e312c119753 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Thu, 27 Jan 2022 08:22:28 -0800 Subject: [PATCH 3/4] Add license --- ports/libheif/vcpkg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/libheif/vcpkg.json b/ports/libheif/vcpkg.json index e7500ef4bccb4b..c827f42a0d3083 100644 --- a/ports/libheif/vcpkg.json +++ b/ports/libheif/vcpkg.json @@ -4,6 +4,7 @@ "port-version": 2, "description": "Open h.265 video codec implementation.", "homepage": "http://www.libheif.org/", + "license": "GPL-3.0-only", "dependencies": [ { "name": "gdk-pixbuf", From 02a896a9132de921db26f4f691cebe9f46a44314 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Thu, 27 Jan 2022 08:22:45 -0800 Subject: [PATCH 4/4] version --- versions/l-/libheif.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/libheif.json b/versions/l-/libheif.json index 98cf48afe3738f..0b64a5873f96f3 100644 --- a/versions/l-/libheif.json +++ b/versions/l-/libheif.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "e4e446a1e44ae10312f84f304438f287f468f199", + "git-tree": "73b2b4b29035aa22da5ccd0c4c46dbb6e5516424", "version": "1.12.0", "port-version": 2 },