From 14fc3f8d87e1044d62d0c80006f24ebf602c0bbc Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Mon, 20 Apr 2026 23:55:00 +0800 Subject: [PATCH 1/2] Fix libde265 on arm64 macOS asm build bug --- src/SPC/ConsoleApplication.php | 2 +- src/SPC/builder/unix/library/libde265.php | 3 ++- src/globals/test-extensions.php | 10 +++++----- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/SPC/ConsoleApplication.php b/src/SPC/ConsoleApplication.php index 9685a1d88..b2cf9671f 100644 --- a/src/SPC/ConsoleApplication.php +++ b/src/SPC/ConsoleApplication.php @@ -34,7 +34,7 @@ */ final class ConsoleApplication extends Application { - public const string VERSION = '2.8.5'; + public const string VERSION = '2.8.6'; public function __construct() { diff --git a/src/SPC/builder/unix/library/libde265.php b/src/SPC/builder/unix/library/libde265.php index 184a44261..de814ca8b 100644 --- a/src/SPC/builder/unix/library/libde265.php +++ b/src/SPC/builder/unix/library/libde265.php @@ -13,7 +13,8 @@ protected function build(): void UnixCMakeExecutor::create($this) ->addConfigureArgs( '-DENABLE_SDL=OFF', - '-DENABLE_DECODER=OFF' + '-DENABLE_DECODER=OFF', + '-DHAVE_ARM=OFF', ) ->build(); $this->patchPkgconfPrefix(['libde265.pc']); diff --git a/src/globals/test-extensions.php b/src/globals/test-extensions.php index 0e2b664fe..3d183ae85 100644 --- a/src/globals/test-extensions.php +++ b/src/globals/test-extensions.php @@ -26,9 +26,9 @@ // '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 + // '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', @@ -50,13 +50,13 @@ // If you want to test your added extensions and libs, add below (comma separated, example `bcmath,openssl`). $extensions = match (PHP_OS_FAMILY) { - 'Linux', 'Darwin' => 'openssl,brotli', + 'Linux', 'Darwin' => 'gd,imagick', 'Windows' => 'bcmath,brotli,bz2,ctype,curl,dom,exif,fileinfo,filter,ftp,gd,iconv,intl,mbregex,mbstring,mysqli,mysqlnd,opcache,openssl,pdo,pdo_mysql,pdo_pgsql,pgsql,session,simdjson,simplexml,sodium,sqlite3,tokenizer,xml,xmlreader,xmlwriter,zip,zlib', }; // If you want to test shared extensions, add them below (comma separated, example `bcmath,openssl`). $shared_extensions = match (PHP_OS_FAMILY) { - 'Linux' => 'zstd', + 'Linux' => '', 'Darwin' => '', 'Windows' => '', }; @@ -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' => 'krb5', + 'Linux', 'Darwin' => 'libde265', 'Windows' => '', }; From 4e9edf6c9d7b77f19b8a8ec9dc3a889b55b30f48 Mon Sep 17 00:00:00 2001 From: Jerry Ma Date: Tue, 21 Apr 2026 00:21:52 +0800 Subject: [PATCH 2/2] Update src/SPC/builder/unix/library/libde265.php --- src/SPC/builder/unix/library/libde265.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SPC/builder/unix/library/libde265.php b/src/SPC/builder/unix/library/libde265.php index de814ca8b..116f67aa6 100644 --- a/src/SPC/builder/unix/library/libde265.php +++ b/src/SPC/builder/unix/library/libde265.php @@ -14,7 +14,7 @@ protected function build(): void ->addConfigureArgs( '-DENABLE_SDL=OFF', '-DENABLE_DECODER=OFF', - '-DHAVE_ARM=OFF', + '-DHAVE_NEON=OFF', ) ->build(); $this->patchPkgconfPrefix(['libde265.pc']);