From a3ee7fcdbe1b847371a5ba8d3632d24f34e33949 Mon Sep 17 00:00:00 2001 From: WangWeiLin-MV <156736127+WangWeiLin-MV@users.noreply.github.com> Date: Thu, 14 Nov 2024 16:33:14 +0800 Subject: [PATCH] [libavif] Fix target config include dirs for static build --- ports/libavif/portfile.cmake | 12 +++++++++++- ports/libavif/usage | 4 ++++ ports/libavif/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libavif.json | 5 +++++ 5 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 ports/libavif/usage diff --git a/ports/libavif/portfile.cmake b/ports/libavif/portfile.cmake index 1cfdc16ba25494..f3e928143d73cf 100644 --- a/ports/libavif/portfile.cmake +++ b/ports/libavif/portfile.cmake @@ -1,11 +1,18 @@ +vcpkg_download_distfile(PATCH_MERGE_STATIC_LIBS_INCLUDE + URLS https://github.com/AOMediaCodec/libavif/commit/6fac47f047ac7c62d19f25cef5de34e793fbd8ad.patch?full_index=1 + SHA512 9c37f72de31a79e0f7a9a80c32eaca1e538570455f7f5df5441d22a44d8a3761f2a454e9a54e6624439885f3a57939b3414187468e28d20b3b5bfb680c72dfbc + FILENAME AOMediaCodec-libavif-v1.1.1-6fac47f047ac7c62d19f25cef5de34e793fbd8ad.patch +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AOMediaCodec/libavif REF "v${VERSION}" SHA512 ba72b8d02b098f361643a073361fccafd22eaac14e46dd06378d5e7acd9853538c5d166473e1de0b020de62dac25be83e42bd57ba51f675d11e2ddf155fbfa21 - HEAD_REF master + HEAD_REF main PATCHES disable-source-utf8.patch + "${PATCH_MERGE_STATIC_LIBS_INCLUDE}" ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -19,6 +26,7 @@ vcpkg_cmake_configure( OPTIONS -DAVIF_BUILD_APPS=OFF -DAVIF_BUILD_TESTS=OFF + -DAVIF_BUILD_EXAMPLES=OFF -DCMAKE_DISABLE_FIND_PACKAGE_libsharpyuv=ON ${FEATURE_OPTIONS} ) @@ -33,6 +41,8 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) # Fix pkg-config files vcpkg_fixup_pkgconfig() +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY) + # Remove duplicate files file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/libavif/usage b/ports/libavif/usage new file mode 100644 index 00000000000000..959e5dc3ee8f3e --- /dev/null +++ b/ports/libavif/usage @@ -0,0 +1,4 @@ +libavif provides pkg-config modules: + + # Library for encoding and decoding .avif files + libavif diff --git a/ports/libavif/vcpkg.json b/ports/libavif/vcpkg.json index 78312d7ac24130..e2212eeef1a049 100644 --- a/ports/libavif/vcpkg.json +++ b/ports/libavif/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libavif", "version-semver": "1.1.1", + "port-version": 1, "description": "Library for encoding and decoding AVIF files", "homepage": "https://github.com/AOMediaCodec/libavif", "license": "BSD-2-Clause AND Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 95ea51913c7010..6c248d7cfdb5b5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4330,7 +4330,7 @@ }, "libavif": { "baseline": "1.1.1", - "port-version": 0 + "port-version": 1 }, "libb2": { "baseline": "0.98.1", diff --git a/versions/l-/libavif.json b/versions/l-/libavif.json index 975aa578ab7baf..7d6f11a9f76191 100644 --- a/versions/l-/libavif.json +++ b/versions/l-/libavif.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fe5e59857f9d6d0b5dd0e3d465ff4a1360cb50d1", + "version-semver": "1.1.1", + "port-version": 1 + }, { "git-tree": "ad9d36286110339f45b585a1bbb330273c04edad", "version-semver": "1.1.1",