git: b680da690134 - main - emulators/qemu: Update version 9.0.2 => 9.1.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 12 Sep 2024 15:10:24 UTC
The branch main has been updated by bofh:
URL: https://cgit.FreeBSD.org/ports/commit/?id=b680da690134d4b3011588482f2046129c2f1646
commit b680da690134d4b3011588482f2046129c2f1646
Author: Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2024-09-12 13:30:44 +0000
Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2024-09-12 15:09:46 +0000
emulators/qemu: Update version 9.0.2 => 9.1.0
Changelog: https://wiki.qemu.org/ChangeLog/9.1
---
emulators/qemu/Makefile | 2 +-
emulators/qemu/distinfo | 6 ++---
emulators/qemu/files/patch-util_cpuinfo-ppc.c | 34 ---------------------------
emulators/qemu/pkg-plist | 4 +++-
4 files changed, 7 insertions(+), 39 deletions(-)
diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index 028c8a2f3492..d24810776e83 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -1,5 +1,5 @@
PORTNAME= qemu
-DISTVERSION= 9.0.2
+DISTVERSION= 9.1.0
CATEGORIES= emulators
MASTER_SITES= https://download.qemu.org/
DIST_SUBDIR= qemu/${PORTVERSION}
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index 98df1f532670..89279a436e82 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1722075777
-SHA256 (qemu/9.0.2/qemu-9.0.2.tar.xz) = a8c3f596aece96da3b00cafb74baafa0d14515eafb8ed1ee3f7f5c2d0ebf02b6
-SIZE (qemu/9.0.2/qemu-9.0.2.tar.xz) = 132387528
+TIMESTAMP = 1726146765
+SHA256 (qemu/9.1.0/qemu-9.1.0.tar.xz) = 816b7022a8ba7c2ac30e2e0cf973e826f6bcc8505339603212c5ede8e94d7834
+SIZE (qemu/9.1.0/qemu-9.1.0.tar.xz) = 132478356
diff --git a/emulators/qemu/files/patch-util_cpuinfo-ppc.c b/emulators/qemu/files/patch-util_cpuinfo-ppc.c
deleted file mode 100644
index af9999a22108..000000000000
--- a/emulators/qemu/files/patch-util_cpuinfo-ppc.c
+++ /dev/null
@@ -1,34 +0,0 @@
---- util/cpuinfo-ppc.c.orig 2024-01-29 19:13:22 UTC
-+++ util/cpuinfo-ppc.c
-@@ -6,13 +6,21 @@
- #include "qemu/osdep.h"
- #include "host/cpuinfo.h"
-
--#include <asm/cputable.h>
- #ifdef CONFIG_GETAUXVAL
- # include <sys/auxv.h>
- #else
-+# ifdef __linux__
-+# include <asm/cputable.h>
-+# elif defined(__FreeBSD__)
-+# include <machine/cpu.h>
-+# endif
- # include "elf.h"
- #endif
-
-+#ifndef PPC_FEATURE2_ARCH_3_1
-+# define PPC_FEATURE2_ARCH_3_1 0x00040000
-+#endif
-+
- unsigned cpuinfo;
-
- /* Called both as constructor and (possibly) via other constructors. */
-@@ -53,7 +61,7 @@ unsigned __attribute__((constructor)) cpuinfo_init(voi
- * always have both anyway, since VSX came with Power7
- * and crypto came with Power8.
- */
-- if (hwcap2 & PPC_FEATURE2_VEC_CRYPTO) {
-+ if (hwcap2 & PPC_FEATURE2_HAS_VEC_CRYPTO) {
- info |= CPUINFO_CRYPTO;
- }
- }
diff --git a/emulators/qemu/pkg-plist b/emulators/qemu/pkg-plist
index 6bb413cb53d0..209373d7f881 100644
--- a/emulators/qemu/pkg-plist
+++ b/emulators/qemu/pkg-plist
@@ -1,4 +1,5 @@
%%CURL%%bin/elf2dmp
+%%BSDUSER%%%%NO_X86_TARGETS%%bin/qemu-aarch64
%%BSDUSER%%%%NO_X86_TARGETS%%bin/qemu-arm
bin/qemu-edid
%%BSDUSER%%bin/qemu-i386
@@ -22,7 +23,6 @@ bin/qemu-system-i386
%%NO_X86_TARGETS%%bin/qemu-system-mips64
%%NO_X86_TARGETS%%bin/qemu-system-mips64el
%%NO_X86_TARGETS%%bin/qemu-system-mipsel
-%%NO_X86_TARGETS%%bin/qemu-system-nios2
%%NO_X86_TARGETS%%bin/qemu-system-or1k
%%NO_X86_TARGETS%%bin/qemu-system-ppc
%%NO_X86_TARGETS%%bin/qemu-system-ppc64
@@ -64,6 +64,8 @@ include/qemu-plugin.h
%%DATADIR%%/edk2-i386-secure-code.fd
%%DATADIR%%/edk2-i386-vars.fd
%%DATADIR%%/edk2-licenses.txt
+%%DATADIR%%/edk2-riscv-code.fd
+%%DATADIR%%/edk2-riscv-vars.fd
%%DATADIR%%/edk2-x86_64-code.fd
%%DATADIR%%/edk2-x86_64-secure-code.fd
%%DATADIR%%/efi-e1000.rom