Merge pull request #492 from nyanmisaka/scale-cuda-upstream

Switch to upstream cuda scaler

build.yaml

@@ -1,7 +1,7 @@
 ---
 # We just wrap `build` so this is really it
 name: "jellyfin-ffmpeg"
-version: "7.0.2-4"
+version: "7.0.2-5"
 packages:
   - bullseye-amd64
   - bullseye-armhf

builder/scripts.d/50-dav1d.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://code.videolan.org/videolan/dav1d.git"
-SCRIPT_COMMIT="389450f61ea0b2057fc9ea393d3065859c4ba7f2"
+SCRIPT_COMMIT="32cf02af50f32af108a3b281c452788dccdac648"
 
 ffbuild_enabled() {
     return 0

debian/changelog

@@ -1,3 +1,14 @@
+jellyfin-ffmpeg (7.0.2-5) unstable; urgency=medium
+
+  * Add bsf options to drop the DoVi and HDR10Plus metadata
+  * Validate DoVi config in muxers
+  * Fix 7.1 channel mapping and sample rate in AudioToolbox
+  * Sync RKMPP fixes from ffmpeg-rockchip
+  * Remove OpenGL compatability key in VideoToolbox for better perf
+  * Switch to upstream cuda scaler
+
+ -- nyanmisaka <nst799610810@gmail.com>  Fri, 25 Oct 2024 21:53:14 +0800
+
 jellyfin-ffmpeg (7.0.2-4) unstable; urgency=medium
 
   * Use more stable range and peak handling in tonemap filters

docker-build-win64.sh

@@ -473,7 +473,7 @@ popd
 popd
 
 # DAV1D
-git clone -b 1.4.3 --depth=1 https://code.videolan.org/videolan/dav1d.git
+git clone -b 1.5.0 --depth=1 https://code.videolan.org/videolan/dav1d.git
 meson setup dav1d dav1d_build \
     --prefix=${FF_DEPS_PREFIX} \
     --cross-file=${FF_MESON_TOOLCHAIN} \

docker-build.sh

@@ -236,7 +236,7 @@ prepare_extra_common() {
 
     # DAV1D
     pushd ${SOURCE_DIR}
-    git clone -b 1.4.3 --depth=1 https://code.videolan.org/videolan/dav1d.git
+    git clone -b 1.5.0 --depth=1 https://code.videolan.org/videolan/dav1d.git
     meson setup dav1d dav1d_build \
         ${MESON_CROSS_OPT} \
         --prefix=${TARGET_DIR} \
@@ -439,7 +439,7 @@ prepare_extra_amd64() {
     # VPL-GPU-RT (RT only)
     # Provides VPL runtime (libmfx-gen.so.1.2) for 11th Gen Tiger Lake and newer
     pushd ${SOURCE_DIR}
-    git clone -b intel-onevpl-24.4.0 --depth=1 https://github.com/intel/vpl-gpu-rt.git
+    git clone -b intel-onevpl-24.4.1 --depth=1 https://github.com/intel/vpl-gpu-rt.git
     pushd vpl-gpu-rt
     mkdir build && pushd build
     cmake -DCMAKE_INSTALL_PREFIX=${TARGET_DIR} \
@@ -459,7 +459,7 @@ prepare_extra_amd64() {
     # Full Feature Build: ENABLE_KERNELS=ON(Default) ENABLE_NONFREE_KERNELS=ON(Default)
     # Free Kernel Build: ENABLE_KERNELS=ON ENABLE_NONFREE_KERNELS=OFF
     pushd ${SOURCE_DIR}
-    git clone -b intel-media-24.4.0 --depth=1 https://github.com/intel/media-driver.git
+    git clone -b intel-media-24.4.1 --depth=1 https://github.com/intel/media-driver.git
     pushd media-driver
     # enable vc1 decode on dg2 (note that mtl+ is not supported)
     wget -q -O - https://github.com/intel/media-driver/commit/d5dd47b.patch | git apply

msys2/PKGBUILD/40-mingw-w64-dav1d/PKGBUILD

@@ -3,7 +3,7 @@
 _realname=dav1d
 pkgbase=mingw-w64-jellyfin-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-jellyfin-${_realname}")
-pkgver=1.4.3
+pkgver=1.5.0
 pkgrel=1
 pkgdesc="AV1 cross-platform decoder focused on speed and correctness (mingw-w64)"
 arch=('any')
@@ -23,7 +23,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-pkgconf"
              "${MINGW_PACKAGE_PREFIX}-xxhash")
 source=("https://downloads.videolan.org/pub/videolan/dav1d/${pkgver}/dav1d-${pkgver}.tar.xz"{,.asc}
         "0001-dll-version.patch")
-sha256sums=('42fe524bcc82ea3a830057178faace22923a79bad3d819a4962d8cfc54c36f19'
+sha256sums=('14bd6f5157808ed9aedcafbe50df689d304fd4810ac20be6eec1ab037436afd6'
             'SKIP'
             '7fc584e69c156d7d9805b38912f07f417ccd1cce5fe4ee457761e8bea9128d04')
 validpgpkeys=('65F7C6B4206BD057A7EB73787180713BE58D1ADC') # VideoLAN Release Signing Key