Skip to content

Commit 2ebd230

Browse files
committed
use git instead of patching deps.sh
1 parent 6d60000 commit 2ebd230

File tree

2 files changed

+8
-14
lines changed

2 files changed

+8
-14
lines changed

config/source.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -558,8 +558,14 @@
558558
}
559559
},
560560
"libjxl": {
561-
"type": "ghtar",
562-
"repo": "libjxl/libjxl",
561+
"type": "git",
562+
"url": "https://github.com/libjxl/libjxl",
563+
"rev": "main",
564+
"submodules": [
565+
"third_party/highway",
566+
"third_party/sjpeg",
567+
"third_party/skcms"
568+
],
563569
"license": {
564570
"type": "file",
565571
"path": "LICENSE"

src/SPC/builder/unix/library/libjxl.php

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,6 @@
1010

1111
trait libjxl
1212
{
13-
public function patchBeforeBuild(): bool
14-
{
15-
FileSystem::replaceFileStr(
16-
$this->source_dir . '/deps.sh',
17-
['return 0', 'download_github third_party/brotli', 'download_github third_party/zlib', 'download_github third_party/libpng'],
18-
['# return 0', '# download_github third_party/brotli', '# download_github third_party/zlib', '# download_github third_party/libpng'],
19-
);
20-
shell()->cd($this->source_dir)
21-
->exec('./deps.sh');
22-
return true;
23-
}
24-
2513
protected function build(): void
2614
{
2715
UnixCMakeExecutor::create($this)

0 commit comments

Comments
 (0)