On Sun, Jun 16, 2024 at 07:38:59AM -0400, Brad Smith wrote:
> Here is an update to QEMU 9.0.1.
>
>
> https://marc.info/?l=qemu-devel&m=171808086221928&w=2
An updated diff rolling in a diff that should fix building on
powerpc/powerpc64 with an issue that popped up with 8.1 and
a hack to resolve an issue naddy@ ran into where the tests
will pull in gtk-vnc if it happens to exis, but then dpb
garbage collected it.
Index: Makefile
===================================================================
RCS file: /cvs/ports/emulators/qemu/Makefile,v
retrieving revision 1.240
diff -u -p -u -p -r1.240 Makefile
--- Makefile 28 May 2024 13:57:37 -0000 1.240
+++ Makefile 22 Jun 2024 09:18:48 -0000
@@ -6,7 +6,7 @@ USE_NOBTCFI= Yes
COMMENT-main= multi system emulator
COMMENT-ga= QEMU guest agent
-VERSION= 9.0.0
+VERSION= 9.0.1
DISTNAME= qemu-${VERSION}
CATEGORIES= emulators
SITES= https://download.qemu.org/
Index: distinfo
===================================================================
RCS file: /cvs/ports/emulators/qemu/distinfo,v
retrieving revision 1.73
diff -u -p -u -p -r1.73 distinfo
--- distinfo 28 May 2024 13:57:37 -0000 1.73
+++ distinfo 22 Jun 2024 09:18:48 -0000
@@ -1,2 +1,2 @@
-SHA256 (qemu-9.0.0.tar.xz) = MnCKxmww2MiSYz6paMdxwcdtWX1w3erSGg0izPOG2mk=
-SIZE (qemu-9.0.0.tar.xz) = 129789856
+SHA256 (qemu-9.0.1.tar.xz) = 0PTbD70VHAzxb4SusqUA9ulQCXMlRvRNr6uNIEm7uAU=
+SIZE (qemu-9.0.1.tar.xz) = 132368412
Index: patches/patch-tests_qtest_meson_build
===================================================================
RCS file: patches/patch-tests_qtest_meson_build
diff -N patches/patch-tests_qtest_meson_build
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-tests_qtest_meson_build 22 Jun 2024 09:18:48 -0000
@@ -0,0 +1,13 @@
+Don't pull in gtk-vnc if it happens to be installed.
+
+Index: tests/qtest/meson.build
+--- tests/qtest/meson.build.orig
++++ tests/qtest/meson.build
+@@ -339,7 +339,6 @@ qtests = {
+ }
+
+ if vnc.found()
+- gvnc = dependency('gvnc-1.0', method: 'pkg-config', required: false)
+ if gvnc.found()
+ qtests += {'vnc-display-test': [gvnc]}
+ qtests_generic += [ 'vnc-display-test' ]
Index: patches/patch-util_cpuinfo-ppc_c
===================================================================
RCS file: patches/patch-util_cpuinfo-ppc_c
diff -N patches/patch-util_cpuinfo-ppc_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-util_cpuinfo-ppc_c 22 Jun 2024 09:18:48 -0000
@@ -0,0 +1,41 @@
+Fix building on powerpc and powerpc64.
+
+Index: util/cpuinfo-ppc.c
+--- util/cpuinfo-ppc.c.orig
++++ util/cpuinfo-ppc.c
+@@ -6,9 +6,11 @@
+ #include "qemu/osdep.h"
+ #include "host/cpuinfo.h"
+
+-#include <asm/cputable.h>
+ #ifdef CONFIG_GETAUXVAL
+ # include <sys/auxv.h>
++# ifdef CONFIG_LINUX
++# include <asm/cputable.h>
++# endif
+ #else
+ # include "elf.h"
+ #endif
+@@ -19,12 +21,13 @@ unsigned cpuinfo;
+ unsigned __attribute__((constructor)) cpuinfo_init(void)
+ {
+ unsigned info = cpuinfo;
+- unsigned long hwcap, hwcap2;
+
+ if (info) {
+ return info;
+ }
+
++#ifdef CONFIG_LINUX
++ unsigned long hwcap, hwcap2;
+ hwcap = qemu_getauxval(AT_HWCAP);
+ hwcap2 = qemu_getauxval(AT_HWCAP2);
+ info = CPUINFO_ALWAYS;
+@@ -58,6 +61,7 @@ unsigned __attribute__((constructor)) cpuinfo_init(voi
+ }
+ }
+ }
++#endif
+
+ cpuinfo = info;
+ return info;
