2
0
Эх сурвалжийг харах

Fixed ffmpeg version
updated lauch with ffmpeg

JPVenson 1 жил өмнө
parent
commit
23c7770683

+ 1 - 1
.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": {

+ 4 - 2
.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
+rm ffmpeg.deb

+ 0 - 0
.devcontainer/Dev - Server Default/devcontainer.json → .devcontainer/devcontainer.json


+ 12 - 0
.vscode/launch.json

@@ -29,6 +29,18 @@
             "stopAtEntry": false,
             "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",