Merge pull request #30 from zebrapurring/jellyfin-ffmpeg

Install ffmpeg from Jellyfin fork
zebrapurring · Dec 20, 2024 · f935c8b · f935c8b
2 parents e50a0bb + 186e3b8
commit f935c8b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/Scripts/config.env b/Scripts/config.env
@@ -1,6 +1,8 @@
 IMMICH_TAG="v1.123.0"
+FFMPEG_VERSION="7.0.2-7"    # Taken from https://github.com/immich-app/base-images/blob/main/server/bin/build-lock.json
 
 IMMICH_INSTALL_DIR="/opt/immich"
+IMMICH_BIN_DIR="$IMMICH_INSTALL_DIR/bin"
 IMMICH_SETTINGS_DIR="$IMMICH_INSTALL_DIR/etc"
 IMMICH_APP_DIR="$IMMICH_INSTALL_DIR/share"
 IMMICH_MEDIA_DIR="$IMMICH_INSTALL_DIR/var/db"

diff --git a/Scripts/installdependencies.sh b/Scripts/installdependencies.sh
@@ -10,10 +10,11 @@ fi
 
 echo "INFO:  install dependencies"
 
-[ -z "$(which brew)" ] && echo "Homebrew is not installed" && exit 1
+mkdir -p "$IMMICH_BIN_DIR"
 
+# Install Homebrew dependencies
+[ -z "$(which brew)" ] && echo "Homebrew is not installed" && exit 1
 brew install \
-  ffmpeg \
   node \
   npm \
   pgvector \
@@ -24,3 +25,10 @@ brew install \
   wget
 brew services restart postgresql@17
 brew services restart redis
+
+# Install custom ffmpeg build jellyfin-ffmpeg
+curl -s -L -o - "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v$IMMICH_FFMPEG_VERSION/jellyfin-ffmpeg_${IMMICH_FFMPEG_VERSION}_portable_mac64-gpl.tar.xz" | \
+  tar xzvf - -C "$IMMICH_BIN_DIR"
+
+# Adjust permissions
+chown -R "$IMMICH_USER:$IMMICH_GROUP" "$IMMICH_BIN_DIR"
diff --git a/launchd/com.immich.machine.learning.plist b/launchd/com.immich.machine.learning.plist
@@ -15,7 +15,7 @@
 		<key>EnvironmentVariables</key>
 		<dict>
 			<key>PATH</key>
-			<string>/opt/homebrew/bin:/usr/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin</string>
+			<string>${IMMICH_BIN_DIR}:/opt/homebrew/bin:/usr/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin</string>
 		</dict>
 		<key>StandardOutPath</key>
   		<string>/var/log/immich/immich-machine-learning.log</string>

diff --git a/launchd/com.immich.plist b/launchd/com.immich.plist
@@ -15,7 +15,7 @@
 		<key>EnvironmentVariables</key>
 		<dict>
 			<key>PATH</key>
-			<string>/opt/homebrew/bin:/usr/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin</string>
+			<string>${IMMICH_BIN_DIR}:/opt/homebrew/bin:/usr/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin</string>
 		</dict>
 		<key>StandardOutPath</key>
   		<string>/var/log/immich/immich-app.log</string>