diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 16802d91..c5b57704 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -226,7 +226,7 @@ jobs: id: lcms if: steps.vcpkg.outcome == 'success' continue-on-error: true - run: ./vcpkg.exe install lcms --overlay-ports ./WebKitRequirements/ports --triplet ${{ matrix.triplet }} + run: ./vcpkg.exe install lcms --triplet ${{ matrix.triplet }} - name: Read lcms config if: steps.lcms.outcome == 'success' || steps.lcms.outcome == 'failure' continue-on-error: true diff --git a/README.md b/README.md index d2c4bf82..2c5b984d 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,6 @@ | [curl](https://curl.se) | 8.11.0 | 2024-11-05 | | [libxml2](http://xmlsoft.org) | 2.13.5 | 2024-11-12 | | [libxslt](http://xmlsoft.org/libxslt) | 1.1.42 | 2024-07-04 | -| [lcms](https://www.littlecms.com/) | 2.16.0 | 2023-12-03 | | [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 | diff --git a/ports/lcms/patches/0001-Add-CMake-build.patch b/ports/lcms/patches/0001-Add-CMake-build.patch deleted file mode 100644 index aa98172c..00000000 --- a/ports/lcms/patches/0001-Add-CMake-build.patch +++ /dev/null @@ -1,115 +0,0 @@ -From ebc36b1283b5c9b5bd4b055665a020041cc7244e Mon Sep 17 00:00:00 2001 -From: Don -Date: Thu, 11 Nov 2021 14:31:22 -0800 -Subject: [PATCH] Add CMake build - ---- - CMakeLists.txt | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 96 insertions(+) - create mode 100644 CMakeLists.txt - -diff --git a/CMakeLists.txt b/CMakeLists.txt -new file mode 100644 -index 0000000..24c7457 ---- /dev/null -+++ b/CMakeLists.txt -@@ -0,0 +1,96 @@ -+cmake_minimum_required(VERSION 3.15) -+ -+project(little-cms -+ VERSION 2.16.0 -+ LANGUAGES C -+) -+ -+include(CheckSymbolExists) -+include(GNUInstallDirs) -+ -+add_library(lcms2 "") -+target_sources(lcms2 PRIVATE -+ src/cmsalpha.c -+ src/cmscam02.c -+ src/cmscgats.c -+ src/cmscnvrt.c -+ src/cmserr.c -+ src/cmsgamma.c -+ src/cmsgmt.c -+ src/cmshalf.c -+ src/cmsintrp.c -+ src/cmsio0.c -+ src/cmsio1.c -+ src/cmslut.c -+ src/cmsmd5.c -+ src/cmsmtrx.c -+ src/cmsnamed.c -+ src/cmsopt.c -+ src/cmspack.c -+ src/cmspcs.c -+ src/cmsplugin.c -+ src/cmsps2.c -+ src/cmssamp.c -+ src/cmssm.c -+ src/cmstypes.c -+ src/cmsvirt.c -+ src/cmswtpnt.c -+ src/cmsxform.c -+) -+ -+set(lcms2_headers -+ ${CMAKE_CURRENT_LIST_DIR}/include/lcms2.h -+ ${CMAKE_CURRENT_LIST_DIR}/include/lcms2_plugin.h -+) -+set_target_properties(lcms2 PROPERTIES PUBLIC_HEADER "${lcms2_headers}") -+ -+target_include_directories(lcms2 PRIVATE ${CMAKE_CURRENT_LIST_DIR}/include/) -+ -+find_library(LIBM_LIBRARY m) -+if (LIBM_LIBRARY) -+ target_link_libraries(lcms2 PRIVATE ${LIBM_LIBRARY}) -+endif () -+ -+find_package(Threads REQUIRED) -+target_compile_definitions(lcms2 PRIVATE HasTHREADS=1) -+target_link_libraries(lcms2 PRIVATE Threads::Threads) -+ -+check_symbol_exists(gmtime_r "time.h" HAVE_GMTIME_R) -+if (HAVE_GMTIME_R) -+ target_compile_definitions(lcms2 PRIVATE HAVE_GMTIME_R=1) -+endif () -+check_symbol_exists(gmtime_s "time.h" HAVE_GMTIME_S) -+if (HAVE_GMTIME_S) -+ target_compile_definitions(lcms2 PRIVATE HAVE_GMTIME_S=1) -+endif () -+ -+if (WIN32) -+ target_sources(lcms2 PRIVATE src/lcms2.def) -+ -+ if (BUILD_SHARED_LIBS) -+ target_compile_definitions(lcms2 PRIVATE CMS_DLL_BUILD) -+ target_compile_definitions(lcms2 PUBLIC CMS_DLL) -+ endif () -+endif () -+ -+install(TARGETS lcms2 -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} -+) -+ -+set(PACKAGE "lcms2") -+file(READ "${CMAKE_CURRENT_LIST_DIR}/configure" lcms2_configure) -+string(REGEX MATCH "PACKAGE_VERSION='(([0-9]+)\\.([0-9]+))'" _ ${lcms2_configure}) -+set(VERSION "${CMAKE_MATCH_1}") -+set(prefix "${CMAKE_INSTALL_PREFIX}") -+set(exec_prefix "\${prefix}") -+set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}") -+set(includedir "\${prefix}/include") -+configure_file(lcms2.pc.in "${PROJECT_BINARY_DIR}/lcms2.pc" @ONLY) -+ -+install(FILES -+ ${PROJECT_BINARY_DIR}/lcms2.pc -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig -+) --- -2.43.0.windows.1 - diff --git a/ports/lcms/portfile.cmake b/ports/lcms/portfile.cmake deleted file mode 100644 index 4d487594..00000000 --- a/ports/lcms/portfile.cmake +++ /dev/null @@ -1,38 +0,0 @@ -set(VERSION 2.16) - -set(FILENAME "lcms2-${VERSION}.tar.gz") -set(URLS "https://github.com/mm2/Little-CMS/releases/download/lcms${VERSION}/${FILENAME}") - -# Get archive -vcpkg_download_distfile(ARCHIVE - URLS ${URLS} - FILENAME ${FILENAME} - SHA512 638dd6ad6787456c8145510d18b2d0727bd0a446a13ac2934aabc9531d1156eca2a2c0fd780a453823fbd35a1895f9d8de5dc4b3cab505459dd3f0535b4e837d -) - -# Patches -set(PATCHES - ${CMAKE_CURRENT_LIST_DIR}/patches/0001-Add-CMake-build.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} -) - -vcpkg_cmake_install() -vcpkg_copy_pdbs() -vcpkg_fixup_pkgconfig() - -# Prepare distribution -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/lcms RENAME copyright) -file(WRITE ${CURRENT_PACKAGES_DIR}/share/lcms/version ${VERSION}) diff --git a/ports/lcms/vcpkg.json b/ports/lcms/vcpkg.json deleted file mode 100644 index 01b1db89..00000000 --- a/ports/lcms/vcpkg.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "lcms", - "version": "2.16.0", - "description": "A free, open source, CMM engine. It provides fast transforms between ICC profiles.", - "homepage": "https://github.com/mm2/Little-CMS", - "license": "MIT", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -}