From nobody Mon Apr 04 12:51:15 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 98E581A8D293; Mon, 4 Apr 2022 12:51:16 +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 4KX9cz5n9Jz4RDG; Mon, 4 Apr 2022 12:51:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649076676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=voM5AtrWga5vzpclV45moJTVqrPO4GL1Oi/UyHNIK9k=; b=py7/ikTYkraqMeUY4aErP88dyoW2P0FosbFO92Rt/X0XIxXMJDFM5BjO4ri0p9jadvjQvg 3ma/jW01cOiDwwAXReg0VxeLKVxt+mKMkL0TESS2jn+IX7PdP0d9H0aHTUTcfLRKpxE6iP LOSC3hsPhIVlOt37dCZjKeCvUxr+ja0ppqUdSTOoNPaDwyc98El4JSZogSE+/yfK+LloWY pkz5oZrE3Y9gRCZprE/hesVevsooeQcq5WGqCDIJyp5gINKab4f8uEmRN/QUX3aIw0q3TS 2zoTZ+ugT9wP4XWtbEVeldMNhcZghretWJPv9R3k8b2MYYcitVH5SYS77qvdHg== 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 7CA7F1261F; Mon, 4 Apr 2022 12:51:15 +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 234CpFBm035070; Mon, 4 Apr 2022 12:51:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 234CpF9b035069; Mon, 4 Apr 2022 12:51:15 GMT (envelope-from git) Date: Mon, 4 Apr 2022 12:51:15 GMT Message-Id: <202204041251.234CpF9b035069@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dave Cottlehuber Subject: git: b7fb34791d44 - main - games/ezquake: fix arm64 build failures List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dch X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b7fb34791d44a5b8313444b01b758f9ef2e18b55 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649076676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=voM5AtrWga5vzpclV45moJTVqrPO4GL1Oi/UyHNIK9k=; b=hbv7XV1sUM6UnUFBaAO+r5zalASV+l1keyWZcdB6APHLyQDBb3E7meGB4oPfvspInn5wCB ct4qT2Yi7Bzmq5Cu0TUn0qpd7UuNWmlUvLU5FjIs9Tv/NsqTjDxAgGDTUc3cm+RWAsr3O+ LQDCqOwpRlAR1EMM8xPM6Sa1pdIBjXr/b0nkbzJjE/mzJ88OPLMEzarYZMrribP+NBmgKO Ak9ipPWHWLMRcG8L51O2rFFJGggfNhfSFF2wunIsIbiT2OWqaZyFQFkQN+vMCT7GNYLHxg a1CmolBPm5p2b0MJIytIMKNyWIrYv2/U/+QsmeGrioR2CwWdiYtB7uP+sRZJcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649076676; a=rsa-sha256; cv=none; b=Sa0VLBBT12CgYY4lCYtijJ3uCkRdqa5mw5CWzz/Hhu3iNZyHw09zvudety4+LaiGxhBcF/ 2+UU9B75D0mrzPlrZv5hIScB6Djtf0hpSAPx5Exbw3HnL+zi3YbxfYu3/AZJ6HFTgBq5op 2XgvMOap9p4rsTDfhoTt8yrrtESFs+hWXidiYL90Mj5A31OY3/HuKIlMEveZDJXNrBoW+t D/0HpebiIWL0xE2UkjJwCqxL7P6j95jP3W6VFUtg/0YSQl8hpcUhjACwFdnFcnmv0YBZtn Uwmp3dTP94dP9Q3hE4kfXZu/7zyeNiQnzZpILqwvneRRyy9c2PHfbZL1b9dawg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dch: URL: https://cgit.FreeBSD.org/ports/commit/?id=b7fb34791d44a5b8313444b01b758f9ef2e18b55 commit b7fb34791d44a5b8313444b01b758f9ef2e18b55 Author: Dave Cottlehuber AuthorDate: 2022-04-04 12:50:50 +0000 Commit: Dave Cottlehuber CommitDate: 2022-04-04 12:50:50 +0000 games/ezquake: fix arm64 build failures PR: 262889 Reported by: pkg-fallout Approved by: vvd@unislabs.com (maintainer) Sponsored by: SkunkWerks, GmbH MFH: 2022Q2 --- games/ezquake/Makefile | 2 +- games/ezquake/files/patch-host.c | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/games/ezquake/Makefile b/games/ezquake/Makefile index 2abd0da8d2d6..e035deaab274 100644 --- a/games/ezquake/Makefile +++ b/games/ezquake/Makefile @@ -2,7 +2,7 @@ PORTNAME= ezquake DISTVERSION= 3.2.3 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 2 CATEGORIES= games MASTER_SITES= https://github.com/ezQuake/ezquake-source/archive/ \ diff --git a/games/ezquake/files/patch-host.c b/games/ezquake/files/patch-host.c index 0506eb4589d0..cba197302ad7 100644 --- a/games/ezquake/files/patch-host.c +++ b/games/ezquake/files/patch-host.c @@ -1,9 +1,10 @@ ---- host.c.orig 2020-09-16 22:08:02 UTC +--- host.c.orig +++ host.c -@@ -333,11 +333,19 @@ void SYSINFO_Init(void) +@@ -333,16 +333,30 @@ SYSINFO_processor_description = cpu_model; gettimeofday(&old_tp, NULL); ++#if defined(__powerpc__) || defined(__i386__) || defined(__amd64__) +#ifdef __powerpc__ + __asm__ __volatile__("mfspr %%r3, 268": "=r" (old_tsc)); +#else @@ -20,7 +21,17 @@ SYSINFO_MHz = (int)((tsc_freq - old_tsc) / (tp.tv_sec - old_tp.tv_sec + (tp.tv_usec - old_tp.tv_usec) / 1000000.) / 1000000. + .5); -@@ -351,7 +359,7 @@ void SYSINFO_Init(void) + // VVD: We can use sysctl hw.clockrate, but it don't work on i486 - always 0. + // Must work on Pentium 1/2/3; tested on Pentium 4. And RELENG_4 have no this sysctl. ++#else ++ len = sizeof(val); ++ sysctlbyname("dev.cpu.0.freq", &val, &len, NULL, 0); ++ SYSINFO_MHz = val; ++#endif + + if (gl_renderer && gl_renderer[0]) { + if (SYSINFO_3D_description != NULL) { +@@ -351,7 +365,7 @@ SYSINFO_3D_description = Q_strdup(gl_renderer); }