Skip to content

Commit 75b8a04

Browse files
committed
Update installer to explicitly use ffmpeg 6.1. For owncast/owncast#2071
1 parent 5a023fe commit 75b8a04

File tree

1 file changed

+17
-10
lines changed

1 file changed

+17
-10
lines changed

static/install.sh

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -123,22 +123,22 @@ main() {
123123
"x86_64")
124124
OWNCAST_ARCH="64bit"
125125
PLATFORM="macOS"
126-
FFMPEG_VERSION="4.3.1"
126+
FFMPEG_VERSION="6.1"
127127
FFMPEG_DOWNLOAD_URL="https://evermeet.cx/ffmpeg/ffmpeg-${FFMPEG_VERSION}.zip"
128-
FFMPEG_TARGET_FILE="${INSTALL_TEMP_DIRECTORY}/ffmpeg.zip"
128+
FFMPEG_TARGET_FILE="${INSTALL_TEMP_DIRECTORY}/ffmpeg.zip"
129129
;;
130130
"arm64")
131131
OWNCAST_ARCH="arm64"
132132
PLATFORM="macOS"
133-
FFMPEG_VERSION="6"
133+
FFMPEG_VERSION="61"
134134
FFMPEG_DOWNLOAD_URL="https://www.osxexperts.net/ffmpeg${FFMPEG_VERSION}arm.zip"
135-
FFMPEG_TARGET_FILE="${INSTALL_TEMP_DIRECTORY}/ffmpeg.zip"
136-
;;
135+
FFMPEG_TARGET_FILE="${INSTALL_TEMP_DIRECTORY}/ffmpeg.zip"
136+
;;
137137
*)
138138
errorAndExit "Unsupported CPU architecture $(uname -m)"
139139
;;
140140
esac
141-
;;
141+
;;
142142

143143
# ;;
144144
"Linux")
@@ -164,9 +164,9 @@ main() {
164164
;;
165165
esac
166166
PLATFORM="linux"
167-
FFMPEG_VERSION="b4.3.1"
168-
FFMPEG_DOWNLOAD_URL="https://github.com/eugeneware/ffmpeg-static/releases/download/${FFMPEG_VERSION}/${FFMPEG_ARCH}"
169-
FFMPEG_TARGET_FILE="${OWNCAST_INSTALL_DIRECTORY}/ffmpeg"
167+
FFMPEG_VERSION="6.1"
168+
FFMPEG_DOWNLOAD_URL="https://assets.owncast.tv/ffmpeg/ffmpeg-release-${FFMPEG_VERSION}-${FFMPEG_ARCH}-static.tar.xz"
169+
FFMPEG_TARGET_FILE="${OWNCAST_INSTALL_DIRECTORY}/ffmpeg.tar.xz"
170170
;;
171171
*)
172172
errorAndExit "Unsupported operating system $(uname -s)"
@@ -213,10 +213,17 @@ main() {
213213
curl -s -L "${FFMPEG_DOWNLOAD_URL}" --output "${FFMPEG_TARGET_FILE}" &
214214
spinner $!
215215
printf "${GREEN}Downloaded${NC} ffmpeg because it was not found on your system [${GREEN}${NC}]\n"
216+
217+
# Uncompress ffmpeg
216218
if [[ "$FFMPEG_TARGET_FILE" == *.zip ]]; then
217219
unzip -oq "$FFMPEG_TARGET_FILE" -d "$OWNCAST_INSTALL_DIRECTORY"
218-
rm "$FFMPEG_TARGET_FILE"
220+
elif [[ "$FFMPEG_TARGET_FILE" == *.tar.xz ]]; then
221+
mkdir -p ffmpeg-temp
222+
tar -xJf "$FFMPEG_TARGET_FILE" --strip-components=1 -C ffmpeg-temp
223+
mv ffmpeg-temp/ffmpeg "${OWNCAST_INSTALL_DIRECTORY}/ffmpeg"
224+
rm -rf ffmpeg-temp
219225
fi
226+
rm "$FFMPEG_TARGET_FILE"
220227
chmod u+x "${OWNCAST_INSTALL_DIRECTORY}/ffmpeg"
221228
fi
222229

0 commit comments

Comments
 (0)