Skip to content

Commit 980db8f

Browse files
committed
update dependencies
1 parent b49db34 commit 980db8f

File tree

3 files changed

+51
-6
lines changed

3 files changed

+51
-6
lines changed

.github/workflows/all.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,9 @@ jobs:
108108
echo '------compile smb2------------------------------------'
109109
rm -rf build || git reset --hard || git pull origin
110110
.github/workflows/onestep.sh smb2 ${{ inputs.platform }} ${{ inputs.dryrun }}
111-
echo '------compile ffmpeg------------------------------------'
111+
echo '------compile ffmpeg7------------------------------------'
112112
rm -rf build || git reset --hard || git pull origin
113-
.github/workflows/install-dependencies.sh ffmpeg ${{ inputs.platform }}
114-
.github/workflows/onestep.sh ffmpeg ${{ inputs.platform }} ${{ inputs.dryrun }}
113+
.github/workflows/install-dependencies.sh ffmpeg7 ${{ inputs.platform }}
114+
.github/workflows/onestep.sh ffmpeg7 ${{ inputs.platform }} ${{ inputs.dryrun }}
115115
env:
116116
ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}

.github/workflows/apple-android-common.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,12 @@ on:
3838
description: 'choose a lib for compile'
3939
required: true
4040
type: choice
41-
default: 'ffmpeg'
41+
default: 'ffmpeg7'
4242
options:
43-
- ffmpeg
43+
- ffmpeg7
44+
- ffmpeg6
45+
- ffmpeg5
46+
- ffmpeg4
4447
- ijkffmpeg
4548
- fftutorial
4649
- ass

.github/workflows/install-dependencies.sh

Lines changed: 43 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ case $LIB_NAME in
3535
./main.sh install -l 'xml2' -p $PLAT
3636
fi
3737
;;
38-
ffmpeg)
38+
ffmpeg7)
3939
if [[ $PLAT == all ]];then
4040
./main.sh install -l 'openssl3 opus dav1d dvdnav uavs3d smb2 bluray' -p ios
4141
./main.sh install -l 'openssl3 opus dav1d dvdnav uavs3d smb2 bluray' -p tvos
@@ -49,6 +49,48 @@ case $LIB_NAME in
4949
./main.sh install -l 'openssl3 opus dav1d dvdnav uavs3d smb2 bluray' -p $PLAT
5050
fi
5151
;;
52+
ffmpeg6)
53+
if [[ $PLAT == all ]];then
54+
./main.sh install -l 'openssl3 opus dav1d dvdread uavs3d smb2 bluray' -p ios
55+
./main.sh install -l 'openssl3 opus dav1d dvdread uavs3d smb2 bluray' -p tvos
56+
./main.sh install -l 'openssl3 opus dav1d dvdread uavs3d smb2 bluray' -p macos
57+
./main.sh install -l 'openssl3 opus dav1d dvdread uavs3d smb2 bluray' -p android
58+
elif [[ $PLAT == apple ]];then
59+
./main.sh install -l 'openssl3 opus dav1d dvdread uavs3d smb2 bluray' -p ios
60+
./main.sh install -l 'openssl3 opus dav1d dvdread uavs3d smb2 bluray' -p tvos
61+
./main.sh install -l 'openssl3 opus dav1d dvdread uavs3d smb2 bluray' -p macos
62+
else
63+
./main.sh install -l 'openssl3 opus dav1d dvdread uavs3d smb2 bluray' -p $PLAT
64+
fi
65+
;;
66+
ffmpeg5)
67+
if [[ $PLAT == all ]];then
68+
./main.sh install -l 'openssl3 opus dav1d dvdread uavs3d bluray' -p ios
69+
./main.sh install -l 'openssl3 opus dav1d dvdread uavs3d bluray' -p tvos
70+
./main.sh install -l 'openssl3 opus dav1d dvdread uavs3d bluray' -p macos
71+
./main.sh install -l 'openssl3 opus dav1d dvdread uavs3d bluray' -p android
72+
elif [[ $PLAT == apple ]];then
73+
./main.sh install -l 'openssl3 opus dav1d dvdread uavs3d bluray' -p ios
74+
./main.sh install -l 'openssl3 opus dav1d dvdread uavs3d bluray' -p tvos
75+
./main.sh install -l 'openssl3 opus dav1d dvdread uavs3d bluray' -p macos
76+
else
77+
./main.sh install -l 'openssl3 opus dav1d dvdread uavs3d bluray' -p $PLAT
78+
fi
79+
;;
80+
ffmpeg4)
81+
if [[ $PLAT == all ]];then
82+
./main.sh install -l 'openssl3 opus bluray' -p ios
83+
./main.sh install -l 'openssl3 opus bluray' -p tvos
84+
./main.sh install -l 'openssl3 opus bluray' -p macos
85+
./main.sh install -l 'openssl3 opus bluray' -p android
86+
elif [[ $PLAT == apple ]];then
87+
./main.sh install -l 'openssl3 opus bluray' -p ios
88+
./main.sh install -l 'openssl3 opus bluray' -p tvos
89+
./main.sh install -l 'openssl3 opus bluray' -p macos
90+
else
91+
./main.sh install -l 'openssl3 opus bluray' -p $PLAT
92+
fi
93+
;;
5294
ijkffmpeg)
5395
if [[ $PLAT == all ]];then
5496
./main.sh install -l 'openssl' -p ios

0 commit comments

Comments
 (0)