From ca332ebd0632a4c841caf09a3e09b65747e85c4b Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Mon, 18 Apr 2022 05:15:52 +0000 Subject: [PATCH 1/3] xorg-intel-gpu-tools: update to 1.28 - update dependancies - support procps-ng 4.0.1 ref: - https://gitlab.com/procps-ng/procps/-/issues/239 - https://lists.freedesktop.org/archives/igt-dev/2022-November/thread.html --- packages/debug/xorg-intel-gpu-tools/package.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/debug/xorg-intel-gpu-tools/package.mk b/packages/debug/xorg-intel-gpu-tools/package.mk index cbb39c22e5..8aa49192ed 100644 --- a/packages/debug/xorg-intel-gpu-tools/package.mk +++ b/packages/debug/xorg-intel-gpu-tools/package.mk @@ -2,10 +2,10 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="xorg-intel-gpu-tools" -PKG_VERSION="1.27.1" -PKG_SHA256="93b9a4816ed22b5145bb61024314c8a65caeea991ce93027643f1d40723bf417" +PKG_VERSION="1.28" +PKG_SHA256="ffcbdf61bd495803d9ae9dfa83e2fe04b8f583a2296fe059c1d5dd135a8a3b15" PKG_LICENSE="GPL" -PKG_DEPENDS_TARGET="toolchain cairo procps-ng" +PKG_DEPENDS_TARGET="toolchain cairo kmod procps-ng systemd" PKG_SITE="https://gitlab.freedesktop.org/drm/igt-gpu-tools" PKG_URL="https://www.x.org/releases/individual/app/igt-gpu-tools-${PKG_VERSION}.tar.xz" PKG_LONGDESC="Test suite and tools for DRM/KMS drivers" From 86056ccfb973217a353f97f42264907624d8d1c7 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Wed, 23 Mar 2022 08:46:55 +0000 Subject: [PATCH 2/3] procps-ng: update to 4.0.4 update 3.3.17 to 4.0.4 news: https://gitlab.com/procps-ng/procps/-/blob/newlib/NEWS --- packages/tools/procps-ng/package.mk | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/packages/tools/procps-ng/package.mk b/packages/tools/procps-ng/package.mk index cd6f48a207..f8b7de9e41 100644 --- a/packages/tools/procps-ng/package.mk +++ b/packages/tools/procps-ng/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="procps-ng" -PKG_VERSION="3.3.17" -PKG_SHA256="8374d281f91e5fc9bb9ea8dc991b25331e3a2b0299b46f22c633f7fb6bcb0764" +PKG_VERSION="4.0.4" +PKG_SHA256="08dbaaaae6afe8d5fbeee8aa3f8b460b01c5e09ce4706b161846f067103a2cf2" PKG_LICENSE="GPL" PKG_SITE="https://gitlab.com/procps-ng/procps" PKG_URL="https://gitlab.com/procps-ng/procps/-/archive/v${PKG_VERSION}/procps-v${PKG_VERSION}.tar.bz2" @@ -18,14 +18,18 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \ --disable-modern-top \ --enable-static" -PKG_MAKE_OPTS_TARGET="free top/top proc/libprocps.la proc/libprocps.pc" +PKG_MAKE_OPTS_TARGET="src/free src/top/top library/libproc2.la library/libproc2.pc" -PKG_MAKEINSTALL_OPTS_TARGET="install-libLTLIBRARIES install-pkgconfigDATA install-proc_libprocps_la_includeHEADERS" +PKG_MAKEINSTALL_OPTS_TARGET="install-libLTLIBRARIES install-pkgconfigDATA install-library_libproc2_la_includeHEADERS" makeinstall_target() { mkdir -p ${INSTALL}/usr/bin - cp -P ${PKG_BUILD}/.${TARGET_NAME}/free ${INSTALL}/usr/bin - cp -P ${PKG_BUILD}/.${TARGET_NAME}/top/top ${INSTALL}/usr/bin + cp -P ${PKG_BUILD}/.${TARGET_NAME}/src/free ${INSTALL}/usr/bin + cp -P ${PKG_BUILD}/.${TARGET_NAME}/src/top/top ${INSTALL}/usr/bin make DESTDIR=${SYSROOT_PREFIX} -j1 ${PKG_MAKEINSTALL_OPTS_TARGET} + + sed 's@proc/misc.h@procps/misc.h@' \ + ${PKG_BUILD}/library/include/readproc.h \ + > ${SYSROOT_PREFIX}/usr/include/libproc2/readproc.h } From c0255e4e22d4d730e0f47af5e33f1c368fe5d070 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Mon, 18 Apr 2022 08:53:30 +0000 Subject: [PATCH 3/3] procps-ng: enable correct display of version number when using --version before: $ top --version top from procps-ng UNKNOWN after: $ top --version top from procps-ng 4.0.0 --- packages/tools/procps-ng/package.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/tools/procps-ng/package.mk b/packages/tools/procps-ng/package.mk index f8b7de9e41..f9b4691767 100644 --- a/packages/tools/procps-ng/package.mk +++ b/packages/tools/procps-ng/package.mk @@ -22,6 +22,10 @@ PKG_MAKE_OPTS_TARGET="src/free src/top/top library/libproc2.la library/libproc2. PKG_MAKEINSTALL_OPTS_TARGET="install-libLTLIBRARIES install-pkgconfigDATA install-library_libproc2_la_includeHEADERS" +pre_configure_target() { + sed -i -e "s/UNKNOWN/${PKG_VERSION}/" ../configure +} + makeinstall_target() { mkdir -p ${INSTALL}/usr/bin cp -P ${PKG_BUILD}/.${TARGET_NAME}/src/free ${INSTALL}/usr/bin