synocli-videodriver: Fixes for DSM6 build

SynoCommunity · Sep 15, 2024 · 95a3cde · 95a3cde
1 parent 179be84
commit 95a3cde
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/cross/ffmpeg6/Makefile b/cross/ffmpeg6/Makefile
@@ -267,8 +267,11 @@ DEPENDS += cross/intel-media-driver cross/intel-mediasdk
 
 # Newer Intel implementations (oneAPI, level-zero) requires gcc >= 5
 ifeq ($(call version_gt, ${TC_GCC}, 5),1)
+DEPENDS += cross/intel-level-zero
+DEPENDS += cross/intel-graphics-compiler
 DEPENDS += cross/intel-compute-runtime
-DEPENDS += cross/ocl-icd cross/clinfo
+DEPENDS += cross/ocl-icd
+DEPENDS += cross/clinfo
 CONFIGURE_ARGS += --enable-opencl
 
 # Intel MFX and VPL are mutually exclusive

diff --git a/spk/synocli-videodriver/Makefile b/spk/synocli-videodriver/Makefile
@@ -2,11 +2,10 @@ SPK_NAME = synocli-videodriver
 SPK_VERS = 1.0
 SPK_REV = 1
 SPK_ICON = src/SynoPackagegreen-videodriver.png
-CHANGELOG = "Initial version providing Intel Media Driver 2024Q2 Release, intel-graphics-compiler (IGC) 1.0.17384.12, intel-level-zero 1.17.28"
+CHANGELOG = "Initial version providing Intel Media Driver 2024Q2 Release"
 
 MAINTAINER = th0ma7
-DESCRIPTION = Provides video driver support for Intel GPU acceleration including OpenCL.
-DESCRIPTION_FRE = Fournit un soutien pour les pilotes vidéo pour l'accélération GPU Intel incluant OpenCL.
+DESCRIPTION = "Provides video driver support for Intel GPU acceleration including OpenCL."
 DISPLAY_NAME = SynoCli Video Drivers
 STARTABLE = no
 
@@ -25,16 +24,25 @@ SPK_COMMANDS = bin/clinfo
 DEPENDS  = cross/libva cross/libva-utils
 DEPENDS += cross/intel-vaapi-driver
 DEPENDS += cross/intel-media-driver cross/intel-mediasdk
-DEPENDS += cross/intel-libvpl cross/intel-libvpl-tools
 
 include ../../mk/spksrc.archs.mk
 
 # Enable OpenCL only on DSM >= 7.1
 ifeq ($(call version_ge, ${TCVERSION}, 7.1),1)
-CHANGELOG += " and intel-compute-runtime 24.31.30508.7"
+CHANGELOG += "Intel Level-Zero 1.17.28, Intel Graphics Compiler \(IGC\) 1.0.17384.12, Intel Compute Runtime 24.31.30508.7"
+DEPENDS += cross/intel-level-zero
+DEPENDS += cross/intel-graphics-compiler
 DEPENDS += cross/intel-compute-runtime
 DEPENDS += cross/ocl-icd
 DEPENDS += cross/clinfo
 endif
 
+# Enable Intel libVPL only on DSM >= 7.1
+# -->> can not use libmfx and libvpl together in ffmpeg
+#      Jellyfin requires QSV provided by libmfx
+ifeq ($(call version_ge, ${TCVERSION}, 7),1)
+CHANGELOG += " and Intel Video Processing Library \(Intel VPL\) 2.13.0"
+DEPENDS += cross/intel-libvpl cross/intel-libvpl-tools
+endif
+
 include ../../mk/spksrc.spk.mk