brilliant to test php 8.1

Co-authored-by: Hendrik Mennen <hmennen@gambio.ec1.de>

config/lib.json

@@ -143,9 +143,7 @@
             "zlib"
         ],
         "lib-suggests": [
-            "libpng",
+            "libpng"
-            "bzip2",
-            "brotli"
         ]
     },
     "gettext": {
@@ -355,6 +353,9 @@
         "static-libs-unix": [
             "libaom.a"
         ],
+        "static-libs-windows": [
+            "aom.lib"
+        ],
         "cpp-library": true
     },
     "libargon2": {
@@ -493,7 +494,7 @@
         "static-libs-windows": [
             "libjpeg_a.lib"
         ],
-        "lib-suggests-windows": [
+        "lib-depends": [
             "zlib"
         ]
     },

config/source.json

@@ -641,6 +641,7 @@
     "libjpeg": {
         "type": "ghtar",
         "repo": "libjpeg-turbo/libjpeg-turbo",
+        "prefer-stable": true,
         "license": {
             "type": "file",
             "path": "LICENSE.md"
@@ -1054,7 +1055,7 @@
     },
     "protobuf": {
         "type": "url",
-        "url": "https://pecl.php.net/get/protobuf",
+        "url": "https://pecl.php.net/get/protobuf-5.34.1.tgz",
         "path": "php-src/ext/protobuf",
         "filename": "protobuf.tgz",
         "license": {

src/SPC/ConsoleApplication.php

@@ -34,7 +34,7 @@ use Symfony\Component\Console\Application;
  */
 final class ConsoleApplication extends Application
 {
-    public const string VERSION = '2.8.3';
+    public const string VERSION = '2.8.4';
 
     public function __construct()
     {

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

@@ -13,8 +13,8 @@ trait freetype
     {
         $cmake = UnixCMakeExecutor::create($this)
             ->optionalLib('libpng', ...cmake_boolean_args('FT_DISABLE_PNG', true))
-            ->optionalLib('bzip2', ...cmake_boolean_args('FT_DISABLE_BZIP2', true))
+            ->addConfigureArgs('-DFT_DISABLE_BZIP2=ON')
-            ->optionalLib('brotli', ...cmake_boolean_args('FT_DISABLE_BROTLI', true))
+            ->addConfigureArgs('-DFT_DISABLE_BROTLI=ON')
             ->addConfigureArgs('-DFT_DISABLE_HARFBUZZ=ON');
 
         // fix cmake 4.0 compatibility

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

@@ -14,6 +14,7 @@ trait libjpeg
             ->addConfigureArgs(
                 '-DENABLE_STATIC=ON',
                 '-DENABLE_SHARED=OFF',
+                '-DWITH_SYSTEM_ZLIB=ON'
             )
             ->build();
         // patch pkgconfig

src/SPC/builder/windows/library/brotli.php

@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\windows\library;
+
+use SPC\store\FileSystem;
+
+class brotli extends WindowsLibraryBase
+{
+    public const NAME = 'brotli';
+
+    protected function build(): void
+    {
+        // reset cmake
+        FileSystem::resetDir($this->source_dir . '\build');
+
+        // start build
+        cmd()->cd($this->source_dir)
+            ->execWithWrapper(
+                $this->builder->makeSimpleWrapper('cmake'),
+                '-B build ' .
+                '-A x64 ' .
+                "-DCMAKE_TOOLCHAIN_FILE={$this->builder->cmake_toolchain_file} " .
+                '-DCMAKE_BUILD_TYPE=Release ' .
+                '-DBUILD_SHARED_LIBS=OFF ' .
+                '-DBROTLI_BUILD_TOOLS=OFF ' .
+                '-DBROTLI_BUNDLED_MODE=OFF ' .
+                '-DCMAKE_INSTALL_PREFIX=' . BUILD_ROOT_PATH . ' '
+            )
+            ->execWithWrapper(
+                $this->builder->makeSimpleWrapper('cmake'),
+                "--build build --config Release --target install -j{$this->builder->concurrency}"
+            );
+    }
+}

src/SPC/builder/windows/library/freetype.php

@@ -24,6 +24,8 @@ class freetype extends WindowsLibraryBase
                 "-DCMAKE_TOOLCHAIN_FILE={$this->builder->cmake_toolchain_file} " .
                 '-DCMAKE_BUILD_TYPE=Release ' .
                 '-DBUILD_SHARED_LIBS=OFF ' .
+                '-DFT_DISABLE_BROTLI=TRUE ' .
+                '-DFT_DISABLE_BZIP2=TRUE ' .
                 '-DCMAKE_INSTALL_PREFIX=' . BUILD_ROOT_PATH . ' '
             )
             ->execWithWrapper(

src/SPC/builder/windows/library/libaom.php

@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\windows\library;
+
+use SPC\store\FileSystem;
+
+class libaom extends WindowsLibraryBase
+{
+    public const NAME = 'libaom';
+
+    protected function build(): void
+    {
+        // libaom source tree contains a build/cmake/ directory with its own
+        // cmake modules, so we must use a different name for the build dir.
+        FileSystem::resetDir($this->source_dir . '\builddir');
+
+        // start build
+        cmd()->cd($this->source_dir)
+            ->execWithWrapper(
+                $this->builder->makeSimpleWrapper('cmake'),
+                '-S . -B builddir ' .
+                '-A x64 ' .
+                "-DCMAKE_TOOLCHAIN_FILE={$this->builder->cmake_toolchain_file} " .
+                '-DCMAKE_BUILD_TYPE=Release ' .
+                '-DBUILD_SHARED_LIBS=OFF ' .
+                '-DAOM_TARGET_CPU=generic ' .
+                '-DENABLE_DOCS=OFF ' .
+                '-DENABLE_EXAMPLES=OFF ' .
+                '-DENABLE_TESTDATA=OFF ' .
+                '-DENABLE_TESTS=OFF ' .
+                '-DENABLE_TOOLS=OFF ' .
+                '-DCMAKE_INSTALL_PREFIX=' . BUILD_ROOT_PATH . ' '
+            )
+            ->execWithWrapper(
+                $this->builder->makeSimpleWrapper('cmake'),
+                "--build builddir --config Release --target install -j{$this->builder->concurrency}"
+            );
+    }
+}

src/SPC/builder/windows/library/zlib.php

@@ -35,6 +35,7 @@ class zlib extends WindowsLibraryBase
             'zlibstatic.lib',
             'zs.lib',
             'libzs.lib',
+            'libz.lib',
         ];
         foreach ($detect_list as $item) {
             if (file_exists(BUILD_LIB_PATH . '\\' . $item)) {

src/globals/test-extensions.php

@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 // 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_php_version = [
 // 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
+    'macos-15', // bin/spc for arm64
-    // 'ubuntu-latest', // bin/spc-alpine-docker for x86_64
+    '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',
@@ -42,7 +42,7 @@ $no_strip = false;
 // 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 @@ $prefer_pre_built = false;
 
 // 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 @@ $with_suggested_libs = true;
 
 // 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' => '',
 };