git: 17192bab9279 - main - sysutils/vbetool: Fix build with LLVM 15

The branch main has been updated by jkim:

URL: https://cgit.FreeBSD.org/ports/commit/?id=17192bab9279dcd5748739a3860f4c524cdb2180

commit 17192bab9279dcd5748739a3860f4c524cdb2180
Author:     Jung-uk Kim <jkim@FreeBSD.org>
AuthorDate: 2023-03-01 17:18:26 +0000
Commit:     Jung-uk Kim <jkim@FreeBSD.org>
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 <unistd.h>
  #include <sys/ioctl.h>
  #include <sys/types.h>
@@ -13,7 +13,7 @@
  #include <sys/stat.h>
  #include <errno.h>
  #include <fcntl.h>
-@@ -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;
  	}