add cross/libproc2 based on procps-ng

- add dedicated cross/libproc2 to build libproc2 of procps-ng and keep version 4.0.4 - update cross/intel-gpu-tools - update from v1.29 to v1.30 - replace dependency of cross/procps-ng by cross/libproc2 - fix chandelog of spk/synocli-videodriver - avoid package specific change logs (not supported by spkrepo)
SynoCommunity · Dec 23, 2024 · a277425 · a277425
1 parent 5584091
commit a277425
Show file tree

Hide file tree

Showing 7 changed files with 88 additions and 28 deletions.
diff --git a/cross/intel-gpu-tools/Makefile b/cross/intel-gpu-tools/Makefile
@@ -1,11 +1,11 @@
 PKG_NAME = igt-gpu-tools
-PKG_VERS = 1.29
+PKG_VERS = 1.30
 PKG_EXT = tar.bz2
 PKG_DIST_NAME = $(PKG_NAME)-v$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/archive/v$(PKG_VERS)
 PKG_DIR = $(PKG_NAME)-v$(PKG_VERS)
 
-DEPENDS  = cross/libdrm cross/libkmod cross/procps-ng cross/elfutils
+DEPENDS  = cross/libdrm cross/libkmod cross/libproc2 cross/elfutils
 DEPENDS += cross/pixman cross/cairo
 DEPENDS += cross/libudev_219
 

diff --git a/cross/intel-gpu-tools/digests b/cross/intel-gpu-tools/digests
@@ -1,3 +1,3 @@
-igt-gpu-tools-v1.29.tar.bz2 SHA1 ee83f23e6fb44355ea6e0b8e206b3a5fd9b21c48
-igt-gpu-tools-v1.29.tar.bz2 SHA256 19a9a3955be509e24ee9fdf5b604b0f51941e746619d79e1c18a61b346471891
-igt-gpu-tools-v1.29.tar.bz2 MD5 0515e054dc5237f6763d0db1cbf98fa1
+igt-gpu-tools-v1.30.tar.bz2 SHA1 4e87119616873a8ce310abbcd5dfaaadec1c9e2c
+igt-gpu-tools-v1.30.tar.bz2 SHA256 c9bb9a67ba92b39ffa7b88265a005859c21ad414ec23fd161b7773b18659e21b
+igt-gpu-tools-v1.30.tar.bz2 MD5 4cbe651a10e2953f4c8cf13a7a24f34e
diff --git a/cross/libproc2/Makefile b/cross/libproc2/Makefile
@@ -0,0 +1,43 @@
+PKG_NAME = libproc2
+PKG_REALNAME = procps
+PKG_VERS = 4.0.4
+PKG_EXT = tar.bz2
+PKG_DIST_NAME = $(PKG_REALNAME)-v$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://gitlab.com/procps-ng/procps/-/archive/v$(PKG_VERS)
+PKG_DIR = $(PKG_REALNAME)-v$(PKG_VERS)
+
+# NOTE:
+# PKG_VERS = 4.0.5 does not require the patch for x64-7.2, but breaks the build of cross/intel-gpu-tools (igt-gpu-tools v1.29 and v1.30)
+# igt-gpu-tools v1.29: ../lib/igt_aux.c:1361:76: error: macro "PIDS_VAL" passed 4 arguments, but takes just 3
+# igt-gpu-tools v1.30: ../lib/igt_aux.c:1361:62: error: macro "PIDS_VAL" passed 4 arguments, but takes just 3
+
+DEPENDS =
+
+HOMEPAGE = https://gitlab.com/procps-ng/procps
+COMMENT  = procps is a set of command line and full-screen utilities that provide information out of the pseudo-filesystem most commonly located at /proc.
+LICENSE  = GPLv2
+
+GNU_CONFIGURE = 1
+PRE_CONFIGURE_TARGET = procps_pre_configure
+
+CONFIGURE_ARGS  = --disable-static
+
+# Only the library is needed, disable tools
+# DSM-7.2: Fails to build ‘__NR_pidfd_open’ undeclared (fixed by patch)
+# ref: https://gitlab.com/procps-ng/procps/-/issues/352
+# Disable configurable tools
+CONFIGURE_ARGS += --disable-pidof
+CONFIGURE_ARGS += --disable-pidwait
+CONFIGURE_ARGS += --disable-kill
+CONFIGURE_ARGS += --disable-w
+CONFIGURE_ARGS += --disable-modern-top
+# Disable tools needing ncurses (hugetop, slabtop, top, watch)
+CONFIGURE_ARGS +=--without-ncurses
+
+ADDITIONAL_CFLAGS = -O
+
+include ../../mk/spksrc.cross-cc.mk
+
+.PHONY: procps_pre_configure
+procps_pre_configure:
+	$(RUN) ./autogen.sh
diff --git a/cross/libproc2/PLIST b/cross/libproc2/PLIST
@@ -0,0 +1,3 @@
+lib:lib/libproc2.so
+lib:lib/libproc2.so.0
+lib:lib/libproc2.so.0.0.2
diff --git a/cross/libproc2/digests b/cross/libproc2/digests
@@ -0,0 +1,3 @@
+procps-v4.0.4.tar.bz2 SHA1 a8bc3ed0a4b046ee214c8f0ab8e7898d7b54f52f
+procps-v4.0.4.tar.bz2 SHA256 08dbaaaae6afe8d5fbeee8aa3f8b460b01c5e09ce4706b161846f067103a2cf2
+procps-v4.0.4.tar.bz2 MD5 83252d291a20bcc160b00d3163bf7378
diff --git a/cross/libproc2/patches/0001-fix-pifd_open-check.patch b/cross/libproc2/patches/0001-fix-pifd_open-check.patch
@@ -0,0 +1,17 @@
+# Fix build for DSM 7.2
+# 
+# ref: https://gitlab.com/procps-ng/procps/-/issues/352
+# src/pgrep.c: In function ‘pidfd_open’:
+# src/pgrep.c:841:24: error: ‘__NR_pidfd_open’ undeclared
+# 
+--- configure.ac.orig	2023-08-31 09:54:51.000000000 +0000
++++ configure.ac	2024-10-01 02:03:23.968808525 +0000
+@@ -170,7 +170,7 @@ AC_TRY_COMPILE([#include <errno.h>],
+ 		AC_MSG_RESULT(yes),
+ 		AC_MSG_RESULT(no))
+
+-AC_CHECK_FUNC([pidfd_open], [enable_pidwait=yes], [
++AC_CHECK_FUNCS([pidfd_open], [enable_pidwait=yes], [
+   AC_MSG_CHECKING([for __NR_pidfd_open])
+   AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+ #include <sys/syscall.h>
diff --git a/spk/synocli-videodriver/Makefile b/spk/synocli-videodriver/Makefile
@@ -1,10 +1,10 @@
 SPK_NAME = synocli-videodriver
 SPK_VERS = 1.2
-SPK_REV = 2
+SPK_REV = 3
 SPK_ICON = src/SynoPackagegreen-videodriver.png
 
 MAINTAINER = th0ma7
-DESCRIPTION = "Provides video driver support for Intel GPU acceleration including OpenCL \(DSM7 only\)."
+DESCRIPTION = "Provides video driver support for Intel GPU acceleration including OpenCL \(DSM7.1+ only\)."
 DISPLAY_NAME = SynoCli Video Drivers
 STARTABLE = no
 
@@ -27,38 +27,32 @@ DEPENDS += cross/intel-media-driver cross/intel-mediasdk
 
 include ../../mk/spksrc.common.mk
 
-ifeq ($(call version_lt, ${TCVERSION}, 7),1)
-CHANGELOG = "1. Intel Media Driver 2022Q4 Release"
-else
-CHANGELOG = "1. Intel Media Driver 2024Q2 Release"
-endif
+CHANGELOG  = "1. Intel Media Driver Release 2024Q2 (Release 2022Q4 for DSM 6).<br/> "
+CHANGELOG += "2. Intel Level-Zero 1.17.42 (DSM 7.1+).<br/> "
+CHANGELOG += "3. Intel Graphics Compiler (IGC) 1.0.17537.20 (DSM 7.1+).<br/> "
+CHANGELOG += "4. Intel Compute Runtime 24.31.30508.7 (DSM 7.1+).<br/> "
+CHANGELOG += "5. Intel Video Processing Library (Intel VPL) 2.13.0 (DSM 7).<br/> "
+CHANGELOG += "6. Intel GPU Tools (IGT) 1.30 (DSM 7.1+)."
 
-# Enable OpenCL only on DSM >= 7.1
 ifeq ($(call version_ge, ${TCVERSION}, 7.1),1)
-CHANGELOG += "<br/>2. Intel Level-Zero 1.17.42"
-DEPENDS += cross/intel-level-zero
 
-CHANGELOG += "<br/>3. Intel Graphics Compiler \(IGC\) 1.0.17537.20"
-DEPENDS += cross/intel-graphics-compiler
-
-CHANGELOG += "<br/>4. Intel Compute Runtime 24.31.30508.7"
+# Enable OpenCL only on DSM >= 7.1
 DEPENDS += cross/intel-compute-runtime
-DEPENDS += cross/ocl-icd
 DEPENDS += cross/clinfo
+
+# Enable intel_gpu_top on DSM >= 7.1
+DEPENDS += cross/intel-gpu-tools
+
 endif
 
-# Enable Intel libVPL only on DSM >= 7.1
+
+ifeq ($(call version_ge, ${TCVERSION}, 7),1)
+
+# Enable Intel libVPL only on DSM 7
 # -->> can not use libmfx and libvpl together in ffmpeg
 #      Jellyfin requires QSV provided by libmfx
-ifeq ($(call version_ge, ${TCVERSION}, 7),1)
-CHANGELOG += "<br/>5. Intel Video Processing Library \(Intel VPL\) 2.13.0"
 DEPENDS += cross/intel-libvpl cross/intel-libvpl-tools
-endif
 
-# Enable intel_gpu_top on DSM >= 7.1
-ifeq ($(call version_ge, ${TCVERSION}, 7.1),1)
-CHANGELOG = "<br/>6. Intel GPU Tools \(IGT\) 1.29"
-DEPENDS += cross/intel-gpu-tools
 endif
 
 include ../../mk/spksrc.spk.mk