On Thu, Apr 01, 2021 at 12:43:41AM -0400, Brad Smith wrote:
> On Sat, Mar 27, 2021 at 02:31:16PM -0400, Brad Smith wrote:
> > Here is a work in progress update to QEMU 6.0.0-rc0.
> >
> > I was able to fix the library detection for a few dependencies,
> > the optimization level being hardcoded and Meson was linking
> > libstdc++ when utilizing Clang (proabably due to only testing
> > on Linux).
> >
> > I'm really hating this conversion to Meson. It really does some
> > oddball crap.
> >
> > Testing and feedback welcome.
>
> Updated for rc1.
Updated for rc2.
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/Makefile,v
retrieving revision 1.206
diff -u -p -u -p -r1.206 Makefile
--- Makefile 28 Feb 2021 18:38:41 -0000 1.206
+++ Makefile 6 Apr 2021 23:12:56 -0000
@@ -6,11 +6,10 @@ DPB_PROPERTIES= parallel
COMMENT-main= multi system emulator
COMMENT-ga= QEMU guest agent
-VERSION= 5.1.0
-DISTNAME= qemu-5.1.0
-PKGNAME-main= qemu-${VERSION}
+VERSION= 6.0.0-rc2
+DISTNAME= qemu-${VERSION}
+PKGNAME-main= ${DISTNAME}
PKGNAME-ga= qemu-ga-${VERSION}
-REVISION-main= 3
CATEGORIES= emulators
MASTER_SITES= https://download.qemu.org/
EXTRACT_SUFX= .tar.xz
@@ -22,12 +21,11 @@ MAINTAINER= Brad Smith <[email protected]
# GPLv2, LGPLv2 and BSD
PERMIT_PACKAGE= Yes
-WANTLIB= ${COMPILER_LIBCXX} c glib-2.0 gthread-2.0 intl m
-WANTLIB-main= ${WANTLIB} SDL2 X11 atk-1.0 bz2 c cairo cairo-gobject capstone \
- curl curses epoxy fdt gbm gdk-3 gdk_pixbuf-2.0 gio-2.0 gnutls \
- gobject-2.0 gtk-3 harfbuzz iconv iscsi jpeg lzo2 nettle nfs \
- pango-1.0 pangocairo-1.0 pixman-1 png sndio ssh usb-1.0 util \
- vte-2.91 xkbcommon xml2 z zstd
+WANTLIB= c gio-2.0 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 gnutls gobject-2.0 \
+ gthread-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-ga= ${WANTLIB}
MULTI_PACKAGES= -main -ga
@@ -39,11 +37,11 @@ MODULES= lang/python
MODPY_RUNDEP= No
BUILD_DEPENDS= devel/gettext,-tools \
+ devel/ninja \
textproc/py-sphinx${MODPY_FLAVOR}>=3.5.1
RUN_DEPENDS-main= ${BUILD_PKGPATH}-ga
-LIB_DEPENDS= devel/gettext,-runtime \
- devel/glib2
+LIB_DEPENDS= devel/glib2
LIB_DEPENDS-main= ${LIB_DEPENDS} \
archivers/bzip2 \
archivers/lzo2 \
@@ -51,6 +49,7 @@ LIB_DEPENDS-main= ${LIB_DEPENDS} \
converters/libiconv \
devel/capstone/main \
devel/dtc \
+ devel/gettext,-runtime \
devel/libiscsi \
devel/libnfs \
devel/libusb1 \
@@ -70,18 +69,16 @@ LIB_DEPENDS-ga= ${LIB_DEPENDS}
MAKE_ENV= V=1
FAKE_FLAGS= qemu_confdir=${PREFIX}/share/examples/qemu
-EXTRA_CFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include
-EXTRA_LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib
-
-# fix build with ancient ncurses. ncurses needs to be updated to 5.9 or newer.
-EXTRA_CFLAGS+= -D_XOPEN_SOURCE_EXTENDED
+CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib
# until the system headers are fixed properly.
-EXTRA_CFLAGS+= -Wno-redundant-decls
+CFLAGS+= -Wno-redundant-decls
SEPARATE_BUILD= Yes
USE_GMAKE= Yes
CONFIGURE_STYLE=simple
+CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --prefix=${PREFIX} \
--sysconfdir=${SYSCONFDIR} \
--mandir=${PREFIX}/man \
@@ -90,11 +87,8 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \
--cc="${CC}" \
--cxx="${CXX}" \
--host-cc="${CC}" \
- --extra-cflags="${EXTRA_CFLAGS}" \
- --extra-ldflags="${EXTRA_LDFLAGS}" \
--disable-bsd-user \
--enable-capstone=system \
- --enable-curses \
--disable-auth-pam \
--disable-gcrypt \
--disable-sdl-image \
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/distinfo,v
retrieving revision 1.62
diff -u -p -u -p -r1.62 distinfo
--- distinfo 17 Aug 2020 09:58:44 -0000 1.62
+++ distinfo 6 Apr 2021 23:13:13 -0000
@@ -1,2 +1,2 @@
-SHA256 (qemu-5.1.0.tar.xz) = yRdOtZM9nrXmH1Qc1tEYTNMRjf5MXElVvBvcTTkPpOU=
-SIZE (qemu-5.1.0.tar.xz) = 62911540
+SHA256 (qemu-6.0.0-rc2.tar.xz) = a7oEJnQha8owZLtfClNtgfHWZXUPLgx+H6jjsaKypdA=
+SIZE (qemu-6.0.0-rc2.tar.xz) = 107320456
Index: patches/patch-audio_Makefile_objs
===================================================================
RCS file: patches/patch-audio_Makefile_objs
diff -N patches/patch-audio_Makefile_objs
--- patches/patch-audio_Makefile_objs 17 Aug 2020 09:58:44 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-audio_Makefile_objs,v 1.3 2020/08/17 09:58:44 sthen Exp $
-
-sndio module
-
-Index: audio/Makefile.objs
---- audio/Makefile.objs.orig
-+++ audio/Makefile.objs
-@@ -29,6 +29,11 @@ sdl.mo-objs = sdlaudio.o
- sdl.mo-cflags := $(SDL_CFLAGS)
- sdl.mo-libs := $(SDL_LIBS)
-
-+# sndio module
-+common-obj-$(CONFIG_AUDIO_SNDIO) += sndio.mo
-+sndio.mo-objs = sndioaudio.o
-+sndio.mo-libs := $(SNDIO_LIBS)
-+
- # jack module
- common-obj-$(CONFIG_AUDIO_JACK) += jack.mo
- jack.mo-objs = jackaudio.o
Index: patches/patch-audio_audio_c
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-audio_audio_c,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 patch-audio_audio_c
--- patches/patch-audio_audio_c 17 Aug 2020 09:58:44 -0000 1.8
+++ patches/patch-audio_audio_c 27 Mar 2021 00:12:30 -0000
@@ -3,10 +3,10 @@ $OpenBSD: patch-audio_audio_c,v 1.8 2020
Index: audio/audio.c
--- audio/audio.c.orig
+++ audio/audio.c
-@@ -1973,6 +1973,7 @@ void audio_create_pdos(Audiodev *dev)
+@@ -1994,6 +1994,7 @@ void audio_create_pdos(Audiodev *dev)
CASE(OSS, oss, Oss);
CASE(PA, pa, Pa);
- CASE(SDL, sdl, );
+ CASE(SDL, sdl, Sdl);
+ CASE(SNDIO, sndio, );
CASE(SPICE, spice, );
CASE(WAV, wav, );
Index: patches/patch-audio_audio_template_h
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-audio_audio_template_h,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-audio_audio_template_h
--- patches/patch-audio_audio_template_h 17 Aug 2020 09:58:44 -0000
1.4
+++ patches/patch-audio_audio_template_h 27 Mar 2021 00:12:25 -0000
@@ -3,10 +3,10 @@ $OpenBSD: patch-audio_audio_template_h,v
Index: audio/audio_template.h
--- audio/audio_template.h.orig
+++ audio/audio_template.h
-@@ -338,6 +338,8 @@ AudiodevPerDirectionOptions *glue(audio_get_pdo_, TYPE
+@@ -337,6 +337,8 @@ AudiodevPerDirectionOptions *glue(audio_get_pdo_, TYPE
return qapi_AudiodevPaPerDirectionOptions_base(dev->u.pa.TYPE);
case AUDIODEV_DRIVER_SDL:
- return dev->u.sdl.TYPE;
+ return qapi_AudiodevSdlPerDirectionOptions_base(dev->u.sdl.TYPE);
+ case AUDIODEV_DRIVER_SNDIO:
+ return dev->u.sndio.TYPE;
case AUDIODEV_DRIVER_SPICE:
Index: patches/patch-audio_meson_build
===================================================================
RCS file: patches/patch-audio_meson_build
diff -N patches/patch-audio_meson_build
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-audio_meson_build 28 Feb 2021 19:11:41 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+sndio module
+
+Index: audio/meson.build
+--- audio/meson.build.orig
++++ audio/meson.build
+@@ -17,6 +17,7 @@ foreach m : [
+ ['CONFIG_AUDIO_OSS', 'oss', oss, 'ossaudio.c'],
+ ['CONFIG_AUDIO_PA', 'pa', pulse, 'paaudio.c'],
+ ['CONFIG_AUDIO_SDL', 'sdl', sdl, 'sdlaudio.c'],
++ ['CONFIG_AUDIO_SNDIO', 'sndio', sndio, 'sndioaudio.c'],
+ ['CONFIG_AUDIO_JACK', 'jack', jack, 'jackaudio.c'],
+ ['CONFIG_SPICE', 'spice', spice, 'spiceaudio.c']
+ ]
Index: patches/patch-configure
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-configure,v
retrieving revision 1.66
diff -u -p -u -p -r1.66 patch-configure
--- patches/patch-configure 17 Aug 2020 09:58:44 -0000 1.66
+++ patches/patch-configure 27 Mar 2021 00:12:25 -0000
@@ -5,7 +5,7 @@ sndio module
Index: configure
--- configure.orig
+++ configure
-@@ -857,8 +857,8 @@ NetBSD)
+@@ -763,8 +763,8 @@ NetBSD)
OpenBSD)
bsd="yes"
make="${MAKE-gmake}"
@@ -13,10 +13,10 @@ Index: configure
- audio_possible_drivers="sdl"
+ audio_drv_list="sndio"
+ audio_possible_drivers="sndio"
- HOST_VARIANT_DIR="openbsd"
- supported_os="yes"
;;
-@@ -3690,6 +3690,24 @@ fi
+ Darwin)
+ bsd="yes"
+@@ -3193,6 +3193,24 @@ fi
##########################################
# Sound support libraries probe
@@ -41,7 +41,7 @@ Index: configure
audio_drv_list=$(echo "$audio_drv_list" | sed -e 's/,/ /g')
for drv in $audio_drv_list; do
case $drv in
-@@ -3739,6 +3757,23 @@ for drv in $audio_drv_list; do
+@@ -3246,6 +3264,23 @@ for drv in $audio_drv_list; do
fi
;;
@@ -62,34 +62,22 @@ Index: configure
+ fi
+ ;;
+
- coreaudio)
- coreaudio_libs="-framework CoreAudio"
- ;;
-@@ -6524,10 +6559,6 @@ write_c_skeleton
+ coreaudio | try-coreaudio)
+ if test "$coreaudio" = "no"; then
+ if test "$drv" = "try-coreaudio"; then
+@@ -5299,7 +5334,6 @@ write_c_skeleton
if test "$gcov" = "yes" ; then
- QEMU_CFLAGS="-fprofile-arcs -ftest-coverage -g $QEMU_CFLAGS"
- QEMU_LDFLAGS="-fprofile-arcs -ftest-coverage $QEMU_LDFLAGS"
--elif test "$fortify_source" = "yes" ; then
-- CFLAGS="-O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $CFLAGS"
--elif test "$debug" = "no"; then
-- CFLAGS="-O2 $CFLAGS"
+ :
+ elif test "$fortify_source" = "yes" ; then
+- QEMU_CFLAGS="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $QEMU_CFLAGS"
+ debug=no
fi
- if test "$have_asan" = "yes"; then
-@@ -7182,7 +7213,7 @@ echo "CONFIG_AUDIO_DRIVERS=$audio_drv_list" >> $config
- for drv in $audio_drv_list; do
- def=CONFIG_AUDIO_$(echo $drv | LC_ALL=C tr '[a-z]' '[A-Z]')
- case "$drv" in
-- alsa | oss | pa | sdl)
-+ alsa | oss | pa | sdl | sndio)
- echo "$def=m" >> $config_host_mak ;;
- *)
- echo "$def=y" >> $config_host_mak ;;
-@@ -7193,6 +7224,7 @@ echo "PULSE_LIBS=$pulse_libs" >> $config_host_mak
+@@ -5562,6 +5596,7 @@ 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
+echo "SNDIO_LIBS=$sndio_libs" >> $config_host_mak
- echo "JACK_LIBS=$jack_libs" >> $config_host_mak
- if test "$audio_win_int" = "yes" ; then
- echo "CONFIG_AUDIO_WIN_INT=y" >> $config_host_mak
+ if test "$libjack" = "yes" ; then
+ echo "CONFIG_LIBJACK=y" >> $config_host_mak
+ fi
Index: patches/patch-hw_hppa_lasi_c
===================================================================
RCS file: patches/patch-hw_hppa_lasi_c
diff -N patches/patch-hw_hppa_lasi_c
--- patches/patch-hw_hppa_lasi_c 7 Oct 2020 19:55:57 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,33 +0,0 @@
-$OpenBSD: patch-hw_hppa_lasi_c,v 1.1 2020/10/07 19:55:57 cwen Exp $
-
-From upstream commit b899fe41:
-
-OpenBSD initializes the LASI IMR value with 0xffffffff to disable all LASI
-interrupts. This triggered an assert() and stopped the emulation. By replacing
-the check with a warning in the guest log we now allow OpenBSD to boot again.
-
-Index: hw/hppa/lasi.c
---- hw/hppa/lasi.c.orig
-+++ hw/hppa/lasi.c
-@@ -11,6 +11,7 @@
-
- #include "qemu/osdep.h"
- #include "qemu/units.h"
-+#include "qemu/log.h"
- #include "qapi/error.h"
- #include "cpu.h"
- #include "trace.h"
-@@ -172,8 +173,11 @@ static MemTxResult lasi_chip_write_with_attrs(void *op
- /* read-only. */
- break;
- case LASI_IMR:
-- s->imr = val; /* 0x20 ?? */
-- assert((val & LASI_IRQ_BITS) == val);
-+ s->imr = val;
-+ if (((val & LASI_IRQ_BITS) != val) && (val != 0xffffffff))
-+ qemu_log_mask(LOG_GUEST_ERROR,
-+ "LASI: tried to set invalid %lx IMR value.\n",
-+ (unsigned long) val);
- break;
- case LASI_IPR:
- /* Any write to IPR clears the register. */
Index: patches/patch-meson_build
===================================================================
RCS file: patches/patch-meson_build
diff -N patches/patch-meson_build
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-meson_build 27 Mar 2021 04:46:07 -0000
@@ -0,0 +1,41 @@
+$OpenBSD$
+
+- Fix curses build on OpenBSD
+- sndio module
+- Remove hardcoding of optimization
+
+Index: meson.build
+--- meson.build.orig
++++ meson.build
+@@ -590,7 +590,7 @@ if have_system and not get_option('curses').disabled()
+ endif
+ endforeach
+ msg = get_option('curses').enabled() ? 'curses library not found' : ''
+- curses_compile_args = ['-DNCURSES_WIDECHAR']
++ curses_compile_args = ['-D_XOPEN_SOURCE_EXTENDED -DNCURSES_WIDECHAR']
+ if curses.found()
+ if cc.links(curses_test, args: curses_compile_args, dependencies:
[curses])
+ curses = declare_dependency(compile_args: curses_compile_args,
dependencies: [curses])
+@@ -803,6 +803,10 @@ dsound = not_found
+ if 'CONFIG_AUDIO_DSOUND' in config_host
+ dsound = declare_dependency(link_args: config_host['DSOUND_LIBS'].split())
+ endif
++sndio = not_found
++if 'CONFIG_AUDIO_SNDIO' in config_host
++ sndio = declare_dependency(link_args: config_host['SNDIO_LIBS'].split())
++endif
+ coreaudio = not_found
+ if 'CONFIG_AUDIO_COREAUDIO' in config_host
+ coreaudio = declare_dependency(link_args:
config_host['COREAUDIO_LIBS'].split())
+@@ -2510,11 +2514,9 @@ if targetos == 'windows'
+ endif
+ summary_info += {'ARFLAGS': config_host['ARFLAGS']}
+ summary_info += {'CFLAGS': ' '.join(get_option('c_args')
+- + ['-O' +
get_option('optimization')]
+ + (get_option('debug') ?
['-g'] : []))}
+ if link_language == 'cpp'
+ summary_info += {'CXXFLAGS': ' '.join(get_option('cpp_args')
+- + ['-O' +
get_option('optimization')]
+ + (get_option('debug') ?
['-g'] : []))}
+ endif
+ link_args = get_option(link_language + '_link_args')
Index: patches/patch-meson_mesonbuild_compilers_cpp_py
===================================================================
RCS file: patches/patch-meson_mesonbuild_compilers_cpp_py
diff -N patches/patch-meson_mesonbuild_compilers_cpp_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-meson_mesonbuild_compilers_cpp_py 27 Mar 2021 05:49:15
-0000
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: meson/mesonbuild/compilers/cpp.py
+--- meson/mesonbuild/compilers/cpp.py.orig
++++ meson/mesonbuild/compilers/cpp.py
+@@ -210,7 +210,7 @@ class ClangCPPCompiler(ClangCompiler, CPPCompiler):
+ return []
+
+ def language_stdlib_only_link_flags(self):
+- return ['-lstdc++']
++ return ['-lc++']
+
+
+ class AppleClangCPPCompiler(ClangCPPCompiler):
+@@ -346,7 +346,7 @@ class GnuCPPCompiler(GnuCompiler, CPPCompiler):
+ return ['-fpch-preprocess', '-include', os.path.basename(header)]
+
+ def language_stdlib_only_link_flags(self):
+- return ['-lstdc++']
++ return ['-lestdc++']
+
+
+ class PGICPPCompiler(PGICompiler, CPPCompiler):
Index: patches/patch-qapi_audio_json
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-qapi_audio_json,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-qapi_audio_json
--- patches/patch-qapi_audio_json 17 Aug 2020 09:58:44 -0000 1.4
+++ patches/patch-qapi_audio_json 27 Mar 2021 00:12:25 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-qapi_audio_json,v 1.4 20
Index: qapi/audio.json
--- qapi/audio.json.orig
+++ qapi/audio.json
-@@ -102,6 +102,28 @@
+@@ -106,6 +106,28 @@
'*threshold': 'uint32' } }
##
@@ -32,7 +32,7 @@ Index: qapi/audio.json
# @AudiodevCoreaudioPerDirectionOptions:
#
# Options of the Core Audio backend that are used for both playback and
-@@ -352,7 +374,7 @@
+@@ -387,7 +409,7 @@
##
{ 'enum': 'AudiodevDriver',
'data': [ 'none', 'alsa', 'coreaudio', 'dsound', 'jack', 'oss', 'pa',
@@ -41,10 +41,10 @@ Index: qapi/audio.json
##
# @Audiodev:
-@@ -382,5 +404,6 @@
+@@ -417,5 +439,6 @@
'oss': 'AudiodevOssOptions',
'pa': 'AudiodevPaOptions',
- 'sdl': 'AudiodevGenericOptions',
+ 'sdl': 'AudiodevSdlOptions',
+ 'sndio': 'AudiodevSndioOptions',
'spice': 'AudiodevGenericOptions',
'wav': 'AudiodevWavOptions' } }
Index: patches/patch-qemu-options_hx
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-qemu-options_hx,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 patch-qemu-options_hx
--- patches/patch-qemu-options_hx 17 Aug 2020 09:58:44 -0000 1.7
+++ patches/patch-qemu-options_hx 27 Mar 2021 00:12:25 -0000
@@ -3,9 +3,9 @@ $OpenBSD: patch-qemu-options_hx,v 1.7 20
Index: qemu-options.hx
--- qemu-options.hx.orig
+++ qemu-options.hx
-@@ -590,6 +590,9 @@ DEF("audiodev", HAS_ARG, QEMU_OPTION_audiodev,
- #ifdef CONFIG_AUDIO_SDL
+@@ -614,6 +614,9 @@ DEF("audiodev", HAS_ARG, QEMU_OPTION_audiodev,
"-audiodev sdl,id=id[,prop[=value][,...]]\n"
+ " in|out.buffer-count= number of buffers\n"
#endif
+#ifdef CONFIG_AUDIO_SNDIO
+ "-audiodev sndio,id=id[,prop[=value][,...]]\n"
@@ -13,10 +13,10 @@ Index: qemu-options.hx
#ifdef CONFIG_SPICE
"-audiodev spice,id=id[,prop[=value][,...]]\n"
#endif
-@@ -747,6 +750,11 @@ SRST
- Creates a backend using SDL. This backend is available on most
- systems, but you should use your platform's native backend if
- possible. This backend has no backend specific properties.
+@@ -776,6 +779,11 @@ SRST
+
+ ``in|out.buffer-count=count``
+ Sets the count of the buffers.
+
+``-audiodev sndio,id=id[,prop[=value][,...]]``
+ Creates a backend using SNDIO. This backend is available on
Index: patches/patch-tcg_ppc_tcg-target_c_inc
===================================================================
RCS file: patches/patch-tcg_ppc_tcg-target_c_inc
diff -N patches/patch-tcg_ppc_tcg-target_c_inc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-tcg_ppc_tcg-target_c_inc 28 Feb 2021 19:11:41 -0000
@@ -0,0 +1,19 @@
+$OpenBSD$
+
+Workaround the lack of _CALL_SYSV with clang on powerpc
+
+Index: tcg/ppc/tcg-target.c.inc
+--- tcg/ppc/tcg-target.c.inc.orig
++++ tcg/ppc/tcg-target.c.inc
+@@ -25,6 +25,11 @@
+ #include "elf.h"
+ #include "../tcg-pool.c.inc"
+
++/* Clang does not define _CALL_* */
++#if defined __clang__ && defined __ELF__
++#define _CALL_SYSV 1
++#endif
++
+ #if defined _CALL_DARWIN || defined __APPLE__
+ #define TCG_TARGET_CALL_DARWIN
+ #endif
Index: patches/patch-tcg_ppc_tcg-target_inc_c
===================================================================
RCS file: patches/patch-tcg_ppc_tcg-target_inc_c
diff -N patches/patch-tcg_ppc_tcg-target_inc_c
--- patches/patch-tcg_ppc_tcg-target_inc_c 15 May 2020 07:26:41 -0000
1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-tcg_ppc_tcg-target_inc_c,v 1.7 2020/05/15 07:26:41 ajacoutot
Exp $
-
-Workaround the lack of _CALL_SYSV with clang on powerpc
-
-Index: tcg/ppc/tcg-target.inc.c
---- tcg/ppc/tcg-target.inc.c.orig
-+++ tcg/ppc/tcg-target.inc.c
-@@ -25,6 +25,11 @@
- #include "elf.h"
- #include "../tcg-pool.inc.c"
-
-+/* clang does not define _CALL_* */
-+#if defined __clang__ && defined __ELF__
-+#define _CALL_SYSV 1
-+#endif
-+
- #if defined _CALL_DARWIN || defined __APPLE__
- #define TCG_TARGET_CALL_DARWIN
- #endif
Index: pkg/PLIST-ga
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/pkg/PLIST-ga,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 PLIST-ga
--- pkg/PLIST-ga 28 Feb 2021 18:38:41 -0000 1.1
+++ pkg/PLIST-ga 27 Mar 2021 01:15:07 -0000
@@ -4,5 +4,4 @@
@man man/man7/qemu-ga-ref.7
@man man/man8/qemu-ga.8
share/doc/qemu/interop/qemu-ga-ref.html
-share/doc/qemu/interop/qemu-ga-ref.txt
share/doc/qemu/interop/qemu-ga.html
Index: pkg/PLIST-main
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/pkg/PLIST-main,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 PLIST-main
--- pkg/PLIST-main 28 Feb 2021 18:38:41 -0000 1.1
+++ pkg/PLIST-main 7 Apr 2021 00:04:06 -0000
@@ -14,7 +14,6 @@
@bin bin/qemu-system-cris
@bin bin/qemu-system-hppa
@bin bin/qemu-system-i386
-@bin bin/qemu-system-lm32
@bin bin/qemu-system-m68k
@bin bin/qemu-system-microblaze
@bin bin/qemu-system-microblazeel
@@ -36,99 +35,95 @@
@bin bin/qemu-system-sparc
@bin bin/qemu-system-sparc64
@bin bin/qemu-system-tricore
-@bin bin/qemu-system-unicore32
@bin bin/qemu-system-x86_64
@bin bin/qemu-system-xtensa
@bin bin/qemu-system-xtensaeb
@man man/man1/qemu-img.1
+@man man/man1/qemu-storage-daemon.1
@man man/man1/qemu.1
@man man/man7/qemu-block-drivers.7
@man man/man7/qemu-cpu-models.7
@man man/man7/qemu-qmp-ref.7
+@man man/man7/qemu-storage-daemon-qmp-ref.7
@man man/man8/qemu-nbd.8
+@man man/man8/qemu-pr-helper.8
share/applications/qemu.desktop
share/doc/pkg-readmes/${PKGSTEM}
share/doc/qemu/
+share/doc/qemu/.buildinfo
+share/doc/qemu/_static/
+share/doc/qemu/_static/alabaster.css
+share/doc/qemu/_static/basic.css
+share/doc/qemu/_static/custom.css
+share/doc/qemu/_static/doctools.js
+share/doc/qemu/_static/documentation_options.js
+share/doc/qemu/_static/file.png
+share/doc/qemu/_static/jquery-3.5.1.js
+share/doc/qemu/_static/jquery.js
+share/doc/qemu/_static/language_data.js
+share/doc/qemu/_static/minus.png
+share/doc/qemu/_static/plus.png
+share/doc/qemu/_static/pygments.css
+share/doc/qemu/_static/searchtools.js
+share/doc/qemu/_static/underscore-1.12.0.js
+share/doc/qemu/_static/underscore.js
+share/doc/qemu/devel/
+share/doc/qemu/devel/atomics.html
+share/doc/qemu/devel/bitops.html
+share/doc/qemu/devel/block-coroutine-wrapper.html
+share/doc/qemu/devel/build-system.html
+share/doc/qemu/devel/clocks.html
+share/doc/qemu/devel/code-of-conduct.html
+share/doc/qemu/devel/conflict-resolution.html
+share/doc/qemu/devel/control-flow-integrity.html
+share/doc/qemu/devel/decodetree.html
+share/doc/qemu/devel/fuzzing.html
+share/doc/qemu/devel/index.html
+share/doc/qemu/devel/kconfig.html
+share/doc/qemu/devel/loads-stores.html
+share/doc/qemu/devel/memory.html
+share/doc/qemu/devel/migration.html
+share/doc/qemu/devel/multi-process.html
+share/doc/qemu/devel/multi-thread-tcg.html
+share/doc/qemu/devel/qgraph.html
+share/doc/qemu/devel/qom.html
+share/doc/qemu/devel/qtest.html
+share/doc/qemu/devel/reset.html
+share/doc/qemu/devel/s390-dasd-ipl.html
+share/doc/qemu/devel/secure-coding-practices.html
+share/doc/qemu/devel/stable-process.html
+share/doc/qemu/devel/style.html
+share/doc/qemu/devel/tcg-icount.html
+share/doc/qemu/devel/tcg-plugins.html
+share/doc/qemu/devel/tcg.html
+share/doc/qemu/devel/testing.html
+share/doc/qemu/devel/tracing.html
+share/doc/qemu/genindex.html
share/doc/qemu/index.html
share/doc/qemu/interop/
-share/doc/qemu/interop/.buildinfo
-share/doc/qemu/interop/_static/
-share/doc/qemu/interop/_static/alabaster.css
-share/doc/qemu/interop/_static/basic.css
-share/doc/qemu/interop/_static/custom.css
-share/doc/qemu/interop/_static/doctools.js
-share/doc/qemu/interop/_static/documentation_options.js
-share/doc/qemu/interop/_static/file.png
-share/doc/qemu/interop/_static/jquery-3.5.1.js
-share/doc/qemu/interop/_static/jquery.js
-share/doc/qemu/interop/_static/language_data.js
-share/doc/qemu/interop/_static/minus.png
-share/doc/qemu/interop/_static/plus.png
-share/doc/qemu/interop/_static/pygments.css
-share/doc/qemu/interop/_static/searchtools.js
-share/doc/qemu/interop/_static/underscore-1.12.0.js
-share/doc/qemu/interop/_static/underscore.js
share/doc/qemu/interop/bitmaps.html
share/doc/qemu/interop/dbus-vmstate.html
share/doc/qemu/interop/dbus.html
-share/doc/qemu/interop/genindex.html
share/doc/qemu/interop/index.html
share/doc/qemu/interop/live-block-operations.html
-share/doc/qemu/interop/objects.inv
share/doc/qemu/interop/pr-helper.html
share/doc/qemu/interop/qemu-qmp-ref.html
-share/doc/qemu/interop/qemu-qmp-ref.txt
-share/doc/qemu/interop/search.html
-share/doc/qemu/interop/searchindex.js
+share/doc/qemu/interop/qemu-storage-daemon-qmp-ref.html
share/doc/qemu/interop/vhost-user-gpu.html
share/doc/qemu/interop/vhost-user.html
share/doc/qemu/interop/vhost-vdpa.html
+share/doc/qemu/objects.inv
+share/doc/qemu/search.html
+share/doc/qemu/searchindex.js
share/doc/qemu/specs/
-share/doc/qemu/specs/.buildinfo
-share/doc/qemu/specs/_static/
-share/doc/qemu/specs/_static/alabaster.css
-share/doc/qemu/specs/_static/basic.css
-share/doc/qemu/specs/_static/custom.css
-share/doc/qemu/specs/_static/doctools.js
-share/doc/qemu/specs/_static/documentation_options.js
-share/doc/qemu/specs/_static/file.png
-share/doc/qemu/specs/_static/jquery-3.5.1.js
-share/doc/qemu/specs/_static/jquery.js
-share/doc/qemu/specs/_static/language_data.js
-share/doc/qemu/specs/_static/minus.png
-share/doc/qemu/specs/_static/plus.png
-share/doc/qemu/specs/_static/pygments.css
-share/doc/qemu/specs/_static/searchtools.js
-share/doc/qemu/specs/_static/underscore-1.12.0.js
-share/doc/qemu/specs/_static/underscore.js
share/doc/qemu/specs/acpi_hest_ghes.html
share/doc/qemu/specs/acpi_hw_reduced_hotplug.html
-share/doc/qemu/specs/genindex.html
share/doc/qemu/specs/index.html
-share/doc/qemu/specs/objects.inv
+share/doc/qemu/specs/ppc-spapr-numa.html
share/doc/qemu/specs/ppc-spapr-xive.html
share/doc/qemu/specs/ppc-xive.html
-share/doc/qemu/specs/search.html
-share/doc/qemu/specs/searchindex.js
share/doc/qemu/specs/tpm.html
share/doc/qemu/system/
-share/doc/qemu/system/.buildinfo
-share/doc/qemu/system/_static/
-share/doc/qemu/system/_static/alabaster.css
-share/doc/qemu/system/_static/basic.css
-share/doc/qemu/system/_static/custom.css
-share/doc/qemu/system/_static/doctools.js
-share/doc/qemu/system/_static/documentation_options.js
-share/doc/qemu/system/_static/file.png
-share/doc/qemu/system/_static/jquery-3.5.1.js
-share/doc/qemu/system/_static/jquery.js
-share/doc/qemu/system/_static/language_data.js
-share/doc/qemu/system/_static/minus.png
-share/doc/qemu/system/_static/plus.png
-share/doc/qemu/system/_static/pygments.css
-share/doc/qemu/system/_static/searchtools.js
-share/doc/qemu/system/_static/underscore-1.12.0.js
-share/doc/qemu/system/_static/underscore.js
share/doc/qemu/system/arm/
share/doc/qemu/system/arm/aspeed.html
share/doc/qemu/system/arm/collie.html
@@ -140,19 +135,29 @@ share/doc/qemu/system/arm/mps2.html
share/doc/qemu/system/arm/musca.html
share/doc/qemu/system/arm/musicpal.html
share/doc/qemu/system/arm/nseries.html
+share/doc/qemu/system/arm/nuvoton.html
share/doc/qemu/system/arm/orangepi.html
share/doc/qemu/system/arm/palm.html
+share/doc/qemu/system/arm/raspi.html
share/doc/qemu/system/arm/realview.html
+share/doc/qemu/system/arm/sabrelite.html
+share/doc/qemu/system/arm/sbsa.html
share/doc/qemu/system/arm/stellaris.html
share/doc/qemu/system/arm/sx1.html
share/doc/qemu/system/arm/versatile.html
share/doc/qemu/system/arm/vexpress.html
share/doc/qemu/system/arm/virt.html
+share/doc/qemu/system/arm/xlnx-versal-virt.html
share/doc/qemu/system/arm/xscale.html
share/doc/qemu/system/build-platforms.html
+share/doc/qemu/system/cpu-hotplug.html
share/doc/qemu/system/deprecated.html
share/doc/qemu/system/gdb.html
-share/doc/qemu/system/genindex.html
+share/doc/qemu/system/generic-loader.html
+share/doc/qemu/system/guest-loader.html
+share/doc/qemu/system/i386/
+share/doc/qemu/system/i386/microvm.html
+share/doc/qemu/system/i386/pc.html
share/doc/qemu/system/images.html
share/doc/qemu/system/index.html
share/doc/qemu/system/invocation.html
@@ -162,21 +167,31 @@ share/doc/qemu/system/license.html
share/doc/qemu/system/linuxboot.html
share/doc/qemu/system/managed-startup.html
share/doc/qemu/system/monitor.html
+share/doc/qemu/system/multi-process.html
share/doc/qemu/system/mux-chardev.html
share/doc/qemu/system/net.html
-share/doc/qemu/system/objects.inv
+share/doc/qemu/system/ppc/
+share/doc/qemu/system/ppc/embedded.html
+share/doc/qemu/system/ppc/powermac.html
+share/doc/qemu/system/ppc/powernv.html
+share/doc/qemu/system/ppc/prep.html
+share/doc/qemu/system/ppc/pseries.html
+share/doc/qemu/system/pr-manager.html
share/doc/qemu/system/qemu-block-drivers.html
share/doc/qemu/system/qemu-cpu-models.html
share/doc/qemu/system/qemu-manpage.html
share/doc/qemu/system/quickstart.html
+share/doc/qemu/system/removed-features.html
+share/doc/qemu/system/riscv/
+share/doc/qemu/system/riscv/microchip-icicle-kit.html
+share/doc/qemu/system/riscv/sifive_u.html
share/doc/qemu/system/s390x/
share/doc/qemu/system/s390x/3270.html
+share/doc/qemu/system/s390x/bootdevices.html
share/doc/qemu/system/s390x/css.html
share/doc/qemu/system/s390x/protvirt.html
share/doc/qemu/system/s390x/vfio-ap.html
share/doc/qemu/system/s390x/vfio-ccw.html
-share/doc/qemu/system/search.html
-share/doc/qemu/system/searchindex.js
share/doc/qemu/system/security.html
share/doc/qemu/system/target-arm.html
share/doc/qemu/system/target-avr.html
@@ -184,6 +199,7 @@ share/doc/qemu/system/target-i386.html
share/doc/qemu/system/target-m68k.html
share/doc/qemu/system/target-mips.html
share/doc/qemu/system/target-ppc.html
+share/doc/qemu/system/target-riscv.html
share/doc/qemu/system/target-rx.html
share/doc/qemu/system/target-s390x.html
share/doc/qemu/system/target-sparc.html
@@ -192,59 +208,21 @@ share/doc/qemu/system/target-xtensa.html
share/doc/qemu/system/targets.html
share/doc/qemu/system/tls.html
share/doc/qemu/system/usb.html
+share/doc/qemu/system/virtio-net-failover.html
+share/doc/qemu/system/virtio-pmem.html
share/doc/qemu/system/vnc-security.html
share/doc/qemu/tools/
-share/doc/qemu/tools/.buildinfo
-share/doc/qemu/tools/_static/
-share/doc/qemu/tools/_static/alabaster.css
-share/doc/qemu/tools/_static/basic.css
-share/doc/qemu/tools/_static/custom.css
-share/doc/qemu/tools/_static/doctools.js
-share/doc/qemu/tools/_static/documentation_options.js
-share/doc/qemu/tools/_static/file.png
-share/doc/qemu/tools/_static/jquery-3.5.1.js
-share/doc/qemu/tools/_static/jquery.js
-share/doc/qemu/tools/_static/language_data.js
-share/doc/qemu/tools/_static/minus.png
-share/doc/qemu/tools/_static/plus.png
-share/doc/qemu/tools/_static/pygments.css
-share/doc/qemu/tools/_static/searchtools.js
-share/doc/qemu/tools/_static/underscore-1.12.0.js
-share/doc/qemu/tools/_static/underscore.js
-share/doc/qemu/tools/genindex.html
share/doc/qemu/tools/index.html
-share/doc/qemu/tools/objects.inv
share/doc/qemu/tools/qemu-img.html
share/doc/qemu/tools/qemu-nbd.html
+share/doc/qemu/tools/qemu-pr-helper.html
+share/doc/qemu/tools/qemu-storage-daemon.html
share/doc/qemu/tools/qemu-trace-stap.html
-share/doc/qemu/tools/search.html
-share/doc/qemu/tools/searchindex.js
share/doc/qemu/tools/virtfs-proxy-helper.html
share/doc/qemu/tools/virtiofsd.html
share/doc/qemu/user/
-share/doc/qemu/user/.buildinfo
-share/doc/qemu/user/_static/
-share/doc/qemu/user/_static/alabaster.css
-share/doc/qemu/user/_static/basic.css
-share/doc/qemu/user/_static/custom.css
-share/doc/qemu/user/_static/doctools.js
-share/doc/qemu/user/_static/documentation_options.js
-share/doc/qemu/user/_static/file.png
-share/doc/qemu/user/_static/jquery-3.5.1.js
-share/doc/qemu/user/_static/jquery.js
-share/doc/qemu/user/_static/language_data.js
-share/doc/qemu/user/_static/minus.png
-share/doc/qemu/user/_static/plus.png
-share/doc/qemu/user/_static/pygments.css
-share/doc/qemu/user/_static/searchtools.js
-share/doc/qemu/user/_static/underscore-1.12.0.js
-share/doc/qemu/user/_static/underscore.js
-share/doc/qemu/user/genindex.html
share/doc/qemu/user/index.html
share/doc/qemu/user/main.html
-share/doc/qemu/user/objects.inv
-share/doc/qemu/user/search.html
-share/doc/qemu/user/searchindex.js
share/examples/qemu/
share/examples/qemu/qemu-ifdown
@mode 755
@@ -348,13 +326,14 @@ share/qemu/kvmvapic.bin
share/qemu/linuxboot.bin
share/qemu/linuxboot_dma.bin
share/qemu/multiboot.bin
+share/qemu/npcm7xx_bootrom.bin
share/qemu/openbios-ppc
share/qemu/openbios-sparc32
share/qemu/openbios-sparc64
-share/qemu/opensbi-riscv32-sifive_u-fw_jump.bin
-share/qemu/opensbi-riscv32-virt-fw_jump.bin
-share/qemu/opensbi-riscv64-sifive_u-fw_jump.bin
-share/qemu/opensbi-riscv64-virt-fw_jump.bin
+share/qemu/opensbi-riscv32-generic-fw_dynamic.bin
+share/qemu/opensbi-riscv32-generic-fw_dynamic.elf
+share/qemu/opensbi-riscv64-generic-fw_dynamic.bin
+share/qemu/opensbi-riscv64-generic-fw_dynamic.elf
share/qemu/palcode-clipper
share/qemu/petalogix-ml605.dtb
share/qemu/petalogix-s3adsp1800.dtb
@@ -365,6 +344,7 @@ share/qemu/pxe-ne2k_pci.rom
share/qemu/pxe-pcnet.rom
share/qemu/pxe-rtl8139.rom
share/qemu/pxe-virtio.rom
+share/qemu/qboot.rom
share/qemu/qemu-nsis.bmp
share/qemu/qemu_vga.ndrv
share/qemu/s390-ccw.img
