git: 55fa6b6a6d61 - main - emulators/qemu-devel: Update version 8.3.0.20240630=>8.3.0.20240731
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 15 Sep 2024 19:54:54 UTC
The branch main has been updated by bofh:
URL: https://cgit.FreeBSD.org/ports/commit/?id=55fa6b6a6d6168d801afcb78759e31915794994e
commit 55fa6b6a6d6168d801afcb78759e31915794994e
Author: Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2024-09-15 19:53:57 +0000
Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2024-09-15 19:54:38 +0000
emulators/qemu-devel: Update version 8.3.0.20240630=>8.3.0.20240731
---
emulators/qemu-devel/Makefile | 6 ++--
emulators/qemu-devel/distinfo | 30 +++++++++----------
.../qemu-devel/files/patch-util_cpuinfo-ppc.c | 34 ----------------------
emulators/qemu-devel/pkg-plist | 3 ++
4 files changed, 21 insertions(+), 52 deletions(-)
diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile
index 0a3fad114e29..9865c9d96077 100644
--- a/emulators/qemu-devel/Makefile
+++ b/emulators/qemu-devel/Makefile
@@ -1,5 +1,5 @@
PORTNAME= qemu
-DISTVERSION= 8.3.0.20240630
+DISTVERSION= 8.3.0.20240731
CATEGORIES= emulators
PKGNAMESUFFIX= -devel
DIST_SUBDIR= qemu/${PORTVERSION}
@@ -23,11 +23,11 @@ USES= bison compiler:c11 cpe gmake gnome iconv:wchar_t localbase:ldflags \
ninja perl5 pkgconfig python:build shebangfix tar:xz xorg
USE_GITLAB= yes
GL_ACCOUNT= qemu-project
-GL_TAGNAME= b6d32a06fc0984e537091cba08f2e1ed9f775d74
+GL_TAGNAME= e9d2db818ff934afb366aea566d0b33acf7bced1
GL_TUPLE= qemu-project:keycodemapdb:f5772a62ec52591ff6870b7e8ef32482371f22c6:keycodemapdb/subprojects/keycodemapdb \
qemu-project:dtc:b6910bec11614980a21e46fbccc35934b671bd81:dtc/subprojects/dtc \
qemu-project:libvfio-user:0b28d205572c80b568a1003db2c8f37ca333e4d7:libvfio/subprojects/libvfio-user \
- qemu-project:meson:dc1b4be6be321e39d21604ab4287c9ce972be4da:meson/meson \
+ qemu-project:meson:bdc2f2774c35ad2c81e3fea8621fdff6905c021b:meson/meson \
qemu-project:berkeley-softfloat-3:b64af41c3276f97f0e181920400ee056b9c88037:berkeleysoftfloat3/subprojects/berkeley-softfloat-3 \
qemu-project:berkeley-testfloat-3:e7af9751d9f9fd3b47911f51a5cfd08af256a9ab:berkeleytestfloat3/subprojects/berkeley-testfloat-3
USE_GNOME= cairo glib20
diff --git a/emulators/qemu-devel/distinfo b/emulators/qemu-devel/distinfo
index 2fd2dae63f96..f0bf388cfe95 100644
--- a/emulators/qemu-devel/distinfo
+++ b/emulators/qemu-devel/distinfo
@@ -1,15 +1,15 @@
-TIMESTAMP = 1726314789
-SHA256 (qemu/8.3.0.20240630/qemu-project-qemu-b6d32a06fc0984e537091cba08f2e1ed9f775d74_GL0.tar.gz) = 5612653207e00b6f4e0f4846149f688d2fb0dc05d83e4f6f12d5ac93d6d66a7c
-SIZE (qemu/8.3.0.20240630/qemu-project-qemu-b6d32a06fc0984e537091cba08f2e1ed9f775d74_GL0.tar.gz) = 38107529
-SHA256 (qemu/8.3.0.20240630/qemu-project-keycodemapdb-f5772a62ec52591ff6870b7e8ef32482371f22c6_GL0.tar.gz) = d014b53382dbb17b8196ad12f50de7f20d0ef1b9f7d54b0be51a6cbb14209195
-SIZE (qemu/8.3.0.20240630/qemu-project-keycodemapdb-f5772a62ec52591ff6870b7e8ef32482371f22c6_GL0.tar.gz) = 29580
-SHA256 (qemu/8.3.0.20240630/qemu-project-dtc-b6910bec11614980a21e46fbccc35934b671bd81_GL0.tar.gz) = e115f987eec23a1ba25150a46ced1675de3716072d3b4905afb3a9cda0f007c7
-SIZE (qemu/8.3.0.20240630/qemu-project-dtc-b6910bec11614980a21e46fbccc35934b671bd81_GL0.tar.gz) = 205556
-SHA256 (qemu/8.3.0.20240630/qemu-project-libvfio-user-0b28d205572c80b568a1003db2c8f37ca333e4d7_GL0.tar.gz) = d2f60cd4f86f345aab1332953eb736cce3518159e6e99bcc2d10467c06f717fe
-SIZE (qemu/8.3.0.20240630/qemu-project-libvfio-user-0b28d205572c80b568a1003db2c8f37ca333e4d7_GL0.tar.gz) = 189943
-SHA256 (qemu/8.3.0.20240630/qemu-project-meson-dc1b4be6be321e39d21604ab4287c9ce972be4da_GL0.tar.gz) = 297a05a364170f8610758cfdc63124f7d76b03b44241a46f329620c2dc5c72d0
-SIZE (qemu/8.3.0.20240630/qemu-project-meson-dc1b4be6be321e39d21604ab4287c9ce972be4da_GL0.tar.gz) = 4802490
-SHA256 (qemu/8.3.0.20240630/qemu-project-berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037_GL0.tar.gz) = faae889814ea6a292f7ca03d9b36e6c7e95bab2a64777804883cc822b8d48757
-SIZE (qemu/8.3.0.20240630/qemu-project-berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037_GL0.tar.gz) = 148741
-SHA256 (qemu/8.3.0.20240630/qemu-project-berkeley-testfloat-3-e7af9751d9f9fd3b47911f51a5cfd08af256a9ab_GL0.tar.gz) = e7a09d51dc7e96cb8422c919c85fc3833d4f788567638c9162ef5cd7db59b1df
-SIZE (qemu/8.3.0.20240630/qemu-project-berkeley-testfloat-3-e7af9751d9f9fd3b47911f51a5cfd08af256a9ab_GL0.tar.gz) = 139308
+TIMESTAMP = 1726415007
+SHA256 (qemu/8.3.0.20240731/qemu-project-qemu-e9d2db818ff934afb366aea566d0b33acf7bced1_GL0.tar.gz) = 2253fd4db346c53b16146bf061f9da779b98bab8ad60d8f5f7f8ece90f97d3a1
+SIZE (qemu/8.3.0.20240731/qemu-project-qemu-e9d2db818ff934afb366aea566d0b33acf7bced1_GL0.tar.gz) = 38260853
+SHA256 (qemu/8.3.0.20240731/qemu-project-keycodemapdb-f5772a62ec52591ff6870b7e8ef32482371f22c6_GL0.tar.gz) = d014b53382dbb17b8196ad12f50de7f20d0ef1b9f7d54b0be51a6cbb14209195
+SIZE (qemu/8.3.0.20240731/qemu-project-keycodemapdb-f5772a62ec52591ff6870b7e8ef32482371f22c6_GL0.tar.gz) = 29580
+SHA256 (qemu/8.3.0.20240731/qemu-project-dtc-b6910bec11614980a21e46fbccc35934b671bd81_GL0.tar.gz) = e115f987eec23a1ba25150a46ced1675de3716072d3b4905afb3a9cda0f007c7
+SIZE (qemu/8.3.0.20240731/qemu-project-dtc-b6910bec11614980a21e46fbccc35934b671bd81_GL0.tar.gz) = 205556
+SHA256 (qemu/8.3.0.20240731/qemu-project-libvfio-user-0b28d205572c80b568a1003db2c8f37ca333e4d7_GL0.tar.gz) = d2f60cd4f86f345aab1332953eb736cce3518159e6e99bcc2d10467c06f717fe
+SIZE (qemu/8.3.0.20240731/qemu-project-libvfio-user-0b28d205572c80b568a1003db2c8f37ca333e4d7_GL0.tar.gz) = 189943
+SHA256 (qemu/8.3.0.20240731/qemu-project-meson-bdc2f2774c35ad2c81e3fea8621fdff6905c021b_GL0.tar.gz) = 033d79a6c1a3bdb3c83112079f9d0a31438dc17da0c13f71413744c6b1174843
+SIZE (qemu/8.3.0.20240731/qemu-project-meson-bdc2f2774c35ad2c81e3fea8621fdff6905c021b_GL0.tar.gz) = 4809236
+SHA256 (qemu/8.3.0.20240731/qemu-project-berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037_GL0.tar.gz) = faae889814ea6a292f7ca03d9b36e6c7e95bab2a64777804883cc822b8d48757
+SIZE (qemu/8.3.0.20240731/qemu-project-berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037_GL0.tar.gz) = 148741
+SHA256 (qemu/8.3.0.20240731/qemu-project-berkeley-testfloat-3-e7af9751d9f9fd3b47911f51a5cfd08af256a9ab_GL0.tar.gz) = e7a09d51dc7e96cb8422c919c85fc3833d4f788567638c9162ef5cd7db59b1df
+SIZE (qemu/8.3.0.20240731/qemu-project-berkeley-testfloat-3-e7af9751d9f9fd3b47911f51a5cfd08af256a9ab_GL0.tar.gz) = 139308
diff --git a/emulators/qemu-devel/files/patch-util_cpuinfo-ppc.c b/emulators/qemu-devel/files/patch-util_cpuinfo-ppc.c
deleted file mode 100644
index af9999a22108..000000000000
--- a/emulators/qemu-devel/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-devel/pkg-plist b/emulators/qemu-devel/pkg-plist
index cb6a9d1d54a2..5d9064c7f713 100644
--- a/emulators/qemu-devel/pkg-plist
+++ b/emulators/qemu-devel/pkg-plist
@@ -1,5 +1,6 @@
bin/elf2dmp
%%BSDUSER%%bin/qemu-arm
+%%BSDUSER%%bin/qemu-aarch64
bin/qemu-edid
%%BSDUSER%%bin/qemu-i386
bin/qemu-img
@@ -68,6 +69,8 @@ share/man/man7/qemu-storage-daemon-qmp-ref.7.gz
%%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