diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 5d457418..f0a4bf4c 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -355,7 +355,7 @@ jobs: id: woff2 if: steps.brotli.outcome == 'success' continue-on-error: true - run: ./vcpkg.exe install woff2 --overlay-ports ./WebKitRequirements/ports --triplet ${{ matrix.triplet }} + run: ./vcpkg.exe install woff2 --triplet ${{ matrix.triplet }} - name: Read woff2 config if: steps.woff2.outcome == 'success' || steps.woff2.outcome == 'failure' continue-on-error: true diff --git a/README.md b/README.md index 9daa7ce2..2d49d4c4 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,6 @@ | [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 | -| [woff2](https://github.com/google/woff2) | 1.0.2 | 2017-11-13 | | [freetype](https://www.freetype.org) | 2.13.3 | 2024-08-12 | | [harfbuzz](https://github.com/harfbuzz/harfbuzz) | 10.1.0 | 2024-11-04 | | [cairo](https://gitlab.freedesktop.org/cairo/cairo) | 1.18.0 | 2023-09-23 | diff --git a/ports/woff2/portfile.cmake b/ports/woff2/portfile.cmake deleted file mode 100644 index f9eaa6f6..00000000 --- a/ports/woff2/portfile.cmake +++ /dev/null @@ -1,42 +0,0 @@ -set(VERSION 1.0.2) - -# The woff2 library does not support shared libraries -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - -set(FILENAME "woff2-${VERSION}.zip") -set(URLS "https://github.com/google/woff2/archive/v${VERSION}.zip") - -# Get archive -vcpkg_download_distfile(ARCHIVE - URLS ${URLS} - FILENAME ${FILENAME} - SHA512 4cb38d1daabe40cbede843c9338338590f1eed6843ba97f646a5abf8d64e814c5854561a8197157eeb267e252e316f67bef230afe4a2846cc734e0fdbd77de7e -) - -# 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} -) - -vcpkg_cmake_install() -vcpkg_copy_pdbs() -vcpkg_fixup_pkgconfig() - -# Copy tools -file(COPY ${CURRENT_PACKAGES_DIR}/bin/ DESTINATION ${CURRENT_PACKAGES_DIR}/tools/woff2) -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/woff2) - -# Prepare distribution -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/woff2 RENAME copyright) -file(WRITE ${CURRENT_PACKAGES_DIR}/share/woff2/version ${VERSION}) diff --git a/ports/woff2/vcpkg.json b/ports/woff2/vcpkg.json deleted file mode 100644 index b10e1ea4..00000000 --- a/ports/woff2/vcpkg.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "woff2", - "version": "1.0.2", - "description": "WOFF2 font compression reference code", - "homepage": "https://github.com/google/woff2", - "license": "MIT", - "dependencies": [ - "brotli", - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -}