From e4abb6dbb9dcc916e37bd43d287118faf8995a96 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Fri, 18 Aug 2023 05:21:23 +0800 Subject: [PATCH] [libwebp] Fix target include files (#33212) * [libwebp] Fix target include files * version --- ports/libwebp/0011-fix-include.patch | 13 +++++++++++++ ports/libwebp/portfile.cmake | 1 + ports/libwebp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libwebp.json | 5 +++++ 5 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 ports/libwebp/0011-fix-include.patch diff --git a/ports/libwebp/0011-fix-include.patch b/ports/libwebp/0011-fix-include.patch new file mode 100644 index 0000000000..899378541d --- /dev/null +++ b/ports/libwebp/0011-fix-include.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/WebPConfig.cmake.in b/cmake/WebPConfig.cmake.in +index 74a5891..4c084d9 100644 +--- a/cmake/WebPConfig.cmake.in ++++ b/cmake/WebPConfig.cmake.in +@@ -11,7 +11,7 @@ endif() + include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") + + set_and_check(WebP_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@") +-set(WEBP_INCLUDE_DIRS ${WebP_INCLUDE_DIRS}) ++set(WEBP_INCLUDE_DIRS ${WebP_INCLUDE_DIR}) + set(WebP_LIBRARIES "") + include(SelectLibraryConfigurations) + foreach(_vcpkg_libwebp_lib IN ITEMS @INSTALLED_LIBRARIES@ sharpyuv) diff --git a/ports/libwebp/portfile.cmake b/ports/libwebp/portfile.cmake index a18000225e..2154544dd7 100644 --- a/ports/libwebp/portfile.cmake +++ b/ports/libwebp/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( 0003-simd.patch 0008-sdl.patch 0010-fix_build.patch + 0011-fix-include.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/libwebp/vcpkg.json b/ports/libwebp/vcpkg.json index d0a0ede6e7..4fb0d8dfba 100644 --- a/ports/libwebp/vcpkg.json +++ b/ports/libwebp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libwebp", "version": "1.3.1", - "port-version": 1, + "port-version": 2, "description": "WebP codec: library to encode and decode images in WebP format", "homepage": "https://github.com/webmproject/libwebp", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index e999e53032..1eb6a33a39 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4806,7 +4806,7 @@ }, "libwebp": { "baseline": "1.3.1", - "port-version": 1 + "port-version": 2 }, "libwebsockets": { "baseline": "4.3.2", diff --git a/versions/l-/libwebp.json b/versions/l-/libwebp.json index 3c0d258022..874d36e7b9 100644 --- a/versions/l-/libwebp.json +++ b/versions/l-/libwebp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ce9a702064516d77e0b1239edc29efd603ee323e", + "version": "1.3.1", + "port-version": 2 + }, { "git-tree": "42095edcaa6f9fb7a29822896d45b772f694a9cf", "version": "1.3.1",