File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -30,6 +30,9 @@ CANDIDATES=(
3030 " build/product/macos/ffmpeg8-bin-${HOST_ARCH} /bin/ffmpeg"
3131 " build/product/macos/ffmpeg8-bin-arm64/bin/ffmpeg"
3232 " build/product/macos/ffmpeg8-bin-x86_64/bin/ffmpeg"
33+ " product/macos/universal/bin/ffmpeg-macos-${HOST_ARCH} "
34+ " product/macos/universal/bin/ffmpeg-macos-arm64"
35+ " product/macos/universal/bin/ffmpeg-macos-x86_64"
3336)
3437
3538for path in " ${CANDIDATES[@]} " ; do
Original file line number Diff line number Diff line change @@ -79,11 +79,25 @@ function compile_macos_platform
7979 ./main.sh compile -p macos -c build -l ${LIB_NAME} $extra_args >> " $log_file " 2>&1
8080 fi
8181
82+ # Copy the architecture-specific binaries to universal/bin before zipping if they were compiled
83+ if [[ " $REPO_DIR " == " ffmpeg8" ]]; then
84+ mkdir -p build/product/macos/universal/bin
85+ for arch in arm64 x86_64; do
86+ for bin in ffmpeg ffplay ffprobe; do
87+ local bin_file=" build/product/macos/${LIB_NAME} -${arch} /bin/$bin "
88+ if [ -f " $bin_file " ]; then
89+ cp " $bin_file " " build/product/macos/universal/bin/$bin -macos-${arch} "
90+ echo " Copied $bin_file to build/product/macos/universal/bin/$bin -macos-${arch} "
91+ fi
92+ done
93+ done
94+ fi
95+
8296 cd build/product/macos/universal
8397 zip -ryq $DIST_DIR /${LIB_NAME} -macos-universal-${RELEASE_VERSION} .zip ./*
8498 cd $ROOT_DIR
8599
86- # Copy the architecture-specific binaries if they were compiled
100+ # Copy the architecture-specific binaries to release assets if they were compiled
87101 if [[ " $REPO_DIR " == " ffmpeg8" ]]; then
88102 for arch in arm64 x86_64; do
89103 for bin in ffmpeg ffplay ffprobe; do
You can’t perform that action at this time.
0 commit comments