Skip to content

Commit a373df2

Browse files
authored
Fix libde265 on arm64 macOS asm build bug (#1117)
2 parents 95a4b4d + 4e9edf6 commit a373df2

3 files changed

Lines changed: 8 additions & 7 deletions

File tree

src/SPC/ConsoleApplication.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
*/
3535
final class ConsoleApplication extends Application
3636
{
37-
public const string VERSION = '2.8.5';
37+
public const string VERSION = '2.8.6';
3838

3939
public function __construct()
4040
{

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ protected function build(): void
1313
UnixCMakeExecutor::create($this)
1414
->addConfigureArgs(
1515
'-DENABLE_SDL=OFF',
16-
'-DENABLE_DECODER=OFF'
16+
'-DENABLE_DECODER=OFF',
17+
'-DHAVE_NEON=OFF',
1718
)
1819
->build();
1920
$this->patchPkgconfPrefix(['libde265.pc']);

src/globals/test-extensions.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
// 'macos-15-intel', // bin/spc for x86_64
2727
'macos-15', // bin/spc for arm64
2828
// 'ubuntu-latest', // bin/spc-alpine-docker for x86_64
29-
'ubuntu-22.04', // bin/spc-gnu-docker for x86_64
29+
// 'ubuntu-22.04', // bin/spc-gnu-docker for x86_64
3030
// 'ubuntu-24.04', // bin/spc for x86_64
31-
'ubuntu-22.04-arm', // bin/spc-gnu-docker for arm64
31+
// 'ubuntu-22.04-arm', // bin/spc-gnu-docker for arm64
3232
// 'ubuntu-24.04-arm', // bin/spc for arm64
3333
// 'windows-2022', // .\bin\spc.ps1
3434
// 'windows-2025',
@@ -50,13 +50,13 @@
5050

5151
// If you want to test your added extensions and libs, add below (comma separated, example `bcmath,openssl`).
5252
$extensions = match (PHP_OS_FAMILY) {
53-
'Linux', 'Darwin' => 'openssl,brotli',
53+
'Linux', 'Darwin' => 'gd,imagick',
5454
'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',
5555
};
5656

5757
// If you want to test shared extensions, add them below (comma separated, example `bcmath,openssl`).
5858
$shared_extensions = match (PHP_OS_FAMILY) {
59-
'Linux' => 'zstd',
59+
'Linux' => '',
6060
'Darwin' => '',
6161
'Windows' => '',
6262
};
@@ -66,7 +66,7 @@
6666

6767
// If you want to test extra libs for extensions, add them below (comma separated, example `libwebp,libavif`). Unnecessary, when $with_suggested_libs is true.
6868
$with_libs = match (PHP_OS_FAMILY) {
69-
'Linux', 'Darwin' => 'krb5',
69+
'Linux', 'Darwin' => 'libde265',
7070
'Windows' => '',
7171
};
7272

0 commit comments

Comments
 (0)