From 2ebd230a08959f85fbd67dae4ee005a61720d815 Mon Sep 17 00:00:00 2001 From: DubbleClick Date: Tue, 22 Jul 2025 10:36:40 +0700 Subject: [PATCH] use git instead of patching deps.sh --- config/source.json | 10 ++++++++-- src/SPC/builder/unix/library/libjxl.php | 12 ------------ 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/config/source.json b/config/source.json index 4698ae83..bdcf496f 100644 --- a/config/source.json +++ b/config/source.json @@ -558,8 +558,14 @@ } }, "libjxl": { - "type": "ghtar", - "repo": "libjxl/libjxl", + "type": "git", + "url": "https://github.com/libjxl/libjxl", + "rev": "main", + "submodules": [ + "third_party/highway", + "third_party/sjpeg", + "third_party/skcms" + ], "license": { "type": "file", "path": "LICENSE" diff --git a/src/SPC/builder/unix/library/libjxl.php b/src/SPC/builder/unix/library/libjxl.php index 0ff773a6..e4be8e20 100644 --- a/src/SPC/builder/unix/library/libjxl.php +++ b/src/SPC/builder/unix/library/libjxl.php @@ -10,18 +10,6 @@ use SPC\util\SPCTarget; trait libjxl { - public function patchBeforeBuild(): bool - { - FileSystem::replaceFileStr( - $this->source_dir . '/deps.sh', - ['return 0', 'download_github third_party/brotli', 'download_github third_party/zlib', 'download_github third_party/libpng'], - ['# return 0', '# download_github third_party/brotli', '# download_github third_party/zlib', '# download_github third_party/libpng'], - ); - shell()->cd($this->source_dir) - ->exec('./deps.sh'); - return true; - } - protected function build(): void { UnixCMakeExecutor::create($this)