From owner-dev-commits-ports-main@freebsd.org Wed Aug 4 20:56:05 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 10C57655CB8; Wed, 4 Aug 2021 20:56:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Gg3tX6phZz3Ccq; Wed, 4 Aug 2021 20:56:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D32195B0C; Wed, 4 Aug 2021 20:56:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 174Ku49E002002; Wed, 4 Aug 2021 20:56:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 174Ku4Rg002001; Wed, 4 Aug 2021 20:56:04 GMT (envelope-from git) Date: Wed, 4 Aug 2021 20:56:04 GMT Message-Id: <202108042056.174Ku4Rg002001@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adam Weinberger Subject: git: a5541579f68c - main - sysutils/tmux-mem-cpu-load: Replace local patch with upstream version MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adamw X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a5541579f68c92886f7adbaf5e538193d21000d1 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Aug 2021 20:56:05 -0000 The branch main has been updated by adamw: URL: https://cgit.FreeBSD.org/ports/commit/?id=a5541579f68c92886f7adbaf5e538193d21000d1 commit a5541579f68c92886f7adbaf5e538193d21000d1 Author: Adam Weinberger AuthorDate: 2021-08-04 20:53:02 +0000 Commit: Adam Weinberger CommitDate: 2021-08-04 20:56:00 +0000 sysutils/tmux-mem-cpu-load: Replace local patch with upstream version 3.5.0 required a patch against a build error. This commit replaces a local patch for it with the version from upstream, which is substantively the same except the local patch won't recognize more than 256 CPUs. I'm including a PORTREVISION bump in case you're running tmux-mem-cpu-load on your 512-core machine. --- sysutils/tmux-mem-cpu-load/Makefile | 1 + .../tmux-mem-cpu-load/files/patch-common_cpu.h | 11 --------- .../tmux-mem-cpu-load/files/patch-freebsd_cpu.cc | 28 ++++++++++++++++++++++ 3 files changed, 29 insertions(+), 11 deletions(-) diff --git a/sysutils/tmux-mem-cpu-load/Makefile b/sysutils/tmux-mem-cpu-load/Makefile index 30343445a256..5409d447ca8b 100644 --- a/sysutils/tmux-mem-cpu-load/Makefile +++ b/sysutils/tmux-mem-cpu-load/Makefile @@ -2,6 +2,7 @@ PORTNAME= tmux-mem-cpu-load PORTVERSION= 3.5.0 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= sysutils diff --git a/sysutils/tmux-mem-cpu-load/files/patch-common_cpu.h b/sysutils/tmux-mem-cpu-load/files/patch-common_cpu.h deleted file mode 100644 index 42237a044b95..000000000000 --- a/sysutils/tmux-mem-cpu-load/files/patch-common_cpu.h +++ /dev/null @@ -1,11 +0,0 @@ ---- common/cpu.h.orig 2021-08-04 11:37:18 UTC -+++ common/cpu.h -@@ -45,7 +45,7 @@ - #endif - - float cpu_percentage( unsigned ); --uint32_t get_cpu_count(); -+uint8_t get_cpu_count(); - - /** CPU percentage output mode. - * diff --git a/sysutils/tmux-mem-cpu-load/files/patch-freebsd_cpu.cc b/sysutils/tmux-mem-cpu-load/files/patch-freebsd_cpu.cc new file mode 100644 index 000000000000..c1bd8c3b9ab0 --- /dev/null +++ b/sysutils/tmux-mem-cpu-load/files/patch-freebsd_cpu.cc @@ -0,0 +1,28 @@ +From 96ea7dc0507679203b07e673ebd21a0ea8d474e9 Mon Sep 17 00:00:00 2001 +From: Matt McCormick +Date: Wed, 4 Aug 2021 15:05:19 -0400 +Subject: [PATCH] Consistent get_cpu_count for FreeBSD + +--- + freebsd/cpu.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/freebsd/cpu.cc b/freebsd/cpu.cc +index b85d402..4c7dddb 100644 +--- freebsd/cpu.cc.orig ++++ freebsd/cpu.cc +@@ -26,12 +26,12 @@ + #include "getsysctl.h" + #include "cpu.h" + +-uint8_t get_cpu_count() ++uint32_t get_cpu_count() + { + int32_t cpu_count = 0; + GETSYSCTL( "hw.ncpu", cpu_count ); + +- return static_cast( cpu_count ); ++ return static_cast( cpu_count ); + } + + float cpu_percentage( unsigned int cpu_usage_delay )