From dd2ec4941e5369dd27875db8da8139af24754ee0 Mon Sep 17 00:00:00 2001
From: Don Olmstead <don.j.olmstead@gmail.com>
Date: Fri, 6 Dec 2024 16:15:01 -0800
Subject: [PATCH] Remove the libjxl port

Use the canonical vcpkg port at https://github.com/microsoft/vcpkg/tree/master/ports/libjxl
---
 .github/workflows/build.yaml |  2 +-
 README.md                    |  1 -
 ports/libjxl/portfile.cmake  | 58 ------------------------------------
 ports/libjxl/vcpkg.json      | 20 -------------
 4 files changed, 1 insertion(+), 80 deletions(-)
 delete mode 100644 ports/libjxl/portfile.cmake
 delete mode 100644 ports/libjxl/vcpkg.json

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 85d25b02..8c0d1d56 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -319,7 +319,7 @@ jobs:
           steps.highway.outcome == 'success' &&
           steps.lcms.outcome == 'success'
         continue-on-error: true
-        run: ./vcpkg.exe install libjxl --overlay-ports ./WebKitRequirements/ports --triplet ${{ matrix.triplet }}
+        run: ./vcpkg.exe install libjxl --triplet ${{ matrix.triplet }}
       - name: Read libjxl config
         if: steps.libjxl.outcome == 'success' || steps.libjxl.outcome == 'failure'
         continue-on-error: true
diff --git a/README.md b/README.md
index bf993831..6a84f9c2 100644
--- a/README.md
+++ b/README.md
@@ -27,6 +27,5 @@
 | [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 |
-| [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/libjxl/portfile.cmake b/ports/libjxl/portfile.cmake
deleted file mode 100644
index 4d4e6af9..00000000
--- a/ports/libjxl/portfile.cmake
+++ /dev/null
@@ -1,58 +0,0 @@
-set(VERSION 0.11.0)
-
-set(FILENAME "libjxl-${VERSION}.zip")
-set(URLS "https://github.com/libjxl/libjxl/archive/v${VERSION}.zip")
-
-# Get archive
-vcpkg_download_distfile(ARCHIVE
-    URLS ${URLS}
-    FILENAME ${FILENAME}
-    SHA512 1dace0c304213736a2f94036f8a2ce408dd19d3e7f1e825d21de0a465e5014abeaecb2192d2b2e5367a29930275b4a0a48ef0a3e29722f85d1a3390fde201699
-)
-
-# Extract archive
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
-    REF ${VERSION}
-    PATCHES ${PATCHES}
-)
-
-# Run CMake build
-set(BUILD_OPTIONS
-    -DJPEGXL_ENABLE_FUZZERS=OFF
-    -DJPEGXL_ENABLE_DEVTOOLS=OFF
-    -DJPEGXL_ENABLE_TOOLS=OFF
-    -DJPEGXL_ENABLE_MANPAGES=OFF
-    -DJPEGXL_ENABLE_BENCHMARK=OFF
-    -DJPEGXL_ENABLE_EXAMPLES=OFF
-    -DJPEGXL_ENABLE_JNI=OFF
-    -DJPEGXL_ENABLE_SJPEG=OFF
-    -DJPEGXL_ENABLE_OPENEXR=OFF
-    -DJPEGXL_ENABLE_SKCMS=OFF
-    -DJPEGXL_ENABLE_TCMALLOC=OFF
-
-    -DJPEGXL_FORCE_SYSTEM_BROTLI=ON
-    -DJPEGXL_FORCE_SYSTEM_HWY=ON
-    -DJPEGXL_FORCE_SYSTEM_LCMS2=ON
-
-    -DBUILD_TESTING=OFF
-)
-
-string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} static JPEGXL_STATIC)
-
-vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}
-    OPTIONS
-        ${BUILD_OPTIONS}
-        -DJPEGXL_STATIC=${JPEGXL_STATIC}
-)
-
-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/libjxl RENAME copyright)
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/libjxl/version ${VERSION})
diff --git a/ports/libjxl/vcpkg.json b/ports/libjxl/vcpkg.json
deleted file mode 100644
index dd96202c..00000000
--- a/ports/libjxl/vcpkg.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "name": "libjxl",
-  "version": "0.11.0",
-  "description": "libjxl is a reference implementation of JPEG XL (encoder and decoder).",
-  "homepage": "https://github.com/libjxl/libjxl",
-  "license": "BSD-3-Clause",
-  "dependencies": [
-    "brotli",
-    "highway",
-    "lcms",
-    {
-      "name": "vcpkg-cmake",
-      "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
-    }
-  ]
-}