Skip to content

Commit 0ef1ffb

Browse files
jingjingxykjingjingxyk
committed
fix merge code conflict
2 parents f1423dc + 302cd6e commit 0ef1ffb

File tree

14 files changed

+159
-40
lines changed

14 files changed

+159
-40
lines changed

‎.github/workflows/linux-aarch64.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ jobs:
128128
composer install --no-interaction --no-autoloader --no-scripts --profile --no-dev
129129
composer dump-autoload --optimize --profile --no-dev
130130
131-
php prepare.php --with-static-pie +inotify +apcu +ds +xlswriter +ssh2 +pgsql +uuid --with-php-version=${{ env.BUILD_PHP_VERSION }}
131+
php prepare.php --with-static-pie --with-libavif +inotify +apcu +ds +xlswriter +ssh2 +pgsql +uuid --with-php-version=${{ env.BUILD_PHP_VERSION }}
132132
133133
bash make-install-deps.sh
134134

‎.github/workflows/linux-x86_64.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ jobs:
181181
composer install --no-interaction --no-autoloader --no-scripts --profile --no-dev
182182
composer dump-autoload --optimize --profile --no-dev
183183
184-
php prepare.php --with-static-pie +inotify +apcu +ds +xlswriter +ssh2 +pgsql +uuid ${{ inputs.build_type }} ${{ inputs.build_options }} --with-php-version=${{ env.BUILD_PHP_VERSION }}
184+
php prepare.php --with-static-pie --with-libavif +inotify +apcu +ds +xlswriter +ssh2 +pgsql +uuid ${{ inputs.build_type }} ${{ inputs.build_options }} --with-php-version=${{ env.BUILD_PHP_VERSION }}
185185
186186
bash make-install-deps.sh
187187

‎.github/workflows/macos-aarch64.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ jobs:
118118
composer install --no-interaction --no-autoloader --no-scripts --profile
119119
composer dump-autoload --optimize --profile
120120
121-
php prepare.php --without-docker=1 --with-php-version=${{ env.BUILD_PHP_VERSION }}
121+
php prepare.php --without-docker=1 --with-libavif +apcu +ds +xlswriter +ssh2 +pgsql +uuid --with-php-version=${{ env.BUILD_PHP_VERSION }}
122122
123123
- name: Build
124124
run: |

‎.github/workflows/macos-x86_64.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ jobs:
130130
composer install --no-interaction --no-autoloader --no-scripts --profile --no-dev
131131
composer dump-autoload --optimize --profile --no-dev
132132
133-
php prepare.php --without-docker=1 --with-php-version=${{ env.BUILD_PHP_VERSION }}
133+
php prepare.php --without-docker=1 --with-libavif +apcu +ds +xlswriter +ssh2 +pgsql +uuid --with-php-version=${{ env.BUILD_PHP_VERSION }}
134134
135135
- name: Build
136136
run: |

‎.github/workflows/windows-cygwin.yml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
key: "${{ runner.os }}-build-pool-cache"
5656

5757
- name: Install Cygwin
58-
uses: cygwin/cygwin-install-action@v2
58+
uses: cygwin/cygwin-install-action@v6
5959
with:
6060
site: https://mirrors.kernel.org/sourceware/cygwin/
6161
# with:
@@ -75,7 +75,7 @@ jobs:
7575
# 备注：github action 在 windows 上执行命令默认的 shell 是 powershell，如果要使用其它shell , 需要手动指定，例如此也可以使用 bash 来安装 cygwin packages
7676
if: 1
7777
run: |
78-
Copy-Item -Path "C:\setup.exe" -Destination "${{ github.workspace }}\setup-x86_64.exe"
78+
Copy-Item -Path "d:\setup.exe" -Destination "${{ github.workspace }}\setup-x86_64.exe"
7979
cmd /c .\sapi\quickstart\windows\cygwin-build\install-cygwin.bat
8080
8181
- name: Install re2c
@@ -86,7 +86,9 @@ jobs:
8686
- name: install deps lib with source code
8787
shell: C:\cygwin\bin\bash.EXE --noprofile --norc -e -o pipefail -o igncr {0}
8888
run: |
89-
bash sapi/scripts/msys2/install-libzip.sh
89+
bash ./sapi/scripts/msys2/install-libzip.sh
90+
bash ./sapi/scripts/msys2/install-libyuv.sh
91+
bash ./sapi/scripts/msys2/install-libavif.sh
9092
9193
- name: Prepare
9294
shell: C:\cygwin\bin\bash.EXE --noprofile --norc -e -o pipefail -o igncr {0}
@@ -116,7 +118,8 @@ jobs:
116118
./bin/php.exe --ri swoole
117119
./bin/php.exe --ri zip
118120
./bin/php.exe --ri gd
119-
./bin/php.exe -r "echo PHP_VERSION;"
121+
./bin/php.exe --ri imagick
122+
./bin/php.exe -r "echo PHP_VERSION;echo PHP_EOL;"
120123
./bin/php.exe -r "echo getcwd();echo PHP_EOL;"
121124
ldd ./bin/php.exe
122125

‎.github/workflows/windows-msys2.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,8 @@ jobs:
9898
./bin/php.exe --ri openssl
9999
./bin/php.exe --ri swoole
100100
./bin/php.exe --ri zip
101+
# ./bin/php.exe --ri gd
102+
# ./bin/php.exe --ri imagick
101103
./bin/php.exe -r "echo PHP_VERSION;"
102104
./bin/php.exe -r "echo getcwd();echo PHP_EOL;"
103105
ldd ./bin/php.exe

‎sapi/quickstart/windows/cygwin-build/install-cygwin.bat‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,13 @@ if defined GITHUB_ACTIONS (
3737

3838
:: package separate with commas
3939
set "PACKAGES=make,git,curl,wget,tar,libtool,bison,gcc-g++,autoconf,automake"
40-
set "PACKAGES=%PACKAGES%,cmake,openssl,binutils"
40+
set "PACKAGES=%PACKAGES%,cmake,openssl,binutils,xz"
4141
set "PACKAGES=%PACKAGES%,libssl-devel,libcurl-devel,libxml2-devel,libxslt-devel"
4242
set "PACKAGES=%PACKAGES%,libssh2-devel,libidn2-devel"
4343
set "PACKAGES=%PACKAGES%,libgmp-devel,libsqlite3-devel,libpcre-devel,libpcre2-devel"
4444
set "PACKAGES=%PACKAGES%,libiconv-devel"
4545
set "PACKAGES=%PACKAGES%,libMagick-devel,ImageMagick,libpng-devel,libjpeg-devel,libfreetype-devel,libwebp-devel"
46+
set "PACKAGES=%PACKAGES%,libaom-devel,libsvtav1-devel,libdav1d-devel,libheif-devel"
4647
set "PACKAGES=%PACKAGES%,zlib-devel,libbz2-devel,liblz4-devel,liblzma-devel,libzip-devel"
4748
set "PACKAGES=%PACKAGES%,libzstd-devel,libbrotli-devel"
4849
set "PACKAGES=%PACKAGES%,zip,unzip,xz"
@@ -53,6 +54,8 @@ set "PACKAGES=%PACKAGES%,flex"
5354
set "PACKAGES=%PACKAGES%,cygwin-devel,libnet6-devel"
5455
set "PACKAGES=%PACKAGES%,libwrap-devel"
5556
set "PACKAGES=%PACKAGES%,libedit-devel"
57+
set "PACKAGES=%PACKAGES%,liblzma-devel"
58+
set "PACKAGES=%PACKAGES%,gettext-devel"
5659

5760

5861
set "OPTIONS=%OPTIONS% --packages %PACKAGES%"

‎sapi/scripts/cygwin/cygwin-config.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ export PATH=/usr/bin:$PATH
4545
export ICU_CXXFLAGS=" -std=gnu++17 "
4646
./buildconf --force
4747
test -f Makefile && make clean
48+
4849
./configure --prefix=/usr --disable-all \
4950
--disable-fiber-asm \
5051
--without-pcre-jit \
@@ -76,7 +77,7 @@ test -f Makefile && make clean
7677
--enable-exif \
7778
--with-sodium \
7879
--enable-xml --enable-simplexml --enable-xmlreader --enable-xmlwriter --enable-dom --with-libxml \
79-
--enable-gd --with-jpeg --with-freetype \
80+
--enable-gd --with-jpeg --with-freetype --with-avif --with-webp \
8081
--enable-swoole --enable-sockets --enable-mysqlnd --enable-swoole-curl --enable-cares \
8182
--enable-swoole-pgsql \
8283
--enable-swoole-sqlite \

‎sapi/scripts/msys2/install-libavif.sh‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
#!/usr/bin/env bash
2+
3+
set -exu
4+
__DIR__=$(
5+
cd "$(dirname "$0")"
6+
pwd
7+
)
8+
__PROJECT__=$(
9+
cd ${__DIR__}/../../../
10+
pwd
11+
)
12+
cd ${__PROJECT__}
13+
mkdir -p pool/lib/
14+
WORK_TEMP_DIR=${__PROJECT__}/var/msys2-build/
15+
mkdir -p ${WORK_TEMP_DIR}
16+
17+
VERSION=1.3.0
18+
19+
download() {
20+
# document https://github.com/AOMediaCodec/libavif/
21+
curl -fSLo ${__PROJECT__}/pool/lib/libavif-v${VERSION}.tar.gz https://github.com/AOMediaCodec/libavif/archive/refs/tags/v${VERSION}.tar.gz
22+
}
23+
24+
build() {
25+
26+
cd ${WORK_TEMP_DIR}
27+
tar xvf ${__PROJECT__}/pool/lib/libavif-v${VERSION}.tar.gz
28+
cd libavif-${VERSION}
29+
30+
mkdir -p build
31+
cd build
32+
cmake .. \
33+
-DCMAKE_INSTALL_PREFIX=/usr \
34+
-DCMAKE_BUILD_TYPE=Release \
35+
-DBUILD_TOOLS=OFF \
36+
-DBUILD_EXAMPLES=OFF \
37+
-DBUILD_DOC=OFF \
38+
-DLIBZIP_DO_INSTALL=ON \
39+
-DENABLE_GNUTLS=OFF \
40+
-DENABLE_MBEDTLS=OFF \
41+
-DENABLE_OPENSSL=ON \
42+
-DENABLE_BZIP2=ON \
43+
-DENABLE_COMMONCRYPTO=OFF \
44+
-DENABLE_LZMA=ON \
45+
-DENABLE_ZSTD=ON \
46+
-DBUILD_REGRESS=OFF \
47+
-DBUILD_OSSFUZZ=OFF \
48+
-DCMAKE_VERBOSE_MAKEFILE=ON \
49+
-DCMAKE_PREFIX_PATH="/usr/local/;/usr/"
50+
51+
52+
make -j $(nproc)
53+
make install
54+
55+
}
56+
57+
cd ${__PROJECT__}
58+
test -f ${__PROJECT__}/pool/lib/libavif-v${VERSION}.tar.gz || download
59+
60+
build

‎sapi/scripts/msys2/install-libyuv.sh‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
#!/usr/bin/env bash
2+
3+
set -exu
4+
__DIR__=$(
5+
cd "$(dirname "$0")"
6+
pwd
7+
)
8+
__PROJECT__=$(
9+
cd ${__DIR__}/../../../
10+
pwd
11+
)
12+
cd ${__PROJECT__}
13+
mkdir -p pool/lib/
14+
WORK_TEMP_DIR=${__PROJECT__}/var/msys2-build/
15+
mkdir -p ${WORK_TEMP_DIR}
16+
17+
VERSION=068c9f2f643ce59eeb3001d61374bf44a2abd825
18+
19+
download() {
20+
# document https://github.com/AOMediaCodec/libavif/
21+
curl -fSLo ${__PROJECT__}/pool/lib/libyuv-${VERSION}.tar.gz https://chromium.googlesource.com/libyuv/libyuv/+archive/${VERSION}.tar.gz
22+
}
23+
24+
build() {
25+
26+
cd ${WORK_TEMP_DIR}
27+
mkdir -p libyuv-${VERSION}
28+
tar xvf ${__PROJECT__}/pool/lib/libyuv-${VERSION}.tar.gz -C libyuv-${VERSION}
29+
cd libyuv-${VERSION}
30+
31+
mkdir -p build
32+
cd build
33+
34+
cmake -S .. -B . \
35+
-DCMAKE_INSTALL_PREFIX=/usr/ \
36+
-DCMAKE_BUILD_TYPE=Release \
37+
-DCMAKE_SIZEOF_VOID_P=8 \
38+
-DCMAKE_VERBOSE_MAKEFILE=ON
39+
40+
make -j $(nproc)
41+
make install
42+
43+
}
44+
45+
cd ${__PROJECT__}
46+
test -f ${__PROJECT__}/pool/lib/libyuv-${VERSION}.tar.gz || download
47+
48+
build

0 commit comments

Comments
 (0)