From nobody Wed Mar 1 17:18:53 2023 X-Original-To: dev-commits-ports-main@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 4PRgv20l4dz3v6GX; Wed, 1 Mar 2023 17:18:54 +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 4PRgv20G6Yz40vj; Wed, 1 Mar 2023 17:18:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677691134; 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=23ho8RRUZckKJKiF15VljmFaPunDSJuUQiIchUICIxA=; b=wSrGUdBr+zX/P4sXrv1oIaYWS1fsaWk8jUWdE4id4E5MT9ckkEgDmGtg/7SrNmeowSXtql nruYUqdKLv5DhCsBkZmW90tYIhpX2xZkSeab7ZHITjh1y/xx7rFzzIwGMXmNbYk4w+Al4Q 4gzKvqyW+1N2HCpPFq9vSMDG1qDrbO3ryoFPit3n0T6Xe0nEqiErlhIohy/nPLy6+eFUXj hqQIgqTsLEqJ8mz5R+1uxjfGcaEMCG/tN8Yv++rA2s3yJaUyFgiRdSC774cGhZ73Nxv8UH l5Rol9wh+YtUIPnW2tDq4z/DmVBkueE/xt9sp8iBFmJ/62XCFfpFD2Y0rZeiIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677691134; 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=23ho8RRUZckKJKiF15VljmFaPunDSJuUQiIchUICIxA=; b=c4AagUE8fTCbcJdQNhz/lz7aJARqomCJDzR+Hu3XEIlARG9pcQVPgh9NyxkN6OQ+RzjxMv w+aA1PcbMpP6w6E9bpY12qXC+jq0rfvMSgmfoa8sg0U+7dK5eAsYnoFEBMmRSJQR94HaJI PjPsG2GWYvnGbgvRPo5B9JhOiYViX96N76FXbjbwllWl1RO5XSl6ep8FNlXkts6wJJ7wne RSCqN8ppbvP+AZIgAp9hR7li5d/9sVrUEuxeSGkAFJeD5Vi3zVSqfmndKyXMEQgZNhhyQD PrZ78TT3zEPw8SF1yumgjsYMGvpsShQLiwmS0HxcQ3hEkEabYJI/xmdHzQv1GA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677691134; a=rsa-sha256; cv=none; b=MlMVQeg6aU4ALUm8UiYCzA6fl57q8lcUlrjCpScp06RjL/VYRkaMT067D91C8JW5FGwdSq g4wK18zXAEcHYwg1ZSJrJBenX4e9DXqvAs359BTnIGk+Ay9KqgZJL1b31GCoeeI30V2Pyx sAHeEOB3buvb979Fx+T1TLKNQ5tGp1niCtK+0CVoKQvYQzDWtW52NNPwjLgO8Li4/1dT8l tnARmO5z83CrcU8wVv4kzJ1MR1XPezLNQIYTeJHcsi1tkw7xk9uhqrK/ax6enfi3bjHzU2 TzKkdkOWBCwbYwesLItqNsHzlWBP/g4tcc8yVUchPzdvuimB7SLWKg9vnAa4Mw== 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 4PRgv16QpTzjTY; Wed, 1 Mar 2023 17:18:53 +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 321HIrdi068655; Wed, 1 Mar 2023 17:18:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321HIreZ068654; Wed, 1 Mar 2023 17:18:53 GMT (envelope-from git) Date: Wed, 1 Mar 2023 17:18:53 GMT Message-Id: <202303011718.321HIreZ068654@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jung-uk Kim Subject: git: 17192bab9279 - main - sysutils/vbetool: Fix build with LLVM 15 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 17192bab9279dcd5748739a3860f4c524cdb2180 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jkim: URL: https://cgit.FreeBSD.org/ports/commit/?id=17192bab9279dcd5748739a3860f4c524cdb2180 commit 17192bab9279dcd5748739a3860f4c524cdb2180 Author: Jung-uk Kim AuthorDate: 2023-03-01 17:18:26 +0000 Commit: Jung-uk Kim CommitDate: 2023-03-01 17:18:26 +0000 sysutils/vbetool: Fix build with LLVM 15 --- sysutils/vbetool/files/patch-vbetool.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/sysutils/vbetool/files/patch-vbetool.c b/sysutils/vbetool/files/patch-vbetool.c index 5960ec0ba3d2..1c0e0bec6f4a 100644 --- a/sysutils/vbetool/files/patch-vbetool.c +++ b/sysutils/vbetool/files/patch-vbetool.c @@ -1,6 +1,6 @@ ---- vbetool.c 2008-05-16 08:56:30.000000000 -0400 -+++ vbetool.c 2008-12-03 19:50:36.000000000 -0500 -@@ -16,8 +16,12 @@ +--- vbetool.c.orig 2008-05-16 12:56:30 UTC ++++ vbetool.c +@@ -16,8 +16,12 @@ version 2 #include #include #include @@ -13,7 +13,7 @@ #include #include #include -@@ -37,6 +41,9 @@ +@@ -37,6 +41,9 @@ static struct pci_access *pacc; #define DPMS_STATE_LOW 0x0800 static struct pci_access *pacc; @@ -23,7 +23,7 @@ int vbetool_init (void) { if (!LRMI_init()) { -@@ -44,7 +51,14 @@ +@@ -44,7 +51,14 @@ int vbetool_init (void) { exit(1); } @@ -38,7 +38,18 @@ pacc = pci_alloc(); pacc->numeric_ids = 1; -@@ -267,7 +281,9 @@ +@@ -117,8 +131,8 @@ int main(int argc, char *argv[]) + void *rc; + int romfd = open (argv[2], O_RDWR); + +- munmap(0xc0000, 64*1024); +- rc = mmap(0xc0000, 64*1024, ++ munmap((void *)(uintptr_t)0xc0000, 64*1024); ++ rc = mmap((void *)(uintptr_t)0xc0000, 64*1024, + PROT_READ|PROT_WRITE|PROT_EXEC, + MAP_FIXED|MAP_PRIVATE, romfd, 0); + } +@@ -267,7 +281,9 @@ void restore_state_from(char *data) LRMI_free_real(data); @@ -48,7 +59,7 @@ } -@@ -489,7 +505,9 @@ +@@ -489,7 +505,9 @@ int check_console() return 11; }