Mirrors/photoprism
1
0
Fork 0
mirror of https://github.com/photoprism/photoprism.git synced 2026-01-23 02:24:24 +00:00
Code Issues Projects Releases Wiki Activity

Videos: Make installation of FFmpeg 7 optional #1474 #4181

Browse source 
Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
Michael Mayer 2024-05-30 07:46:49 +02:00
parent d1a55eb478
commit a4c76ce35f
11 changed files with 28 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
scripts/dist/Makefile vendored
View file

@ -14,6 +14,9 @@ clean:
https: install-https
install-https:
@/scripts/install-https.sh
ffmpeg: install-ffmpeg
install-ffmpeg:
@/scripts/install-ffmpeg.sh
mariadb: mariadb-client
mariadb-client: install-mariadb-client
install-mariadb-client:

14
scripts/dist/install-ffmpeg.sh vendored
View file

@ -1,6 +1,6 @@
#!/usr/bin/env bash
# This installs ffmpeg on Linux.
# This installs FFmpeg on Ubuntu Linux.
# bash <(curl -s https://raw.githubusercontent.com/photoprism/photoprism/develop/scripts/dist/install-ffmpeg.sh)
PATH="/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin:/scripts:$PATH"
@ -24,21 +24,29 @@ set -e
. /etc/os-release
echo "Installing ffmpeg for ${DESTARCH^^}..."
case $DESTARCH in
amd64 | AMD64 | x86_64 | x86-64 | arm64 | ARM64 | aarch64)
if [[ $VERSION_CODENAME == "noble" ]]; then
# Install FFmpeg 7 from a PPA on Ubuntu 24.04 LTS.
echo "Installing FFmpeg 7 for ${DESTARCH^^} from ppa:ubuntuhandbook1/ffmpeg7..."
apt-get update
apt-get -qq install software-properties-common pkg-config apt-utils
add-apt-repository -y ppa:ubuntuhandbook1/ffmpeg7
apt-get update
apt-get -qq install ffmpeg
apt-get -qq dist-upgrade
else
# Otherwise, install the default FFmpeg package.
echo "Installing FFmpeg for ${DESTARCH^^}..."
apt-get update
apt-get -qq install ffmpeg
fi
;;
*)
# Install the default FFmpeg package.
echo "Installing FFmpeg for ${DESTARCH^^}..."
apt-get update
apt-get -qq install ffmpeg
;;
esac