From 5e07d6a28304cf9b17a47b3e6ffd4442c16d3a93 Mon Sep 17 00:00:00 2001
From: Max Howell <mxcl@me.com>
Date: Sat, 23 Dec 2023 09:25:53 +0000
Subject: [PATCH] Fix jpeg-turbo; Closes #4562 (#4583)

---
 .github/actions/setup/action.yml     |  2 +-
 projects/jpeg.org/jpegxl/package.yml | 61 ++++++++++++++--------------
 2 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
index 3b08e5a0..1734e7ae 100644
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -1,4 +1,4 @@
-name: pkgx/brewkit/setup-codesign
+name: pkgx/pantry/setup-codesign
 description: Codesigns macOS binaries using Apple tools
 
 inputs:
diff --git a/projects/jpeg.org/jpegxl/package.yml b/projects/jpeg.org/jpegxl/package.yml
index cdd48088..e505ceda 100644
--- a/projects/jpeg.org/jpegxl/package.yml
+++ b/projects/jpeg.org/jpegxl/package.yml
@@ -1,6 +1,6 @@
 distributable:
-  url: https://github.com/libjxl/libjxl/archive/v{{version}}.tar.gz
-  strip-components: 1
+  url: git+https://github.com/libjxl/libjxl.git
+  ref: v{{version}}
 
 versions:
   github: libjxl/libjxl
@@ -12,48 +12,47 @@ dependencies:
   google.com/webp: ^1
   giflib.sourceforge.io: ^5
   openexr.com: ^3
+  libpng.org: ^1
 
 provides:
-  - bin/cjpeg_hdr
   - bin/cjxl
+  - bin/cjpegli
   - bin/djxl
+  - bin/djpegli
   - bin/jxlinfo
 
 build:
   dependencies:
     freedesktop.org/pkg-config: ^0.29
     cmake.org: ^3
-    gnu.org/coreutils: '*' # deps.sh needs “realpath”
+    gnu.org/coreutils: '*'  # deps.sh needs “realpath”
+    git-scm.org: ^2
   working-directory: build
-  script: |
-    GIT_DIR=$PWD ../deps.sh  # †
-    find ../third_party -not -name sjpeg -mindepth 1 -maxdepth 1 -type d | xargs rm -rf  # ‡
+  script:
+    # the `SJPEG` library is obscure and we have not yet pkg’d it.
+    # the rest we have and provide as deps.
+    # jpeg-turbo is a dep we provide, but for some reason around v0.9 the
+    # jpegxl build started requiring their vendored copy
+    - run: |
+        ./deps.sh
+        find third_party -not -name sjpeg -and -not -name libjpeg-turbo -mindepth 1 -maxdepth 1 -type d | xargs rm -rf
+      working-directory: ..
 
-    cmake .. $ARGS
-    make --jobs {{ hw.concurrency }} install
-  env:
-    # add any environment variables here
-    ARGS:
-      - -DCMAKE_BUILD_TYPE=Release
-      - -DCMAKE_INSTALL_PREFIX={{prefix}}
-      - -DBUILD_TESTING=OFF
-      - -DJPEGXL_ENABLE_SKCMS=OFF
-      - -DJPEGXL_ENABLE_BENCHMARK=OFF
-      - -DJPEGXL_VERSION={{version}}
+    - cmake ..
+        -DCMAKE_BUILD_TYPE=Release
+        -DCMAKE_INSTALL_PREFIX={{prefix}}
+        -DBUILD_TESTING=OFF
+        -DJPEGXL_ENABLE_SKCMS=OFF
+        -DJPEGXL_ENABLE_BENCHMARK=OFF
+        -DJPEGXL_VERSION={{version}}
 
-# † we set GIT_DIR because the script assumes git if it finds git rev-parse
-# works, which it does for us because we have a git checkout both locally and
-# in CI/CD
+    - make --jobs {{ hw.concurrency }} install
 
-# ‡ we don’t want anything but sjpeg which is a super rare dep only used by
-# this package
+test: |
+  cjxl fixture.jpeg out.jxl
 
-test:
-  script: |
-    cjxl fixture.jpeg out.jxl
+  cc fixture1.c -ljxl
+  ./a.out
 
-    cc fixture1.c -ljxl
-    ./a.out
-
-    cc fixture2.c -ljxl_threads
-    ./a.out
+  cc fixture2.c -ljxl_threads
+  ./a.out