From 6594f6b65374cdef7ff03253745bc8de07d56ccf Mon Sep 17 00:00:00 2001
From: DubbleClick <m@pyc.ac>
Date: Tue, 22 Jul 2025 11:23:42 +0700
Subject: [PATCH] fix remaining errors

---
 config/lib.json                         | 2 +-
 config/source.json                      | 1 +
 src/SPC/builder/Extension.php           | 5 ++---
 src/SPC/builder/unix/library/libjxl.php | 2 ++
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/config/lib.json b/config/lib.json
index 6ad734ee..28775535 100644
--- a/config/lib.json
+++ b/config/lib.json
@@ -424,7 +424,7 @@
         "source": "libjxl",
         "static-libs-unix": [
             "libjxl.a",
-            "libjxl_dec.a",
+            "libjxl_cms.a",
             "libjxl_threads.a",
             "libhwy.a"
         ],
diff --git a/config/source.json b/config/source.json
index bdcf496f..36fcace0 100644
--- a/config/source.json
+++ b/config/source.json
@@ -563,6 +563,7 @@
         "rev": "main",
         "submodules": [
             "third_party/highway",
+            "third_party/libjpeg-turbo",
             "third_party/sjpeg",
             "third_party/skcms"
         ],
diff --git a/src/SPC/builder/Extension.php b/src/SPC/builder/Extension.php
index 76fc76d6..891d1fea 100644
--- a/src/SPC/builder/Extension.php
+++ b/src/SPC/builder/Extension.php
@@ -516,8 +516,7 @@ class Extension
         $sharedLibString = '';
         $staticLibString = '';
         $staticLibs = $this->getLibFilesString();
-        $staticLibs = str_replace(BUILD_LIB_PATH . '/lib', '-l', $staticLibs);
-        $staticLibs = str_replace('.a', '', $staticLibs);
+        $staticLibs = str_replace([BUILD_LIB_PATH . '/lib', '.a'], ['-l', ''], $staticLibs);
         $staticLibs = explode('-l', $staticLibs . ' ' . $config['libs']);
         foreach ($staticLibs as $lib) {
             $lib = trim($lib);
@@ -534,7 +533,7 @@ class Extension
             }
         }
         // move static libstdc++ to shared if we are on non-full-static build target
-        if (!SPCTarget::isStatic() && in_array(SPCTarget::getLibc(), SPCTarget::LIBC_LIST)) {
+        if (SPCTarget::isStatic()) {
             $staticLibString .= ' -lstdc++';
             $sharedLibString = str_replace('-lstdc++', '', $sharedLibString);
         }
diff --git a/src/SPC/builder/unix/library/libjxl.php b/src/SPC/builder/unix/library/libjxl.php
index 19e900d9..871477b9 100644
--- a/src/SPC/builder/unix/library/libjxl.php
+++ b/src/SPC/builder/unix/library/libjxl.php
@@ -17,7 +17,9 @@ trait libjxl
             ->addConfigureArgs('-DJPEGXL_ENABLE_MANPAGES=OFF')
             ->addConfigureArgs('-DJPEGXL_ENABLE_BENCHMARK=OFF')
             ->addConfigureArgs('-DJPEGXL_ENABLE_PLUGINS=OFF')
+            ->addConfigureArgs('-DJPEGXL_ENABLE_SJPOEG=ON')
             ->addConfigureArgs('-DJPEGXL_ENABLE_JNI=OFF')
+            ->addConfigureArgs('-DJPEGXL_ENABLE_TRANSCODE_JPEG=ON')
             ->addConfigureArgs('-DJPEGXL_STATIC=' . (SPCTarget::isStatic() ? 'ON' : 'OFF'))
             ->addConfigureArgs('-DJPEGXL_FORCE_SYSTEM_BROTLI=ON')
             ->addConfigureArgs('-DBUILD_TESTING=OFF')