UPDATE: QEMU 7.0.0

Here is an update to QEMU 7.0.0.

https://wiki.qemu.org/ChangeLog/7.0


Index: Makefile
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/Makefile,v
retrieving revision 1.221
diff -u -p -u -p -r1.221 Makefile
--- Makefile 23 Apr 2022 10:30:24 -0000 1.221
+++ Makefile 23 Apr 2022 18:22:17 -0000
@@ -4,9 +4,7 @@ DPB_PROPERTIES= parallel
COMMENT-main= multi system emulator
COMMENT-ga= QEMU guest agent

-VERSION= 6.2.0
-REVISION-main= 1
-REVISION-ga= 1
+VERSION= 7.0.0
DISTNAME= qemu-${VERSION}
CATEGORIES= emulators
MASTER_SITES= https://download.qemu.org/
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/distinfo,v
retrieving revision 1.65
diff -u -p -u -p -r1.65 distinfo
--- distinfo 24 Dec 2021 03:50:41 -0000 1.65
+++ distinfo 23 Apr 2022 00:51:15 -0000
@@ -1,2 +1,2 @@
-SHA256 (qemu-6.2.0.tar.xz) = aOFdjkWsVjJuC5pK+otJo9/oq6NIgiHQmMhGmLymW0U=
-SIZE (qemu-6.2.0.tar.xz) = 115667324
+SHA256 (qemu-7.0.0.tar.xz) = 9rN1x5UfcoQCeYsLqrsthkeMpT1Eztvvq74cRr9G+Dk=
+SIZE (qemu-7.0.0.tar.xz) = 125117636
Index: patches/patch-audio_audio_c
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-audio_audio_c,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 patch-audio_audio_c
--- patches/patch-audio_audio_c 11 Mar 2022 18:59:40 -0000 1.12
+++ patches/patch-audio_audio_c 17 Mar 2022 00:38:19 -0000
@@ -3,7 +3,7 @@ sndio module
Index: audio/audio.c
--- audio/audio.c.orig
+++ audio/audio.c
-@@ -2005,6 +2005,7 @@ void audio_create_pdos(Audiodev *dev)
+@@ -2025,6 +2025,7 @@ void audio_create_pdos(Audiodev *dev)
CASE(OSS, oss, Oss);
CASE(PA, pa, Pa);
CASE(SDL, sdl, Sdl);
Index: patches/patch-audio_audio_template_h
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-audio_audio_template_h,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 patch-audio_audio_template_h
--- patches/patch-audio_audio_template_h 11 Mar 2022 18:59:40 -0000 1.7
+++ patches/patch-audio_audio_template_h 17 Mar 2022 00:38:16 -0000
@@ -3,7 +3,7 @@ sndio module
Index: audio/audio_template.h
--- audio/audio_template.h.orig
+++ audio/audio_template.h
-@@ -337,6 +337,8 @@ AudiodevPerDirectionOptions *glue(audio_get_pdo_, TYPE
+@@ -336,6 +336,8 @@ AudiodevPerDirectionOptions *glue(audio_get_pdo_, TYPE
return qapi_AudiodevPaPerDirectionOptions_base(dev->u.pa.TYPE);
case AUDIODEV_DRIVER_SDL:
return qapi_AudiodevSdlPerDirectionOptions_base(dev->u.sdl.TYPE);
Index: patches/patch-meson_build
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-meson_build,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-meson_build
--- patches/patch-meson_build 29 Mar 2022 10:04:28 -0000 1.5
+++ patches/patch-meson_build 30 Mar 2022 03:36:40 -0000
@@ -1,11 +1,20 @@
- sndio module
-- localstatedir doesn't belong under prefix
+- localstatedir does not belong under prefix
- Remove hardcoding of optimization

Index: meson.build
--- meson.build.orig
+++ meson.build
-@@ -554,6 +554,11 @@ if not get_option('jack').auto() or have_system
+@@ -73,7 +73,7 @@ have_tools = get_option('tools') \
+ .allowed()
+ have_ga = get_option('guest_agent') \
+ .disable_auto_if(not have_system and not have_tools) \
+- .require(targetos in ['sunos', 'linux', 'windows'],
++ .require(targetos in ['sunos', 'linux', 'openbsd', 'windows'],
+ error_message: 'unsupported OS for QEMU guest agent') \
+ .allowed()
+ have_block = have_system or have_tools
+@@ -598,6 +598,11 @@ if not get_option('jack').auto() or have_system
jack = dependency('jack', required: get_option('jack'),
method: 'pkg-config', kwargs: static_kwargs)
endif
@@ -17,7 +26,7 @@ Index: meson.build

spice_protocol = not_found
if not get_option('spice_protocol').auto() or have_system
-@@ -1311,6 +1316,7 @@ if have_system
+@@ -1382,6 +1387,7 @@ if have_system
'oss': oss.found(),
'pa': pulse.found(),
'sdl': sdl.found(),
@@ -25,7 +34,7 @@ Index: meson.build
}
foreach k, v: audio_drivers_available
config_host_data.set('CONFIG_AUDIO_' + k.to_upper(), v)
-@@ -1318,7 +1324,7 @@ if have_system
+@@ -1389,7 +1395,7 @@ if have_system

# Default to native drivers first, OSS second, SDL third
audio_drivers_priority = \
@@ -34,7 +43,7 @@ Index: meson.build
(targetos == 'linux' ? [] : [ 'sdl' ])
audio_drivers_default = []
foreach k: audio_drivers_priority
-@@ -1418,7 +1424,7 @@ config_host_data.set_quoted('CONFIG_QEMU_FIRMWAREPATH'
+@@ -1492,7 +1498,7 @@ config_host_data.set_quoted('CONFIG_QEMU_FIRMWAREPATH'
config_host_data.set_quoted('CONFIG_QEMU_HELPERDIR', get_option('prefix') / get_option('libexecdir'))
config_host_data.set_quoted('CONFIG_QEMU_ICONDIR', get_option('prefix') / qemu_icondir)
config_host_data.set_quoted('CONFIG_QEMU_LOCALEDIR', get_option('prefix') / get_option('localedir'))
@@ -43,8 +52,8 @@ Index: meson.build
config_host_data.set_quoted('CONFIG_QEMU_MODDIR', get_option('prefix') / qemu_moddir)
config_host_data.set_quoted('CONFIG_SYSCONFDIR', get_option('prefix') / get_option('sysconfdir'))

-@@ -3234,11 +3240,9 @@ if targetos == 'windows'
- endif
+@@ -3524,11 +3530,9 @@ if targetos == 'darwin'
+ summary_info += {'Objective-C compiler': ' '.join(meson.get_compiler('objc').cmd_array())}
endif
summary_info += {'CFLAGS': ' '.join(get_option('c_args')
- + ['-O' + get_option('optimization')]
@@ -54,8 +63,8 @@ Index: meson.build
- + ['-O' + get_option('optimization')]
+ (get_option('debug') ? ['-g'] : []))}
endif
- link_args = get_option(link_language + '_link_args')
-@@ -3385,6 +3389,7 @@ if vnc.found()
+ if targetos == 'darwin'
+@@ -3682,6 +3686,7 @@ if vnc.found()
endif
if targetos not in ['darwin', 'haiku', 'windows']
summary_info += {'OSS support': oss}
Index: patches/patch-meson_options_txt
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-meson_options_txt,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-meson_options_txt
--- patches/patch-meson_options_txt 11 Mar 2022 18:59:40 -0000 1.2
+++ patches/patch-meson_options_txt 17 Mar 2022 00:38:16 -0000
@@ -3,7 +3,7 @@ sndio module
Index: meson_options.txt
--- meson_options.txt.orig
+++ meson_options.txt
-@@ -13,7 +13,7 @@ option('sphinx_build', type : 'string', value : '',
+@@ -17,7 +17,7 @@ option('iasl', type : 'string', value : '',
option('default_devices', type : 'boolean', value : true,
description: 'Include a default selection of devices in emulators')
option('audio_drv_list', type: 'array', value: ['default'],
@@ -12,7 +12,7 @@ Index: meson_options.txt
description: 'Set audio driver list')
option('fuzzing_engine', type : 'string', value : '',
description: 'fuzzing engine library for OSS-Fuzz')
-@@ -184,6 +184,8 @@ option('oss', type: 'feature', value: 'auto',
+@@ -212,6 +212,8 @@ option('oss', type: 'feature', value: 'auto',
description: 'OSS sound support')
option('pa', type: 'feature', value: 'auto',
description: 'PulseAudio sound support')
Index: patches/patch-qapi_audio_json
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-qapi_audio_json,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 patch-qapi_audio_json
--- patches/patch-qapi_audio_json 11 Mar 2022 18:59:40 -0000 1.7
+++ patches/patch-qapi_audio_json 17 Mar 2022 00:38:40 -0000
@@ -3,7 +3,7 @@ sndio module
Index: qapi/audio.json
--- qapi/audio.json.orig
+++ qapi/audio.json
-@@ -106,6 +106,28 @@
+@@ -107,6 +107,28 @@
'*threshold': 'uint32' } }

##
@@ -19,7 +19,7 @@ Index: qapi/audio.json
+#
+# @latency: play buffer size (in microseconds)
+#
-+# Since: 7.0
++# Since: 7.1
+##
+{ 'struct': 'AudiodevSndioOptions',
+ 'data': {
@@ -32,16 +32,16 @@ Index: qapi/audio.json
# @AudiodevCoreaudioPerDirectionOptions:
#
# Options of the Core Audio backend that are used for both playback and
-@@ -387,7 +409,7 @@
+@@ -388,7 +410,7 @@
##
{ 'enum': 'AudiodevDriver',
- 'data': [ 'none', 'alsa', 'coreaudio', 'dsound', 'jack', 'oss', 'pa',
+ 'data': [ 'none', 'alsa', 'coreaudio', 'dbus', 'dsound', 'jack', 'oss', 'pa',
- 'sdl', 'spice', 'wav' ] }
+ 'sdl', 'sndio', 'spice', 'wav' ] }

##
# @Audiodev:
-@@ -417,5 +439,6 @@
+@@ -419,5 +441,6 @@
'oss': 'AudiodevOssOptions',
'pa': 'AudiodevPaOptions',
'sdl': 'AudiodevSdlOptions',
Index: patches/patch-qemu-options_hx
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-qemu-options_hx,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 patch-qemu-options_hx
--- patches/patch-qemu-options_hx 11 Mar 2022 18:59:40 -0000 1.11
+++ patches/patch-qemu-options_hx 17 Mar 2022 00:38:16 -0000
@@ -3,7 +3,7 @@ sndio module
Index: qemu-options.hx
--- qemu-options.hx.orig
+++ qemu-options.hx
-@@ -657,6 +657,9 @@ DEF("audiodev", HAS_ARG, QEMU_OPTION_audiodev,
+@@ -710,6 +710,9 @@ DEF("audiodev", HAS_ARG, QEMU_OPTION_audiodev,
"-audiodev sdl,id=id[,prop[=value][,...]]\n"
" in|out.buffer-count= number of buffers\n"