From 116d2fa9cd0342576aba4dafdecc8a8d542c94d6 Mon Sep 17 00:00:00 2001
From: nyanmisaka <nst799610810@gmail.com>
Date: Mon, 9 Sep 2024 23:15:39 +0800
Subject: [PATCH 1/2] Switch to jellyfin-ffmpeg7

Signed-off-by: nyanmisaka <nst799610810@gmail.com>
---
 debian/control    | 4 ++--
 docker/Dockerfile | 2 +-
 portable/build.sh | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index e3b3e88..5d4b49a 100644
--- a/debian/control
+++ b/debian/control
@@ -10,14 +10,14 @@ Vcs-Browser: https://github.com/jellyfin
 
 Package: jellyfin
 Architecture: all
-Depends: jellyfin-server, jellyfin-web, jellyfin-ffmpeg6
+Depends: jellyfin-server, jellyfin-web, jellyfin-ffmpeg7
 Description: Jellyfin is the Free Software Media System.
  This metapackage provides the core Jellyfin components from one name.
 
 Package: jellyfin-server
 Architecture: any
 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.
  This package provides the Jellyfin server backend and API.
 
diff --git a/docker/Dockerfile b/docker/Dockerfile
index f74bac0..9b7c82a 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -6,7 +6,7 @@ ARG NODEJS_VERSION=20
 ARG OS_VERSION=bookworm
 
 # Jellyfin FFMPEG package
-ARG FFMPEG_PACKAGE=jellyfin-ffmpeg6
+ARG FFMPEG_PACKAGE=jellyfin-ffmpeg7
 
 # https://github.com/intel/compute-runtime/releases
 ARG GMMLIB_VERSION=22.4.1
diff --git a/portable/build.sh b/portable/build.sh
index 339823b..f279b44 100755
--- a/portable/build.sh
+++ b/portable/build.sh
@@ -7,7 +7,7 @@ set -o xtrace
 
 # Set global variables
 REPOSITORY_URI="https://repo.jellyfin.org"
-FFMPEG_VERSION="6.x"
+FFMPEG_VERSION="7.x"
 
 # Create the intermediate build dir
 BUILD_DIR="/build"

From 67c520bf283cf01ec268c8c072cbe41277a50151 Mon Sep 17 00:00:00 2001
From: nyanmisaka <nst799610810@gmail.com>
Date: Mon, 9 Sep 2024 23:18:27 +0800
Subject: [PATCH 2/2] Use Windows FFmpeg built with Clang

For better intrin perf in vf_tonemapx filter.

Signed-off-by: nyanmisaka <nst799610810@gmail.com>
---
 portable/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/portable/build.sh b/portable/build.sh
index f279b44..9f0731c 100755
--- a/portable/build.sh
+++ b/portable/build.sh
@@ -77,7 +77,7 @@ case ${BUILD_TYPE}-${PACKAGE_ARCH} in
 #        rm ffmpeg.tar.xz
 #    ;;
     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}
         unzip ffmpeg.zip
         rm ffmpeg.zip