diff options
| author | JPVenson <JPVenson@users.noreply.github.com> | 2024-01-19 00:48:03 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-19 00:48:03 +0000 |
| commit | 23c77706838aa2e5cf83ee036f3853a90acc4a68 (patch) | |
| tree | a8f3ca2307815dade0cd0660fa739a0dc777a2cf | |
| parent | 21ae7a1317255acd0a031e74575f6c08967ce5f3 (diff) | |
Fixed ffmpeg version
updated lauch with ffmpeg
| -rw-r--r-- | .devcontainer/Dev - Server Ffmpeg/devcontainer.json | 2 | ||||
| -rw-r--r-- | .devcontainer/Dev - Server Ffmpeg/install-ffmpeg.sh | 6 | ||||
| -rw-r--r-- | .devcontainer/devcontainer.json (renamed from .devcontainer/Dev - Server Default/devcontainer.json) | 0 | ||||
| -rw-r--r-- | .vscode/launch.json | 12 |
4 files changed, 17 insertions, 3 deletions
diff --git a/.devcontainer/Dev - Server Ffmpeg/devcontainer.json b/.devcontainer/Dev - Server Ffmpeg/devcontainer.json index 8d1413d09..0b848d9f3 100644 --- a/.devcontainer/Dev - Server Ffmpeg/devcontainer.json +++ b/.devcontainer/Dev - Server Ffmpeg/devcontainer.json @@ -2,7 +2,7 @@ "name": "Development Jellyfin Server - FFmpeg", "image":"mcr.microsoft.com/devcontainers/dotnet:8.0-jammy", // restores nuget packages, installs the dotnet workloads and installs the dev https certificate - "postStartCommand": "dotnet restore; dotnet workload update; dotnet dev-certs https --trust; bash ./install-ffmpeg.sh", + "postStartCommand": "dotnet restore; dotnet workload update; dotnet dev-certs https --trust; sudo bash \"./.devcontainer/Dev - Server Ffmpeg/install-ffmpeg.sh\"", // reads the extensions list and installs them "postAttachCommand": "cat .vscode/extensions.json | jq -r .recommendations[] | xargs -n 1 code --install-extension", "features": { diff --git a/.devcontainer/Dev - Server Ffmpeg/install-ffmpeg.sh b/.devcontainer/Dev - Server Ffmpeg/install-ffmpeg.sh index d2a54b98f..c84e1258f 100644 --- a/.devcontainer/Dev - Server Ffmpeg/install-ffmpeg.sh +++ b/.devcontainer/Dev - Server Ffmpeg/install-ffmpeg.sh @@ -1,5 +1,7 @@ #!/bin/bash -sudo wget https://repo.jellyfin.org/releases/server/ubuntu/versions/jellyfin-ffmpeg/6.0-8/jellyfin-ffmpeg6_6.0-8-focal_amd64.deb -O ffmpeg.deb +wget https://repo.jellyfin.org/releases/server/ubuntu/versions/jellyfin-ffmpeg/6.0.1-1/jellyfin-ffmpeg6_6.0.1-1-jammy_amd64.deb -O ffmpeg.deb + +sudo apt update sudo apt install -f ./ffmpeg.deb -y -rm ffmpeg.deb
\ No newline at end of file +rm ffmpeg.deb diff --git a/.devcontainer/Dev - Server Default/devcontainer.json b/.devcontainer/devcontainer.json index 063901c80..063901c80 100644 --- a/.devcontainer/Dev - Server Default/devcontainer.json +++ b/.devcontainer/devcontainer.json diff --git a/.vscode/launch.json b/.vscode/launch.json index be55764fd..2673973db 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -30,6 +30,18 @@ "internalConsoleOptions": "openOnSessionStart" }, { + "name": "ghcs .NET Launch (nowebclient, ffmpeg)", + "type": "coreclr", + "request": "launch", + "preLaunchTask": "build", + "program": "${workspaceFolder}/Jellyfin.Server/bin/Debug/net8.0/jellyfin.dll", + "args": ["--nowebclient", "--ffmpeg", "/usr/share/jellyfin-ffmpeg/ffmpeg"], + "cwd": "${workspaceFolder}/Jellyfin.Server", + "console": "internalConsole", + "stopAtEntry": false, + "internalConsoleOptions": "openOnSessionStart" + }, + { "name": ".NET Attach", "type": "coreclr", "request": "attach", |