jellyfin/jellyfin-packaging
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-packaging.git synced 2024-11-23 05:59:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #39 from nyanmisaka/ffmpeg7

Browse Source 
Switch to jellyfin-ffmpeg7 in Jellyfin 10.10
This commit is contained in:
Joshua M. Boniface 2024-09-11 09:31:20 -04:00 committed by GitHub
commit a45bbf4738
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/control vendored
View File

@ -10,14 +10,14 @@ Vcs-Browser: https://github.com/jellyfin
Package: jellyfin Package: jellyfin
Architecture: all Architecture: all
Depends: jellyfin-server, jellyfin-web, jellyfin-ffmpeg6 Depends: jellyfin-server, jellyfin-web, jellyfin-ffmpeg7
Description: Jellyfin is the Free Software Media System. Description: Jellyfin is the Free Software Media System.
This metapackage provides the core Jellyfin components from one name. This metapackage provides the core Jellyfin components from one name.
Package: jellyfin-server Package: jellyfin-server
Architecture: any Architecture: any
Depends: libfontconfig1, adduser Depends: libfontconfig1, adduser
Recommends: jellyfin-web, sudo, ffmpeg | jellyfin-ffmpeg6 Recommends: jellyfin-web, sudo, ffmpeg | jellyfin-ffmpeg7
Description: Jellyfin is the Free Software Media System. Description: Jellyfin is the Free Software Media System.
This package provides the Jellyfin server backend and API. This package provides the Jellyfin server backend and API.

2
docker/Dockerfile
View File

@ -6,7 +6,7 @@ ARG NODEJS_VERSION=20
ARG OS_VERSION=bookworm ARG OS_VERSION=bookworm
# Jellyfin FFMPEG package # Jellyfin FFMPEG package
ARG FFMPEG_PACKAGE=jellyfin-ffmpeg6 ARG FFMPEG_PACKAGE=jellyfin-ffmpeg7
# https://github.com/intel/compute-runtime/releases # https://github.com/intel/compute-runtime/releases
ARG GMMLIB_VERSION=22.4.1 ARG GMMLIB_VERSION=22.4.1

4
portable/build.sh
View File

@ -7,7 +7,7 @@ set -o xtrace
# Set global variables # Set global variables
REPOSITORY_URI="https://repo.jellyfin.org" REPOSITORY_URI="https://repo.jellyfin.org"
FFMPEG_VERSION="6.x" FFMPEG_VERSION="7.x"
# Create the intermediate build dir # Create the intermediate build dir
BUILD_DIR="/build" BUILD_DIR="/build"
@ -77,7 +77,7 @@ case ${BUILD_TYPE}-${PACKAGE_ARCH} in
# rm ffmpeg.tar.xz # rm ffmpeg.tar.xz
# ;; # ;;
windows-amd64) windows-amd64)
FFMPEG_PATH=$( curl ${REPOSITORY_URI}/?path=/ffmpeg/windows/latest-${FFMPEG_VERSION}/win64 | grep -o "/files/.*-portable_win64.zip'" | sed "s/'$//" ) FFMPEG_PATH=$( curl ${REPOSITORY_URI}/?path=/ffmpeg/windows/latest-${FFMPEG_VERSION}/win64 | grep -o "/files/.*-portable_win64-clang-gpl.zip'" | sed "s/'$//" )
curl --location --output ffmpeg.zip ${REPOSITORY_URI}${FFMPEG_PATH} curl --location --output ffmpeg.zip ${REPOSITORY_URI}${FFMPEG_PATH}
unzip ffmpeg.zip unzip ffmpeg.zip
rm ffmpeg.zip rm ffmpeg.zip