Merge branch 'main' into shell-improvement

Author: crazywhalecc

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

@@ -19,7 +19,7 @@ protected function build(): void
         shell()->cd($this->source_dir)->exec('sed -i.save s@\${CMAKE_C_IMPLICIT_LINK_LIBRARIES}@@ ./CMakeLists.txt');
 
         UnixCMakeExecutor::create($this)
-            ->optionalLib('openssl', '-DCURL_USE_OPENSSL=ON -DCURL_CA_BUNDLE=OFF -DCURL_CA_PATH=OFF -DCURL_FALLBACK=ON', '-DCURL_USE_OPENSSL=OFF -DCURL_ENABLE_SSL=OFF')
+            ->optionalLib('openssl', '-DCURL_USE_OPENSSL=ON -DCURL_CA_BUNDLE=OFF -DCURL_CA_PATH=OFF -DCURL_CA_FALLBACK=ON', '-DCURL_USE_OPENSSL=OFF -DCURL_ENABLE_SSL=OFF')
             ->optionalLib('brotli', ...cmake_boolean_args('CURL_BROTLI'))
             ->optionalLib('libssh2', fn ($lib) => "-DLIBSSH2_LIBRARY=\"{$lib->getStaticLibFiles(style: 'cmake')}\" -DLIBSSH2_INCLUDE_DIR={$lib->getIncludeDir()}", '-DCURL_USE_LIBSSH2=OFF')
             ->optionalLib('nghttp2', fn ($lib) => "-DUSE_NGHTTP2=ON -DNGHTTP2_LIBRARY=\"{$lib->getStaticLibFiles(style: 'cmake')}\" -DNGHTTP2_INCLUDE_DIR={$lib->getIncludeDir()}", '-DUSE_NGHTTP2=OFF')

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

@@ -18,7 +18,7 @@ protected function build(): void
     {
         UnixCMakeExecutor::create($this)
             ->setBuildDir("{$this->source_dir}/builddir")
-            ->addConfigureArgs('-DAOM_TARGET_GPU=generic')
+            ->addConfigureArgs('-DAOM_TARGET_CPU=generic')
             ->build();
         $this->patchPkgconfPrefix(['aom.pc']);
     }

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

@@ -45,7 +45,6 @@ protected function build(): void
                 '-DEVENT__LIBRARY_TYPE=STATIC',
                 '-DEVENT__DISABLE_BENCHMARK=ON',
                 '-DEVENT__DISABLE_THREAD_SUPPORT=ON',
-                '-DEVENT__DISABLE_MBEDTLS=ON',
                 '-DEVENT__DISABLE_TESTS=ON',
                 '-DEVENT__DISABLE_SAMPLES=ON',
             )

src/SPC/util/executor/UnixCMakeExecutor.php

@@ -136,7 +136,7 @@ private function getDefaultCMakeArgs(): string
             "-DCMAKE_INSTALL_PREFIX={$this->library->getBuildRootPath()}",
             '-DCMAKE_INSTALL_BINDIR=bin',
             '-DCMAKE_INSTALL_LIBDIR=lib',
-            '-DCMAKE_INSTALL_INCLUDE_DIR=include',
+            '-DCMAKE_INSTALL_INCLUDEDIR=include',
             '-DBUILD_SHARED_LIBS=OFF',
             "-DCMAKE_TOOLCHAIN_FILE={$this->makeCmakeToolchainFile()}",
         ]);

src/globals/test-extensions.php

@@ -13,9 +13,9 @@
 
 // test php version (8.1 ~ 8.4 available, multiple for matrix)
 $test_php_version = [
-    // '8.1',
-    // '8.2',
-    // '8.3',
+    '8.1',
+    '8.2',
+    '8.3',
     '8.4',
 ];
 
@@ -45,19 +45,19 @@
 
 // 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,curl',
+    'Linux', 'Darwin' => 'curl',
     'Windows' => 'xlswriter,openssl',
 };
 
 // If you want to test shared extensions, add them below (comma separated, example `bcmath,openssl`).
 $shared_extensions = match (PHP_OS_FAMILY) {
-    'Linux' => 'xdebug',
+    'Linux' => '',
     'Windows', 'Darwin' => '',
 };
 
 // If you want to test lib-suggests feature with extension, add them below (comma separated, example `libwebp,libavif`).
 $with_libs = match (PHP_OS_FAMILY) {
-    'Linux', 'Darwin' => 'nghttp2,nghttp3,ngtcp2',
+    'Linux', 'Darwin' => 'brotli,curl,freetype,gmssl,libaom,libavif,libde265,libevent,libheif,libjpeg,librabbitmq,libssh2,libuuid,libuv,libwebp,libxml2,libyaml,libzip,mimalloc,snappy,tidy,zstd',
     'Windows' => '',
 };