Re: UPDATE: QEMU 6.1.0

Any QEMU users?

On 8/24/2021 9:07 PM, Brad Smith wrote:
> Here is an update to QEMU 6.1.0.
>
> https://wiki.qemu.org/ChangeLog/6.1
>
>
> Index: Makefile
> ===================================================================
> RCS file: /home/cvs/ports/emulators/qemu/Makefile,v
> retrieving revision 1.212
> diff -u -p -u -p -r1.212 Makefile
> --- Makefile 23 Jul 2021 11:17:17 -0000 1.212
> +++ Makefile 25 Aug 2021 01:06:00 -0000
> @@ -6,15 +6,13 @@ DPB_PROPERTIES= parallel
> COMMENT-main= multi system emulator
> COMMENT-ga= QEMU guest agent
>
> -VERSION= 6.0.0
> +VERSION= 6.1.0
> DISTNAME= qemu-${VERSION}
> PKGNAME-main= ${DISTNAME}
> PKGNAME-ga= qemu-ga-${VERSION}
> CATEGORIES= emulators
> MASTER_SITES= https://download.qemu.org/
> EXTRACT_SUFX= .tar.xz
> -REVISION-ga= 0
> -REVISION-main= 1
>
> HOMEPAGE= https://www.qemu.org/
>
> @@ -24,11 +22,10 @@ MAINTAINER= Brad Smith <brad@comstyle.co
> PERMIT_PACKAGE= Yes
>
> WANTLIB= c glib-2.0 pthread
> -WANTLIB-main= ${COMPILER_LIBCXX} ${WANTLIB} SDL2 X11 bz2 cairo capstone \
> - curl curses epoxy fdt gbm gdk-3 gdk_pixbuf-2.0 gio-2.0 \
> - gnutls gobject-2.0 gtk-3 iconv intl iscsi jpeg lzo2 m \
> - nettle nfs pixman-1 png sndio ssh usb-1.0 util vte-2.91 \
> - xkbcommon z zstd
> +WANTLIB-main= ${COMPILER_LIBCXX} ${WANTLIB} SDL2 X11 bz2 cairo capstone curl \
> + curses epoxy fdt gbm gdk-3 gdk_pixbuf-2.0 gio-2.0 gmodule-2.0 \
> + gnutls gobject-2.0 gtk-3 iconv intl iscsi jpeg lzo2 m nfs \
> + pixman-1 png sndio ssh usb-1.0 util vte-2.91 xkbcommon z zstd
> WANTLIB-ga= ${WANTLIB}
>
> MULTI_PACKAGES= -main -ga
> @@ -63,7 +60,6 @@ LIB_DEPENDS-main= ${LIB_DEPENDS} \
> graphics/png \
> net/curl \
> security/gnutls \
> - security/libnettle \
> security/libssh \
> x11/gtk+3 \
> x11/xkbcommon
> @@ -93,7 +89,6 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \
> --disable-bsd-user \
> --enable-capstone=system \
> --disable-auth-pam \
> - --disable-gcrypt \
> --disable-sdl-image \
> --disable-smartcard \
> --disable-snappy \
> Index: distinfo
> ===================================================================
> RCS file: /home/cvs/ports/emulators/qemu/distinfo,v
> retrieving revision 1.63
> diff -u -p -u -p -r1.63 distinfo
> --- distinfo 2 May 2021 08:15:19 -0000 1.63
> +++ distinfo 24 Aug 2021 23:14:40 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (qemu-6.0.0.tar.xz) = h7waRxyiS5fnAFcRBmAH1ENCPRmqzaPUQlWK4DL6MLk=
> -SIZE (qemu-6.0.0.tar.xz) = 107333232
> +SHA256 (qemu-6.1.0.tar.xz) = 7rwInbNBS77t8eRkvtoKdRWq0w9zJhq8JGybJ1A6PJY=
> +SIZE (qemu-6.1.0.tar.xz) = 111258808
> Index: patches/patch-audio_audio_c
> ===================================================================
> RCS file: /home/cvs/ports/emulators/qemu/patches/patch-audio_audio_c,v
> retrieving revision 1.9
> diff -u -p -u -p -r1.9 patch-audio_audio_c
> --- patches/patch-audio_audio_c 2 May 2021 08:15:19 -0000 1.9
> +++ patches/patch-audio_audio_c 18 Aug 2021 05:29:50 -0000
> @@ -3,7 +3,7 @@ $OpenBSD: patch-audio_audio_c,v 1.9 2021
> Index: audio/audio.c
> --- audio/audio.c.orig
> +++ audio/audio.c
> -@@ -1994,6 +1994,7 @@ void audio_create_pdos(Audiodev *dev)
> +@@ -2005,6 +2005,7 @@ void audio_create_pdos(Audiodev *dev)
> CASE(OSS, oss, Oss);
> CASE(PA, pa, Pa);
> CASE(SDL, sdl, Sdl);
> Index: patches/patch-configure
> ===================================================================
> RCS file: /home/cvs/ports/emulators/qemu/patches/patch-configure,v
> retrieving revision 1.67
> diff -u -p -u -p -r1.67 patch-configure
> --- patches/patch-configure 2 May 2021 08:15:19 -0000 1.67
> +++ patches/patch-configure 5 Aug 2021 23:48:50 -0000
> @@ -5,7 +5,7 @@ sndio module
> Index: configure
> --- configure.orig
> +++ configure
> -@@ -763,8 +763,8 @@ NetBSD)
> +@@ -743,8 +743,8 @@ NetBSD)
> OpenBSD)
> bsd="yes"
> make="${MAKE-gmake}"
> @@ -16,7 +16,7 @@ Index: configure
> ;;
> Darwin)
> bsd="yes"
> -@@ -3246,6 +3246,24 @@ for drv in $audio_drv_list; do
> +@@ -3066,6 +3066,24 @@ for drv in $audio_drv_list; do
> fi
> ;;
>
> @@ -41,7 +41,7 @@ Index: configure
> coreaudio | try-coreaudio)
> if test "$coreaudio" = "no"; then
> if test "$drv" = "try-coreaudio"; then
> -@@ -5299,7 +5317,6 @@ write_c_skeleton
> +@@ -4299,7 +4317,6 @@ write_c_skeleton
> if test "$gcov" = "yes" ; then
> :
> elif test "$fortify_source" = "yes" ; then
> @@ -49,7 +49,7 @@ Index: configure
> debug=no
> fi
>
> -@@ -5562,6 +5579,11 @@ echo "PULSE_CFLAGS=$pulse_cflags" >> $config_host_mak
> +@@ -4565,6 +4582,11 @@ echo "PULSE_CFLAGS=$pulse_cflags" >> $config_host_mak
> echo "COREAUDIO_LIBS=$coreaudio_libs" >> $config_host_mak
> echo "DSOUND_LIBS=$dsound_libs" >> $config_host_mak
> echo "OSS_LIBS=$oss_libs" >> $config_host_mak
> Index: patches/patch-meson_build
> ===================================================================
> RCS file: /home/cvs/ports/emulators/qemu/patches/patch-meson_build,v
> retrieving revision 1.1
> diff -u -p -u -p -r1.1 patch-meson_build
> --- patches/patch-meson_build 2 May 2021 08:15:19 -0000 1.1
> +++ patches/patch-meson_build 5 Aug 2021 23:48:47 -0000
> @@ -7,7 +7,7 @@ $OpenBSD: patch-meson_build,v 1.1 2021/0
> Index: meson.build
> --- meson.build.orig
> +++ meson.build
> -@@ -444,6 +444,11 @@ jack = not_found
> +@@ -441,6 +441,11 @@ jack = not_found
> if 'CONFIG_LIBJACK' in config_host
> jack = declare_dependency(link_args: config_host['JACK_LIBS'].split())
> endif
> @@ -18,8 +18,8 @@ Index: meson.build
> +endif
> spice = not_found
> spice_headers = not_found
> - if 'CONFIG_SPICE' in config_host
> -@@ -590,7 +595,7 @@ if have_system and not get_option('curses').disabled()
> + spice_protocol = not_found
> +@@ -596,7 +601,7 @@ if have_system and not get_option('curses').disabled()
> endif
> endforeach
> msg = get_option('curses').enabled() ? 'curses library not found' : ''
> @@ -28,9 +28,9 @@ Index: meson.build
> if curses.found()
> if cc.links(curses_test, args: curses_compile_args, dependencies: [curses])
> curses = declare_dependency(compile_args: curses_compile_args, dependencies: [curses])
> -@@ -2510,11 +2515,9 @@ if targetos == 'windows'
> +@@ -2907,11 +2912,9 @@ if targetos == 'windows'
> + endif
> endif
> - summary_info += {'ARFLAGS': config_host['ARFLAGS']}
> summary_info += {'CFLAGS': ' '.join(get_option('c_args')
> - + ['-O' + get_option('optimization')]
> + (get_option('debug') ? ['-g'] : []))}
> Index: patches/patch-qemu-options_hx
> ===================================================================
> RCS file: /home/cvs/ports/emulators/qemu/patches/patch-qemu-options_hx,v
> retrieving revision 1.8
> diff -u -p -u -p -r1.8 patch-qemu-options_hx
> --- patches/patch-qemu-options_hx 2 May 2021 08:15:19 -0000 1.8
> +++ patches/patch-qemu-options_hx 28 Jul 2021 22:51:29 -0000
> @@ -3,7 +3,7 @@ $OpenBSD: patch-qemu-options_hx,v 1.8 20
> Index: qemu-options.hx
> --- qemu-options.hx.orig
> +++ qemu-options.hx
> -@@ -614,6 +614,9 @@ DEF("audiodev", HAS_ARG, QEMU_OPTION_audiodev,
> +@@ -643,6 +643,9 @@ DEF("audiodev", HAS_ARG, QEMU_OPTION_audiodev,
> "-audiodev sdl,id=id[,prop[=value][,...]]\n"
> " in|out.buffer-count= number of buffers\n"
>