diff --git a/config/lib.json b/config/lib.json index 824023687..f960ab82f 100644 --- a/config/lib.json +++ b/config/lib.json @@ -494,7 +494,7 @@ "static-libs-windows": [ "libjpeg_a.lib" ], - "lib-suggests-windows": [ + "lib-depends": [ "zlib" ] }, diff --git a/config/source.json b/config/source.json index 3f48cd784..4b3f7b594 100644 --- a/config/source.json +++ b/config/source.json @@ -641,6 +641,7 @@ "libjpeg": { "type": "ghtar", "repo": "libjpeg-turbo/libjpeg-turbo", + "prefer-stable": true, "license": { "type": "file", "path": "LICENSE.md" diff --git a/src/SPC/builder/unix/library/libjpeg.php b/src/SPC/builder/unix/library/libjpeg.php index 862c1e88d..98881b762 100644 --- a/src/SPC/builder/unix/library/libjpeg.php +++ b/src/SPC/builder/unix/library/libjpeg.php @@ -14,6 +14,7 @@ protected function build(): void ->addConfigureArgs( '-DENABLE_STATIC=ON', '-DENABLE_SHARED=OFF', + '-DWITH_SYSTEM_ZLIB=ON' ) ->build(); // patch pkgconfig diff --git a/src/globals/test-extensions.php b/src/globals/test-extensions.php index b29e028ff..ccc561052 100644 --- a/src/globals/test-extensions.php +++ b/src/globals/test-extensions.php @@ -13,7 +13,7 @@ // test php version (8.1 ~ 8.4 available, multiple for matrix) $test_php_version = [ - '8.1', + // '8.1', // '8.2', // '8.3', '8.4', @@ -24,11 +24,11 @@ // test os (macos-15-intel, macos-15, ubuntu-latest, windows-latest are available) $test_os = [ // 'macos-15-intel', // bin/spc for x86_64 - // 'macos-15', // bin/spc for arm64 - // 'ubuntu-latest', // bin/spc-alpine-docker for x86_64 - // 'ubuntu-22.04', // bin/spc-gnu-docker for x86_64 + 'macos-15', // bin/spc for arm64 + 'ubuntu-latest', // bin/spc-alpine-docker for x86_64 + 'ubuntu-22.04', // bin/spc-gnu-docker for x86_64 // 'ubuntu-24.04', // bin/spc for x86_64 - // 'ubuntu-22.04-arm', // bin/spc-gnu-docker for arm64 + 'ubuntu-22.04-arm', // bin/spc-gnu-docker for arm64 // 'ubuntu-24.04-arm', // bin/spc for arm64 // 'windows-2022', // .\bin\spc.ps1 'windows-2025', @@ -42,7 +42,7 @@ // compress with upx $upx = false; -// whether to test frankenphp build, only available for macos and linux +// whether to test frankenphp build, only available for macOS and linux $frankenphp = false; // prefer downloading pre-built packages to speed up the build process @@ -50,7 +50,7 @@ // If you want to test your added extensions and libs, add below (comma separated, example `bcmath,openssl`). $extensions = match (PHP_OS_FAMILY) { - 'Linux', 'Darwin' => 'pgsql', + 'Linux', 'Darwin' => 'zlib', 'Windows' => 'gd,zlib,mbstring,filter', }; @@ -66,7 +66,7 @@ // If you want to test extra libs for extensions, add them below (comma separated, example `libwebp,libavif`). Unnecessary, when $with_suggested_libs is true. $with_libs = match (PHP_OS_FAMILY) { - 'Linux', 'Darwin' => '', + 'Linux', 'Darwin' => 'libjpeg', 'Windows' => '', };