cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to qemu-6.1.0, from brad

Browse Source
This commit is contained in:
sthen 2021-09-03 23:04:49 +00:00
parent e290cbd2d8
commit af55411aaf
8 changed files with 99 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
emulators/qemu/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.212 2021/07/23 11:17:17 sthen Exp $
# $OpenBSD: Makefile,v 1.213 2021/09/03 23:04:49 sthen Exp $
ONLY_FOR_ARCHS= aarch64 amd64 arm i386 powerpc powerpc64 riscv64 sparc64
DPB_PROPERTIES= parallel
@ -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.com>
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 \

4
emulators/qemu/distinfo
View File

@ -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

4
emulators/qemu/patches/patch-audio_audio_c
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-audio_audio_c,v 1.9 2021/05/02 08:15:19 landry Exp $
$OpenBSD: patch-audio_audio_c,v 1.10 2021/09/03 23:04:49 sthen Exp $
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);

10
emulators/qemu/patches/patch-configure
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-configure,v 1.67 2021/05/02 08:15:19 landry Exp $
$OpenBSD: patch-configure,v 1.68 2021/09/03 23:04:49 sthen Exp $
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

12
emulators/qemu/patches/patch-meson_build
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-meson_build,v 1.1 2021/05/02 08:15:19 landry Exp $
$OpenBSD: patch-meson_build,v 1.2 2021/09/03 23:04:49 sthen Exp $
- Fix curses build on OpenBSD
- sndio module
@ -7,7 +7,7 @@ $OpenBSD: patch-meson_build,v 1.1 2021/05/02 08:15:19 landry Exp $
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'] : []))}

6
emulators/qemu/patches/patch-qemu-options_hx
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-qemu-options_hx,v 1.8 2021/05/02 08:15:19 landry Exp $
$OpenBSD: patch-qemu-options_hx,v 1.9 2021/09/03 23:04:49 sthen Exp $
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"
#endif
@ -13,7 +13,7 @@ Index: qemu-options.hx
#ifdef CONFIG_SPICE
"-audiodev spice,id=id[,prop[=value][,...]]\n"
#endif
@@ -776,6 +779,11 @@ SRST
@@ -805,6 +808,11 @@ SRST
``in|out.buffer-count=count``
Sets the count of the buffers.

15
emulators/qemu/patches/patch-util_cacheinfo_c
View File

@ -1,20 +1,21 @@
$OpenBSD: patch-util_cacheinfo_c,v 1.5 2020/01/25 17:40:29 ajacoutot Exp $
$OpenBSD: patch-util_cacheinfo_c,v 1.6 2021/09/03 23:04:49 sthen Exp $
Set OpenBSD/powerpc cache sizes.
Index: util/cacheinfo.c
--- util/cacheinfo.c.orig
+++ util/cacheinfo.c
@@ -87,6 +87,12 @@ static void sys_cache_info(int *isize, int *dsize)
*isize = *dsize = size;
@@ -145,6 +145,13 @@ static void arch_cache_info(int *isize, int *dsize)
}
}
+#elif defined (__OpenBSD__)
+static void sys_cache_info(int *isize, int *dsize)
+#elif defined(_ARCH_PPC) && defined (__OpenBSD__)
+static void arch_cache_info(int *isize, int *dsize)
+{
+ *isize = 32;
+ *dsize = 32;
+}
+
#else
/* POSIX */
static void arch_cache_info(int *isize, int *dsize) { }
#endif /* arch_cache_info */

80
emulators/qemu/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.3 2021/07/06 16:55:33 daniel Exp $
@comment $OpenBSD: PLIST-main,v 1.4 2021/09/03 23:04:49 sthen Exp $
@pkgpath emulators/qemu
@bin bin/elf2dmp
@bin bin/qemu-edid
@ -21,7 +21,6 @@
@bin bin/qemu-system-mips64
@bin bin/qemu-system-mips64el
@bin bin/qemu-system-mipsel
@bin bin/qemu-system-moxie
@bin bin/qemu-system-nios2
@bin bin/qemu-system-or1k
@bin bin/qemu-system-ppc
@ -38,6 +37,7 @@
@bin bin/qemu-system-x86_64
@bin bin/qemu-system-xtensa
@bin bin/qemu-system-xtensaeb
include/qemu-plugin.h
@man man/man1/qemu-img.1
@man man/man1/qemu-storage-daemon.1
@man man/man1/qemu.1
@ -52,39 +52,74 @@ 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/css/
share/doc/qemu/_static/css/badge_only.css
share/doc/qemu/_static/css/fonts/
share/doc/qemu/_static/css/fonts/Roboto-Slab-Bold.woff
share/doc/qemu/_static/css/fonts/Roboto-Slab-Bold.woff2
share/doc/qemu/_static/css/fonts/Roboto-Slab-Regular.woff
share/doc/qemu/_static/css/fonts/Roboto-Slab-Regular.woff2
share/doc/qemu/_static/css/fonts/fontawesome-webfont.eot
share/doc/qemu/_static/css/fonts/fontawesome-webfont.svg
share/doc/qemu/_static/css/fonts/fontawesome-webfont.ttf
share/doc/qemu/_static/css/fonts/fontawesome-webfont.woff
share/doc/qemu/_static/css/fonts/fontawesome-webfont.woff2
share/doc/qemu/_static/css/fonts/lato-bold-italic.woff
share/doc/qemu/_static/css/fonts/lato-bold-italic.woff2
share/doc/qemu/_static/css/fonts/lato-bold.woff
share/doc/qemu/_static/css/fonts/lato-bold.woff2
share/doc/qemu/_static/css/fonts/lato-normal-italic.woff
share/doc/qemu/_static/css/fonts/lato-normal-italic.woff2
share/doc/qemu/_static/css/fonts/lato-normal.woff
share/doc/qemu/_static/css/fonts/lato-normal.woff2
share/doc/qemu/_static/css/theme.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/js/
share/doc/qemu/_static/js/badge_only.js
share/doc/qemu/_static/js/theme.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/qemu_128x128.png
share/doc/qemu/_static/qemu_32x32.png
share/doc/qemu/_static/searchtools.js
share/doc/qemu/_static/theme_overrides.css
share/doc/qemu/_static/underscore-1.13.1.js
share/doc/qemu/_static/underscore.js
share/doc/qemu/about/
share/doc/qemu/about/build-platforms.html
share/doc/qemu/about/deprecated.html
share/doc/qemu/about/index.html
share/doc/qemu/about/license.html
share/doc/qemu/about/removed-features.html
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/ci.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/ebpf_rss.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/modules.html
share/doc/qemu/devel/multi-process.html
share/doc/qemu/devel/multi-thread-tcg.html
share/doc/qemu/devel/qapi-code-gen.html
share/doc/qemu/devel/qgraph.html
share/doc/qemu/devel/qom.html
share/doc/qemu/devel/qtest.html
@ -98,9 +133,13 @@ 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/devel/ui.html
share/doc/qemu/devel/vfio-migration.html
share/doc/qemu/devel/writing-qmp-commands.html
share/doc/qemu/genindex.html
share/doc/qemu/index.html
share/doc/qemu/interop/
share/doc/qemu/interop/barrier.html
share/doc/qemu/interop/bitmaps.html
share/doc/qemu/interop/dbus-vmstate.html
share/doc/qemu/interop/dbus.html
@ -128,12 +167,20 @@ share/doc/qemu/system/arm/
share/doc/qemu/system/arm/aspeed.html
share/doc/qemu/system/arm/collie.html
share/doc/qemu/system/arm/cpu-features.html
share/doc/qemu/system/arm/cubieboard.html
share/doc/qemu/system/arm/digic.html
share/doc/qemu/system/arm/emcraft-sf2.html
share/doc/qemu/system/arm/emulation.html
share/doc/qemu/system/arm/gumstix.html
share/doc/qemu/system/arm/highbank.html
share/doc/qemu/system/arm/imx25-pdk.html
share/doc/qemu/system/arm/integratorcp.html
share/doc/qemu/system/arm/kzm.html
share/doc/qemu/system/arm/mainstone.html
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/nrf.html
share/doc/qemu/system/arm/nseries.html
share/doc/qemu/system/arm/nuvoton.html
share/doc/qemu/system/arm/orangepi.html
@ -143,15 +190,25 @@ 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/stm32.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/authz.html
share/doc/qemu/system/barrier.html
share/doc/qemu/system/bootindex.html
share/doc/qemu/system/cpu-hotplug.html
share/doc/qemu/system/deprecated.html
share/doc/qemu/system/device-emulation.html
share/doc/qemu/system/devices/
share/doc/qemu/system/devices/ivshmem.html
share/doc/qemu/system/devices/net.html
share/doc/qemu/system/devices/nvme.html
share/doc/qemu/system/devices/usb.html
share/doc/qemu/system/devices/vhost-user.html
share/doc/qemu/system/devices/virtio-pmem.html
share/doc/qemu/system/gdb.html
share/doc/qemu/system/generic-loader.html
share/doc/qemu/system/guest-loader.html
@ -161,20 +218,17 @@ 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
share/doc/qemu/system/ivshmem.html
share/doc/qemu/system/keys.html
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/nvme.html
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/ppce500.html
share/doc/qemu/system/ppc/prep.html
share/doc/qemu/system/ppc/pseries.html
share/doc/qemu/system/pr-manager.html
@ -182,10 +236,11 @@ 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/shakti-c.html
share/doc/qemu/system/riscv/sifive_u.html
share/doc/qemu/system/riscv/virt.html
share/doc/qemu/system/s390x/
share/doc/qemu/system/s390x/3270.html
share/doc/qemu/system/s390x/bootdevices.html
@ -193,6 +248,7 @@ 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/secrets.html
share/doc/qemu/system/security.html
share/doc/qemu/system/target-arm.html
share/doc/qemu/system/target-avr.html
@ -208,9 +264,7 @@ share/doc/qemu/system/target-sparc64.html
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/index.html