From 2b9d40e7d95a7e7572df6bd326c5f5257d3e79b0 Mon Sep 17 00:00:00 2001 From: Don Olmstead Date: Fri, 6 Dec 2024 17:15:39 -0800 Subject: [PATCH] Remove the libwebp port Use the canonical vcpkg port at https://github.com/microsoft/vcpkg/blob/master/ports/libwebp The default-features for the port line up with the ones that were used. --- .github/workflows/build.yaml | 2 +- README.md | 1 - ...ec-for-exporting-as-a-shared-library.patch | 33 ------------ ports/libwebp/portfile.cmake | 50 ------------------- ports/libwebp/vcpkg.json | 17 ------- 5 files changed, 1 insertion(+), 102 deletions(-) delete mode 100644 ports/libwebp/patches/0001-Add-declspec-for-exporting-as-a-shared-library.patch delete mode 100644 ports/libwebp/portfile.cmake delete mode 100644 ports/libwebp/vcpkg.json diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index c5b57704..85d25b02 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -298,7 +298,7 @@ jobs: id: libwebp if: steps.vcpkg.outcome == 'success' continue-on-error: true - run: ./vcpkg.exe install libwebp --overlay-ports ./WebKitRequirements/ports --triplet ${{ matrix.triplet }} + run: ./vcpkg.exe install libwebp --triplet ${{ matrix.triplet }} - name: Read libwebp config if: steps.libwebp.outcome == 'success' || steps.libwebp.outcome == 'failure' continue-on-error: true diff --git a/README.md b/README.md index 2c5b984d..bf993831 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,6 @@ | [libxml2](http://xmlsoft.org) | 2.13.5 | 2024-11-12 | | [libxslt](http://xmlsoft.org/libxslt) | 1.1.42 | 2024-07-04 | | [libpng](http://www.libpng.org/pub/png/libpng.html) | 1.6.44 | 2024-09-12 | -| [libwebp](https://github.com/webmproject/libwebp) | 1.4.0 | 2024-04-12 | | [libjxl](https://github.com/libjxl/libjxl) | 0.11.0 | 2024-09-13 | | [sqlite](http://sqlite.org) | 3.47.0 | 2024-10-21 | | [cairo](https://gitlab.freedesktop.org/cairo/cairo) | 1.18.0 | 2023-09-23 | diff --git a/ports/libwebp/patches/0001-Add-declspec-for-exporting-as-a-shared-library.patch b/ports/libwebp/patches/0001-Add-declspec-for-exporting-as-a-shared-library.patch deleted file mode 100644 index 0c58c52d..00000000 --- a/ports/libwebp/patches/0001-Add-declspec-for-exporting-as-a-shared-library.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 94db0c93a2d3c9ea0f46de1d67b9cb6281084085 Mon Sep 17 00:00:00 2001 -From: Don -Date: Mon, 23 Apr 2018 18:49:42 -0700 -Subject: [PATCH] Add declspec for exporting as a shared library - -This adds a default declaration of __declspec to WEBP_EXTERN. ---- - src/webp/types.h | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/webp/types.h b/src/webp/types.h -index 9c17edec..24cb24f3 100644 ---- a/src/webp/types.h -+++ b/src/webp/types.h -@@ -59,10 +59,14 @@ typedef long long int int64_t; - #endif /* defined(WEBP_ENABLE_NODISCARD) && WEBP_ENABLE_NODISCARD */ - #endif /* WEBP_NODISCARD */ - -+#ifndef __has_declspec_attribute -+#define __has_declspec_attribute(x) 0 -+#endif -+ - #ifndef WEBP_EXTERN - // This explicitly marks library functions and allows for changing the - // signature for e.g., Windows DLL builds. --# if defined(_WIN32) && defined(WEBP_DLL) -+# if defined(WEBP_DLL) && (defined(WIN32) || (__has_declspec_attribute(dllexport) && __has_declspec_attribute(dllimport))) - # define WEBP_EXTERN __declspec(dllexport) - # elif defined(__GNUC__) && __GNUC__ >= 4 - # define WEBP_EXTERN extern __attribute__ ((visibility ("default"))) --- -2.44.0.windows.1 - diff --git a/ports/libwebp/portfile.cmake b/ports/libwebp/portfile.cmake deleted file mode 100644 index d8608cb6..00000000 --- a/ports/libwebp/portfile.cmake +++ /dev/null @@ -1,50 +0,0 @@ -set(VERSION 1.4.0) - -set(FILENAME "libwebp-${VERSION}.zip") -set(URLS "https://github.com/webmproject/libwebp/archive/v${VERSION}.zip") - -# Get archive -vcpkg_download_distfile(ARCHIVE - URLS ${URLS} - FILENAME ${FILENAME} - SHA512 e5fa54f456ac9dddc3be2e740298b2c18233444716835306976c3c2a1e08063b3849fdf5376f34253a49e1b7bb072a9678d646b3377ef52541260af7ea5a1a0b -) - -# Patches -set(PATCHES - ${CMAKE_CURRENT_LIST_DIR}/patches/0001-Add-declspec-for-exporting-as-a-shared-library.patch -) - -# Extract archive -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - REF ${VERSION} - PATCHES ${PATCHES} -) - -# Run CMake build -vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS - -DWEBP_BUILD_ANIM_UTILS=OFF - -DWEBP_BUILD_CWEBP=OFF - -DWEBP_BUILD_DWEBP=OFF - -DWEBP_BUILD_GIF2WEBP=OFF - -DWEBP_BUILD_IMG2WEBP=OFF - -DWEBP_BUILD_VWEBP=OFF - -DWEBP_BUILD_WEBPINFO=OFF - -DWEBP_BUILD_WEBPMUX=OFF - -DWEBP_BUILD_EXTRAS=OFF -) - -vcpkg_cmake_install() -vcpkg_copy_pdbs() -vcpkg_fixup_pkgconfig() - -# Handle copyright -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share) -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libwebp RENAME copyright) -file(WRITE ${CURRENT_PACKAGES_DIR}/share/libwebp/version ${VERSION}) diff --git a/ports/libwebp/vcpkg.json b/ports/libwebp/vcpkg.json deleted file mode 100644 index 4af80681..00000000 --- a/ports/libwebp/vcpkg.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "libwebp", - "version": "1.4.0", - "description": "Lossy compression of digital photographic images.", - "homepage": "https://github.com/webmproject/libwebp", - "license": "BSD-3-Clause", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -}