Thu May 19 16:10:15 2022 UTC ()
qemu: Update to 7.0.0

CHangelog:
== System emulation ==

=== Incompatible changes ===

Consult the [https://qemu-project.gitlab.io/qemu/about/removed-features.html 'Removed features' ] page for details of suggested replacement functionality

=== New deprecated options and features ===

Consult the [https://qemu-project.gitlab.io/qemu/about/deprecated.html "Deprecated Features"] chapter of the QEMU System Emulation User's Guide for further details of the deprecations and their suggested replacements.

Additional note: The QEMU project currently considers to drop the slirp submodule in future releases, i.e. the QEMU tarball won't embed the code for user mode networking in the future anymore, so that an external libslirp installation is required. Most OS distribution already ship a libslirp package nowadays (except for OpenBSD which is already known and hopefully will be fixed soon), but if you are still using another OS distribution that does not provide a libslirp package yet, please send a note to the [[Contribute/MailingLists|qemu-devel mailing list]] and ask your OS vendor to include such a package in the next release.

=== 68k ===

=== Alpha ===

=== Arm ===

* The virt board has gained a new control knob to disable passing a RNG seed in the DTB (dtb-kaslr-seed)
* The AST2600 SoC now supports a dummy version of the i3c device
* The virt board can now run guests with KVM on hosts with restricted IPA ranges
* The virt board now supports virtio-mem-pci
* The virt board now supports specifying the guest CPU topology
* On the virt board, we now enable PAuth when using KVM or hvf and the host CPU supports it
* xlnx-versal-virt now emulates the PMC SLCR
* xlnx-versal-virt now emulates the OSPI flash memory controller
* xlnx-zynqmp now models the CRF and APU control
* The Arm GICv3 ITS now emulates the previously missing MOVI and MOVALL commands
* New board model: mori-bmc
* We now support emulating FEAT_LVA
* We now support emulating FEAT_LPA
* We now support emulating FEAT_LPA2. (Note that this is disabled by default for the 'virt' board's versioned machine types prior to 7.0 (ie 'virt-6.2', 'virt-6.1', etc) because Linux kernels prior to v5.12 have a bug which means they will not boot on a CPU which has LPA2.)

=== AVR ===

=== Hexagon ===

=== HPPA ===
* Support up to 16 virtual CPUs
* Improved artist graphics driver for HP-UX VDE, HP-UX CDE and Linux framebuffer
* Mouse cursor focus and positioning now works much better under HP-UX X11
* Emulated TOC button can be triggered with "nmi" in the qemu monitor
* Added support for Qemu SCSI boot order option
* Possibility to change system HOSTID for HP-UX and Linux
* Added firmware 16x32 pixel bitmap font for use on HDPI screens
* Ability to choose serial or graphical console as default firmware console

=== Microblaze ===

=== MIPS ===

=== Nios2 ===

=== OpenRISC ===
==== Machines ====
* Support up to 4 cores up from 2 on the OpenRISC sim machine
* Support loading an external initrd image on the OpenRISC sim machine
* OpenRISC sim machine now automatically generates a device tree and passes it to the kernel

=== PowerPC ===
* Updates of PowerNV and pSeries documentation

==== Machines ====

* Deprecation of taihu machine
* Large rework of PPC405 machine
* General cleanup for Mac machines
* PowerNV PHB3/4 cleanups
* PowerNV XIVE improvements
* Extension of the powernv10 machine with XIVE2 ans PHB5 models
* New SLOF for PPC970 and POWER5+
* ppc: nested KVM HV for spapr virtual hypervisor
* spapr: nvdimm: Introduce spapr-nvdimm device

==== Extensions/removal====

* Removal of 401/403 CPUs
* Removal of 601/602 CPUs
* Removal of SoftTLBs support for PPC74x CPUs

* Initial support for PMU
* PMU EBB support
* Rework of powerpc exception handling
* Support for new ISA31 instructions
* Large cleanup of FPU implementation

==== Fixes ====

* Fixes for ivshmem
* Fixes for POWER5+ pseries
* Fixes for FPU exceptions
* Fixes for exception models in MPCx and 60x CPUs
* Fix for e6500 CPU
* Fixes for the 7448 CPU
* Exception and TLB fixes for the 405 CPU
* 603 CPUs fixes
* Book-E exception fixes
* Clang fixes
* VOF installation
* Radix MMU fixes

=== Renesas RX ===

=== Renesas SH ===

=== RISC-V ===
==== Extensions ====
* Add support for ratified 1.0 Vector extension
* Support for the Zve64f and Zve32f extensions
* Drop support for draft 0.7.1 Vector extension
* Support Zfhmin and Zfh extensions
* RISC-V KVM support
* Mark Hypervisor extension as non experimental
* Enable Hypervisor extension by default
* Support for svnapot, svinval and svpbmt extensions
* Experimental support for 128-bit CPUs
* Initial support for XVentanaCondOps custom extension
* stval and mtval support for illegal instructions
* Support for the UXL field in xstatus
* Add support for zfinx, zdinx and zhinx{min} extensions

==== Machines ====
* OpenSBI binary loading support for the Spike machine
* Improve kernel loading for non-Linux platforms
* SiFive PDMA 64-bit support
* Support 32 cores on the virt machine
* Add AIA support for virt machine

==== Fixes ====
* Fix illegal instruction when PMP is disabled
* Corrections for the Vector extension
* Fixes for OpenTitan timer
* Correction of OpenTitan PLIC stride length
* Removal of OpenSBI ELFs
* Fix trap cause for RV32 HS-mode CSR access from RV64 HS-mode
* Fixup OpenTitan SPI address

=== s390x ===

* Support Linux kernel command line length of more than 896 bytes (if the guest kernel supports it, too)
* Emulate the instructions from the "Miscellaneous-Instruction-Extensions Facility 3" (a z15 extension)
* Fixes for various emulated instructions (SLDA, SRDA, SLAG, BRASL, BRCL)

=== SPARC ===

=== Tricore ===

=== x86 ===
* Support for Intel AMX.
==== KVM ====

==== x86_64 ====

==== AMD SEV ====

=== Xtensa ===

=== Device emulation and assignment ===

==== ACPI / SMBIOS ====
* advertise i8042 in FADT if it is present (5334bf5703)
* new ''acpi-erst'' device, for logging guest evens using standard ACPI ERST interface (0ef0506e559)
* added support for new ''processor-id'' SMBIOS option (cb5fb04fe6)
* fixed SMBIOS memory handles overlap for large VMs (8Tb and more) (a379d4550c4)
* added 'SMBIOS 3.0' support in SeaBIOS, in QEMU it's opt-in feature, use ''-machine smbios-ep=3-0'' option to enable it
* fixed regression in ACPI table headers where OEM ID and OEM Table ID weren't padded correctly (748c030f360)
* fixed QEMU crash when started with user provided SLIC table (8cdb99af45)
* arm/virt: add VIOT table to describe virtio-iommu (cf1a5cc935c)
* x86: 'pc' machine type: fixed acpi-index not being migrated which might result in NIC name change if migration happens when guest is asking QEMU for it. Migration should work properly since 7.0 and newer machine types, for older machine types migration of acpi-index is broken and can't be fixed for compatibility reasons.

==== Audio ====

==== Block devices ====

==== Graphics ====

==== I2C ====

==== Input devices ====

==== IPMI ====

==== Multi-process QEMU ====

==== Network devices ====

==== NVDIMM ====

==== NVMe ====

===== Emulated NVMe Controller =====

==== PCI/PCIe ====
* Q35: fix PCIe device becoming disabled after migration when ACPI based PCI hotplug is used (6b0969f1ec)
* initial bits of SR/IOV support (250346169)
* arm/virt: fixed PXB interrupt routing (e609301b45)
* arm/virt: support for virtio-mem-pci (b1b87327a9)

==== SCSI ====

==== SD card ====

==== SMBIOS ====

==== TPM ====

==== USB ====

==== VFIO ====

==== virtio ====

==== Xen ====

==== fw_cfg ====

==== 9pfs ====
* [https://gitlab.com/qemu-project/qemu/-/commit/e64e27d5cb103b7764f1a05b6eda7e7fedd517c5 Fixed 9p server crash] ([https://gitlab.com/qemu-project/qemu/-/issues/841 issue #841]) that happened on some host systems due to incorrect (system dependant) handling of struct dirent size.
* [https://gitlab.com/qemu-project/qemu/-/commit/f45cc81911adc7726e8a2801986b6998b91b816e Added support for macOS hosts].

==== virtiofs ====
* Fix for CVE-2022-0358 - behaviour with supplementary groups and SGID directories
* Improved security label support
* The virtiofsd in qemu is now starting to be deprecated; please start using and contributing to [https://gitlab.com/virtio-fs/virtiofsd Rust virtiofsd]

==== Semihosting ====

* We now generate sane numbers for SYS_HEAPINFO under system emulation

=== Audio ===

=== Character devices ===

=== Crypto subsystem ===

=== Authorization subsystem ===

=== GUI ===
* a new [https://www.qemu.org/docs/master/interop/dbus-display.html "-display dbus"] option to export the display for external processes. A [https://gitlab.com/marcandre.lureau/qemu-display/ gtk4-rs based widget] is in the works (for future Boxes, virt-viewer etc). Potential other users include remote desktop protocols.

=== GDBStub ===

=== TCG Plugins ===
* new coverage plugin in contrib which support drcov format traces

=== Host support ===

=== Memory backends ===

=== Migration ===

=== Monitor ===

==== QMP ====

==== HMP ====

=== Network ===

=== Block device backends and tools ===
* Fleecing backup has been made more flexible: Fleecing backup means exposing a temporary snapshot of an actively used image, and having the copy-before-write (CBW) filter (or historically the backup block job) copy data there from areas written by the guest to the active image, before they are overwritten, so that the snapshot keeps representing the point-in-time state of the disk when the snapshot was created.  This snapshot can then be read (either by qemu itself using the backup or mirror block jobs, or by outside users e.g. via an NBD export) to create a backup.  As of qemu 7.0, instead of reading the snapshot image directly, it can also be accessed through the new snapshot-access block driver, by installing such a node on top of the CBW filter.  Doing so has some advantages over accessing the snapshot image directly; for example, the image can then be in any format (not just COW formats like qcow2), because the CBW filter keeps track of its allocation bitmap.  Once an a
rea has been backed up, users can send a discard request to mark it as done, so that the CBW filter will not potentially copy it to the snapshot image on a subsequent guest write.  Furthermore, the CBW filter now has a bitmap parameter that allows limiting its scope as specified by the bitmap at the time the CBW filter node is created.
* A bug in caching block status has been fixed that was causing over-eager treatment of a format layer as all data rather than detecting holes, if an earlier block status query had merely been checking for which portions of the backing chain were allocated.  While the bug did not affect guest-visible data, it caused some performance regressions, particularly noticeable and easy to trigger when using 'qemu-nbd --allocation-depth'.
* The ''qemu-nbd'' program has gained a new ''--tls-hostname'' parameter to allow TLS validation against a different hostname, such as when setting up TLS through a TCP tunnel, and now supports TLS over Unix sockets.
* The SSH driver supports sha256 fingerprints with pre-blockdev command line configuration syntax.
* The SSH driver will print the actual fingerprint and its type when failing to validate a host key.

=== Tracing ===

=== Miscellaneous ===

* The -sandbox 'spawn' filter, will now correctly block use of the clone syscall for spawnnig processes, while allowing thread creation
* The -sandbox 'spawn' filter, will now entirely block use of the clone3 syscall entirely since there is no way to access its flags parameter from seccomp to distinguish thread vs process creation
* The -sandbox 'spawn' filter, will now block setns, unshare and execveat syscalls since they are not desired.

== User-mode emulation ==

* fixed a bug that caused issues mapping the ARM commpage on 32 bit builds

=== binfmt_misc ===

=== Hexagon ===

== TCG ==

User-mode emulation (linux-user, bsd-user) will enforce guest alignment constraints and raise SIGBUS to the guest program as appropriate.

=== ARM ===

Support for for ARMv4 and ARMv5 hosts has been dropped.  These older Arm versions do not have support for misaligned memory access; such support was added to ARMv6.  Since ARMv5 is quite old, it is presumed that such systems do not have sufficient RAM to even run QEMU, and so practically speaking no systems are impacted.

== Guest agent ==
* Support Windows 11 for <code>guest-get-osinfo</code> command
* Fix memory leaks in Windows <code>guest-get-fsinfo</code> command

== Build Information ==

=== Python ===

=== GIT submodules ===

=== Container Based Builds ===

* a large number of containers are now updated by lcitool
* TESTS and IMAGES environment variables can be used filter again when building against all docker targets

=== VM Based Builds ===

=== Build Dependencies ===
* xfs libraries are not needed anymore for build, since the only ioctl used by qemu which was defined there got local implementation.  With this, --enable-xfsctl configure option is also gone.

=== Windows ===

=== Testing and CI ===


(ryoon)
diff -r1.294 -r1.295 pkgsrc/emulators/qemu/Makefile
diff -r1.80 -r1.81 pkgsrc/emulators/qemu/PLIST
diff -r1.190 -r1.191 pkgsrc/emulators/qemu/distinfo
diff -r1.10 -r1.11 pkgsrc/emulators/qemu/patches/patch-meson.build

cvs diff -r1.294 -r1.295 pkgsrc/emulators/qemu/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/Makefile 2022/04/25 16:09:53 1.294
+++ pkgsrc/emulators/qemu/Makefile 2022/05/19 16:10:15 1.295
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.294 2022/04/25 16:09:53 nia Exp $ 1# $NetBSD: Makefile,v 1.295 2022/05/19 16:10:15 ryoon Exp $
2 2
3DISTNAME= qemu-6.2.0 3DISTNAME= qemu-7.0.0
4PKGREVISION= 2 
5CATEGORIES= emulators 4CATEGORIES= emulators
6MASTER_SITES= https://download.qemu.org/ 5MASTER_SITES= https://download.qemu.org/
7EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.qemu-project.org/ 9HOMEPAGE= http://www.qemu-project.org/
11COMMENT= CPU emulator using dynamic translation 10COMMENT= CPU emulator using dynamic translation
12LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit AND modified-bsd 11LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit AND modified-bsd
13 12
14TOOL_DEPENDS+= ninja-build-[0-9]*:../../devel/ninja-build 13TOOL_DEPENDS+= ninja-build-[0-9]*:../../devel/ninja-build
15 14
16USE_CURSES= resize_term wide 15USE_CURSES= resize_term wide
17USE_LANGUAGES+= c c++ 16USE_LANGUAGES+= c c++
@@ -129,42 +128,44 @@ CONFIGURE_ARGS+= --disable-bsd-user @@ -129,42 +128,44 @@ CONFIGURE_ARGS+= --disable-bsd-user
129CONFIGURE_ARGS+= --enable-bsd-user 128CONFIGURE_ARGS+= --enable-bsd-user
130USER_EMUL= i386 x86_64 129USER_EMUL= i386 x86_64
131. endif 130. endif
132.elif !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly" 131.elif !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly"
133USER_EMUL= i386 x86_64 132USER_EMUL= i386 x86_64
134PLIST.nbd= yes 133PLIST.nbd= yes
135.elif ${OPSYS} == "Darwin" 134.elif ${OPSYS} == "Darwin"
136USER_EMUL= 135USER_EMUL=
137CONFIGURE_ARGS+= --disable-bsd-user 136CONFIGURE_ARGS+= --disable-bsd-user
138PLIST.nbd= yes 137PLIST.nbd= yes
139.elif ${OPSYS} == "Linux" 138.elif ${OPSYS} == "Linux"
140USER_EMUL= ${UE_ARCHS} 139USER_EMUL= ${UE_ARCHS}
141PLIST.bridge-helper= yes 140PLIST.bridge-helper= yes
 141PLIST.ga= yes
142PLIST.nbd= yes 142PLIST.nbd= yes
143PLIST.pr-helper= yes 143PLIST.pr-helper= yes
144.elif !empty(MACHINE_PLATFORM:MSunOS-5.11-*) 144.elif !empty(MACHINE_PLATFORM:MSunOS-5.11-*)
 145PLIST.ga= yes
145PLIST.nbd= yes 146PLIST.nbd= yes
146CONFIGURE_ARGS+= --disable-coroutine-pool 147CONFIGURE_ARGS+= --disable-coroutine-pool
147.endif 148.endif
148 149
149PLIST_VARS+= plugins 150PLIST_VARS+= plugins
150.if ${OPSYS} != "SunOS" 151.if ${OPSYS} != "SunOS"
151PLIST.plugins= yes 152PLIST.plugins= yes
152CONFIGURE_ARGS+= --enable-plugins 153CONFIGURE_ARGS+= --enable-plugins
153.else 154.else
154CONFIGURE_ARGS+= --disable-plugins 155CONFIGURE_ARGS+= --disable-plugins
155.endif 156.endif
156 157
157PLIST_VARS+= ${UE_ARCHS} bridge-helper keymap nbd pr-helper 158PLIST_VARS+= ${UE_ARCHS} bridge-helper ga keymap nbd pr-helper
158.for pvar in ${USER_EMUL} 159.for pvar in ${USER_EMUL}
159PLIST.${pvar}= yes 160PLIST.${pvar}= yes
160.endfor 161.endfor
161 162
162# different versions of Sphinx generate different static files 163# different versions of Sphinx generate different static files
163PLIST_SRC= PLIST ${WRKDIR}/PLIST.STATIC 164PLIST_SRC= PLIST ${WRKDIR}/PLIST.STATIC
164 165
165PRINT_PLIST_AWK+= /\/_static\// { next; } 166PRINT_PLIST_AWK+= /\/_static\// { next; }
166 167
167TEST_TARGET= check 168TEST_TARGET= check
168 169
169PYTHON_FOR_BUILD_ONLY= tool 170PYTHON_FOR_BUILD_ONLY= tool
170 171

cvs diff -r1.80 -r1.81 pkgsrc/emulators/qemu/PLIST (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/PLIST 2022/03/27 01:44:17 1.80
+++ pkgsrc/emulators/qemu/PLIST 2022/05/19 16:10:15 1.81
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1@comment $NetBSD: PLIST,v 1.80 2022/03/27 01:44:17 tnn Exp $ 1@comment $NetBSD: PLIST,v 1.81 2022/05/19 16:10:15 ryoon Exp $
2bin/elf2dmp 2bin/elf2dmp
3${PLIST.aarch64}bin/qemu-aarch64 3${PLIST.aarch64}bin/qemu-aarch64
4${PLIST.aarch64_be}bin/qemu-aarch64_be 4${PLIST.aarch64_be}bin/qemu-aarch64_be
5${PLIST.alpha}bin/qemu-alpha 5${PLIST.alpha}bin/qemu-alpha
6${PLIST.arm}bin/qemu-arm 6${PLIST.arm}bin/qemu-arm
7${PLIST.armeb}bin/qemu-armeb 7${PLIST.armeb}bin/qemu-armeb
8${PLIST.cris}bin/qemu-cris 8${PLIST.cris}bin/qemu-cris
9bin/qemu-edid 9bin/qemu-edid
10bin/qemu-ga 10${PLIST.ga}bin/qemu-ga
11${PLIST.hexagon}bin/qemu-hexagon 11${PLIST.hexagon}bin/qemu-hexagon
12${PLIST.hppa}bin/qemu-hppa 12${PLIST.hppa}bin/qemu-hppa
13${PLIST.i386}bin/qemu-i386 13${PLIST.i386}bin/qemu-i386
14bin/qemu-img 14bin/qemu-img
15bin/qemu-io 15bin/qemu-io
16${PLIST.keymap}bin/qemu-keymap 16${PLIST.keymap}bin/qemu-keymap
17${PLIST.m68k}bin/qemu-m68k 17${PLIST.m68k}bin/qemu-m68k
18${PLIST.microblaze}bin/qemu-microblaze 18${PLIST.microblaze}bin/qemu-microblaze
19${PLIST.microblazeel}bin/qemu-microblazeel 19${PLIST.microblazeel}bin/qemu-microblazeel
20${PLIST.mips}bin/qemu-mips 20${PLIST.mips}bin/qemu-mips
21${PLIST.mips64}bin/qemu-mips64 21${PLIST.mips64}bin/qemu-mips64
22${PLIST.mips64el}bin/qemu-mips64el 22${PLIST.mips64el}bin/qemu-mips64el
23${PLIST.mipsel}bin/qemu-mipsel 23${PLIST.mipsel}bin/qemu-mipsel
@@ -71,52 +71,58 @@ bin/qemu-system-xtensa @@ -71,52 +71,58 @@ bin/qemu-system-xtensa
71bin/qemu-system-xtensaeb 71bin/qemu-system-xtensaeb
72${PLIST.x86_64}bin/qemu-x86_64 72${PLIST.x86_64}bin/qemu-x86_64
73${PLIST.xtensa}bin/qemu-xtensa 73${PLIST.xtensa}bin/qemu-xtensa
74${PLIST.xtensaeb}bin/qemu-xtensaeb 74${PLIST.xtensaeb}bin/qemu-xtensaeb
75${PLIST.plugins}include/qemu-plugin.h 75${PLIST.plugins}include/qemu-plugin.h
76${PLIST.bridge-helper}libexec/qemu-bridge-helper 76${PLIST.bridge-helper}libexec/qemu-bridge-helper
77${PLIST.virtfs-proxy-helper}libexec/virtfs-proxy-helper 77${PLIST.virtfs-proxy-helper}libexec/virtfs-proxy-helper
78man/man1/qemu-img.1 78man/man1/qemu-img.1
79man/man1/qemu-storage-daemon.1 79man/man1/qemu-storage-daemon.1
80man/man1/qemu.1 80man/man1/qemu.1
81${PLIST.virtfs-proxy-helper}man/man1/virtfs-proxy-helper.1 81${PLIST.virtfs-proxy-helper}man/man1/virtfs-proxy-helper.1
82man/man7/qemu-block-drivers.7 82man/man7/qemu-block-drivers.7
83man/man7/qemu-cpu-models.7 83man/man7/qemu-cpu-models.7
84man/man7/qemu-ga-ref.7 84${PLIST.ga}man/man7/qemu-ga-ref.7
85man/man7/qemu-qmp-ref.7 85man/man7/qemu-qmp-ref.7
86man/man7/qemu-storage-daemon-qmp-ref.7 86man/man7/qemu-storage-daemon-qmp-ref.7
87man/man8/qemu-ga.8 87${PLIST.ga}man/man8/qemu-ga.8
88man/man8/qemu-nbd.8 88man/man8/qemu-nbd.8
89man/man8/qemu-pr-helper.8 89man/man8/qemu-pr-helper.8
90share/applications/qemu.desktop 90share/applications/qemu.desktop
91share/doc/qemu/.buildinfo 91share/doc/qemu/.buildinfo
92share/doc/qemu/Makefile.multinode-NetBSD 92share/doc/qemu/Makefile.multinode-NetBSD
93share/doc/qemu/about/build-platforms.html 93share/doc/qemu/about/build-platforms.html
94share/doc/qemu/about/deprecated.html 94share/doc/qemu/about/deprecated.html
95share/doc/qemu/about/index.html 95share/doc/qemu/about/index.html
96share/doc/qemu/about/license.html 96share/doc/qemu/about/license.html
97share/doc/qemu/about/removed-features.html 97share/doc/qemu/about/removed-features.html
 98share/doc/qemu/dbus-dbusindex.html
98share/doc/qemu/devel/atomics.html 99share/doc/qemu/devel/atomics.html
99share/doc/qemu/devel/bitops.html 100share/doc/qemu/devel/bitops.html
100share/doc/qemu/devel/block-coroutine-wrapper.html 101share/doc/qemu/devel/block-coroutine-wrapper.html
101share/doc/qemu/devel/build-system.html 102share/doc/qemu/devel/build-system.html
102share/doc/qemu/devel/ci.html 103share/doc/qemu/devel/ci.html
103share/doc/qemu/devel/clocks.html 104share/doc/qemu/devel/clocks.html
104share/doc/qemu/devel/code-of-conduct.html 105share/doc/qemu/devel/code-of-conduct.html
105share/doc/qemu/devel/conflict-resolution.html 106share/doc/qemu/devel/conflict-resolution.html
106share/doc/qemu/devel/control-flow-integrity.html 107share/doc/qemu/devel/control-flow-integrity.html
107share/doc/qemu/devel/decodetree.html 108share/doc/qemu/devel/decodetree.html
108share/doc/qemu/devel/ebpf_rss.html 109share/doc/qemu/devel/ebpf_rss.html
109share/doc/qemu/devel/fuzzing.html 110share/doc/qemu/devel/fuzzing.html
 111share/doc/qemu/devel/index-api.html
 112share/doc/qemu/devel/index-build.html
 113share/doc/qemu/devel/index-internals.html
 114share/doc/qemu/devel/index-process.html
 115share/doc/qemu/devel/index-tcg.html
110share/doc/qemu/devel/index.html 116share/doc/qemu/devel/index.html
111share/doc/qemu/devel/kconfig.html 117share/doc/qemu/devel/kconfig.html
112share/doc/qemu/devel/loads-stores.html 118share/doc/qemu/devel/loads-stores.html
113share/doc/qemu/devel/memory.html 119share/doc/qemu/devel/memory.html
114share/doc/qemu/devel/migration.html 120share/doc/qemu/devel/migration.html
115share/doc/qemu/devel/modules.html 121share/doc/qemu/devel/modules.html
116share/doc/qemu/devel/multi-process.html 122share/doc/qemu/devel/multi-process.html
117share/doc/qemu/devel/multi-thread-tcg.html 123share/doc/qemu/devel/multi-thread-tcg.html
118share/doc/qemu/devel/qapi-code-gen.html 124share/doc/qemu/devel/qapi-code-gen.html
119share/doc/qemu/devel/qgraph.html 125share/doc/qemu/devel/qgraph.html
120share/doc/qemu/devel/qom.html 126share/doc/qemu/devel/qom.html
121share/doc/qemu/devel/qtest.html 127share/doc/qemu/devel/qtest.html
122share/doc/qemu/devel/reset.html 128share/doc/qemu/devel/reset.html
@@ -129,51 +135,58 @@ share/doc/qemu/devel/submitting-a-pull-r @@ -129,51 +135,58 @@ share/doc/qemu/devel/submitting-a-pull-r
129share/doc/qemu/devel/tcg-icount.html 135share/doc/qemu/devel/tcg-icount.html
130share/doc/qemu/devel/tcg-plugins.html 136share/doc/qemu/devel/tcg-plugins.html
131share/doc/qemu/devel/tcg.html 137share/doc/qemu/devel/tcg.html
132share/doc/qemu/devel/testing.html 138share/doc/qemu/devel/testing.html
133share/doc/qemu/devel/tracing.html 139share/doc/qemu/devel/tracing.html
134share/doc/qemu/devel/trivial-patches.html 140share/doc/qemu/devel/trivial-patches.html
135share/doc/qemu/devel/ui.html 141share/doc/qemu/devel/ui.html
136share/doc/qemu/devel/vfio-migration.html 142share/doc/qemu/devel/vfio-migration.html
137share/doc/qemu/devel/writing-monitor-commands.html 143share/doc/qemu/devel/writing-monitor-commands.html
138share/doc/qemu/genindex.html 144share/doc/qemu/genindex.html
139share/doc/qemu/index.html 145share/doc/qemu/index.html
140share/doc/qemu/interop/barrier.html 146share/doc/qemu/interop/barrier.html
141share/doc/qemu/interop/bitmaps.html 147share/doc/qemu/interop/bitmaps.html
 148share/doc/qemu/interop/dbus-display.html
142share/doc/qemu/interop/dbus-vmstate.html 149share/doc/qemu/interop/dbus-vmstate.html
143share/doc/qemu/interop/dbus.html 150share/doc/qemu/interop/dbus.html
144share/doc/qemu/interop/index.html 151share/doc/qemu/interop/index.html
145share/doc/qemu/interop/live-block-operations.html 152share/doc/qemu/interop/live-block-operations.html
146share/doc/qemu/interop/pr-helper.html 153share/doc/qemu/interop/pr-helper.html
147share/doc/qemu/interop/qemu-ga-ref.html 154share/doc/qemu/interop/qemu-ga-ref.html
148share/doc/qemu/interop/qemu-ga.html 155share/doc/qemu/interop/qemu-ga.html
149share/doc/qemu/interop/qemu-qmp-ref.html 156share/doc/qemu/interop/qemu-qmp-ref.html
150share/doc/qemu/interop/qemu-storage-daemon-qmp-ref.html 157share/doc/qemu/interop/qemu-storage-daemon-qmp-ref.html
151share/doc/qemu/interop/vhost-user-gpu.html 158share/doc/qemu/interop/vhost-user-gpu.html
152share/doc/qemu/interop/vhost-user.html 159share/doc/qemu/interop/vhost-user.html
153share/doc/qemu/interop/vhost-vdpa.html 160share/doc/qemu/interop/vhost-vdpa.html
 161share/doc/qemu/interop/virtio-balloon-stats.html
154share/doc/qemu/objects.inv 162share/doc/qemu/objects.inv
155share/doc/qemu/search.html 163share/doc/qemu/search.html
156share/doc/qemu/searchindex.js 164share/doc/qemu/searchindex.js
157share/doc/qemu/specs/acpi_cpu_hotplug.html 165share/doc/qemu/specs/acpi_cpu_hotplug.html
 166share/doc/qemu/specs/acpi_erst.html
158share/doc/qemu/specs/acpi_hest_ghes.html 167share/doc/qemu/specs/acpi_hest_ghes.html
159share/doc/qemu/specs/acpi_hw_reduced_hotplug.html 168share/doc/qemu/specs/acpi_hw_reduced_hotplug.html
160share/doc/qemu/specs/acpi_mem_hotplug.html 169share/doc/qemu/specs/acpi_mem_hotplug.html
161share/doc/qemu/specs/acpi_nvdimm.html 170share/doc/qemu/specs/acpi_nvdimm.html
162share/doc/qemu/specs/acpi_pci_hotplug.html 171share/doc/qemu/specs/acpi_pci_hotplug.html
163share/doc/qemu/specs/index.html 172share/doc/qemu/specs/index.html
 173share/doc/qemu/specs/ppc-spapr-hcalls.html
 174share/doc/qemu/specs/ppc-spapr-hotplug.html
164share/doc/qemu/specs/ppc-spapr-numa.html 175share/doc/qemu/specs/ppc-spapr-numa.html
 176share/doc/qemu/specs/ppc-spapr-uv-hcalls.html
165share/doc/qemu/specs/ppc-spapr-xive.html 177share/doc/qemu/specs/ppc-spapr-xive.html
166share/doc/qemu/specs/ppc-xive.html 178share/doc/qemu/specs/ppc-xive.html
 179share/doc/qemu/specs/sev-guest-firmware.html
167share/doc/qemu/specs/tpm.html 180share/doc/qemu/specs/tpm.html
168share/doc/qemu/system/arm/aspeed.html 181share/doc/qemu/system/arm/aspeed.html
169share/doc/qemu/system/arm/collie.html 182share/doc/qemu/system/arm/collie.html
170share/doc/qemu/system/arm/cpu-features.html 183share/doc/qemu/system/arm/cpu-features.html
171share/doc/qemu/system/arm/cubieboard.html 184share/doc/qemu/system/arm/cubieboard.html
172share/doc/qemu/system/arm/digic.html 185share/doc/qemu/system/arm/digic.html
173share/doc/qemu/system/arm/emcraft-sf2.html 186share/doc/qemu/system/arm/emcraft-sf2.html
174share/doc/qemu/system/arm/emulation.html 187share/doc/qemu/system/arm/emulation.html
175share/doc/qemu/system/arm/gumstix.html 188share/doc/qemu/system/arm/gumstix.html
176share/doc/qemu/system/arm/highbank.html 189share/doc/qemu/system/arm/highbank.html
177share/doc/qemu/system/arm/imx25-pdk.html 190share/doc/qemu/system/arm/imx25-pdk.html
178share/doc/qemu/system/arm/integratorcp.html 191share/doc/qemu/system/arm/integratorcp.html
179share/doc/qemu/system/arm/kzm.html 192share/doc/qemu/system/arm/kzm.html
@@ -191,38 +204,41 @@ share/doc/qemu/system/arm/realview.html @@ -191,38 +204,41 @@ share/doc/qemu/system/arm/realview.html
191share/doc/qemu/system/arm/sabrelite.html 204share/doc/qemu/system/arm/sabrelite.html
192share/doc/qemu/system/arm/sbsa.html 205share/doc/qemu/system/arm/sbsa.html
193share/doc/qemu/system/arm/stellaris.html 206share/doc/qemu/system/arm/stellaris.html
194share/doc/qemu/system/arm/stm32.html 207share/doc/qemu/system/arm/stm32.html
195share/doc/qemu/system/arm/sx1.html 208share/doc/qemu/system/arm/sx1.html
196share/doc/qemu/system/arm/versatile.html 209share/doc/qemu/system/arm/versatile.html
197share/doc/qemu/system/arm/vexpress.html 210share/doc/qemu/system/arm/vexpress.html
198share/doc/qemu/system/arm/virt.html 211share/doc/qemu/system/arm/virt.html
199share/doc/qemu/system/arm/xlnx-versal-virt.html 212share/doc/qemu/system/arm/xlnx-versal-virt.html
200share/doc/qemu/system/arm/xscale.html 213share/doc/qemu/system/arm/xscale.html
201share/doc/qemu/system/authz.html 214share/doc/qemu/system/authz.html
202share/doc/qemu/system/barrier.html 215share/doc/qemu/system/barrier.html
203share/doc/qemu/system/bootindex.html 216share/doc/qemu/system/bootindex.html
 217share/doc/qemu/system/confidential-guest-support.html
204share/doc/qemu/system/cpu-hotplug.html 218share/doc/qemu/system/cpu-hotplug.html
205share/doc/qemu/system/device-emulation.html 219share/doc/qemu/system/device-emulation.html
 220share/doc/qemu/system/devices/can.html
206share/doc/qemu/system/devices/ivshmem.html 221share/doc/qemu/system/devices/ivshmem.html
207share/doc/qemu/system/devices/net.html 222share/doc/qemu/system/devices/net.html
208share/doc/qemu/system/devices/nvme.html 223share/doc/qemu/system/devices/nvme.html
209share/doc/qemu/system/devices/usb.html 224share/doc/qemu/system/devices/usb.html
210share/doc/qemu/system/devices/vhost-user-rng.html 225share/doc/qemu/system/devices/vhost-user-rng.html
211share/doc/qemu/system/devices/vhost-user.html 226share/doc/qemu/system/devices/vhost-user.html
212share/doc/qemu/system/devices/virtio-pmem.html 227share/doc/qemu/system/devices/virtio-pmem.html
213share/doc/qemu/system/gdb.html 228share/doc/qemu/system/gdb.html
214share/doc/qemu/system/generic-loader.html 229share/doc/qemu/system/generic-loader.html
215share/doc/qemu/system/guest-loader.html 230share/doc/qemu/system/guest-loader.html
 231share/doc/qemu/system/i386/amd-memory-encryption.html
216share/doc/qemu/system/i386/cpu.html 232share/doc/qemu/system/i386/cpu.html
217share/doc/qemu/system/i386/kvm-pv.html 233share/doc/qemu/system/i386/kvm-pv.html
218share/doc/qemu/system/i386/microvm.html 234share/doc/qemu/system/i386/microvm.html
219share/doc/qemu/system/i386/pc.html 235share/doc/qemu/system/i386/pc.html
220share/doc/qemu/system/i386/sgx.html 236share/doc/qemu/system/i386/sgx.html
221share/doc/qemu/system/images.html 237share/doc/qemu/system/images.html
222share/doc/qemu/system/index.html 238share/doc/qemu/system/index.html
223share/doc/qemu/system/invocation.html 239share/doc/qemu/system/invocation.html
224share/doc/qemu/system/keys.html 240share/doc/qemu/system/keys.html
225share/doc/qemu/system/linuxboot.html 241share/doc/qemu/system/linuxboot.html
226share/doc/qemu/system/managed-startup.html 242share/doc/qemu/system/managed-startup.html
227share/doc/qemu/system/monitor.html 243share/doc/qemu/system/monitor.html
228share/doc/qemu/system/multi-process.html 244share/doc/qemu/system/multi-process.html
@@ -359,29 +375,27 @@ share/qemu/keymaps/sl @@ -359,29 +375,27 @@ share/qemu/keymaps/sl
359share/qemu/keymaps/sv 375share/qemu/keymaps/sv
360share/qemu/keymaps/th 376share/qemu/keymaps/th
361share/qemu/keymaps/tr 377share/qemu/keymaps/tr
362share/qemu/kvmvapic.bin 378share/qemu/kvmvapic.bin
363share/qemu/linuxboot.bin 379share/qemu/linuxboot.bin
364share/qemu/linuxboot_dma.bin 380share/qemu/linuxboot_dma.bin
365share/qemu/multiboot.bin 381share/qemu/multiboot.bin
366share/qemu/multiboot_dma.bin 382share/qemu/multiboot_dma.bin
367share/qemu/npcm7xx_bootrom.bin 383share/qemu/npcm7xx_bootrom.bin
368share/qemu/openbios-ppc 384share/qemu/openbios-ppc
369share/qemu/openbios-sparc32 385share/qemu/openbios-sparc32
370share/qemu/openbios-sparc64 386share/qemu/openbios-sparc64
371share/qemu/opensbi-riscv32-generic-fw_dynamic.bin 387share/qemu/opensbi-riscv32-generic-fw_dynamic.bin
372share/qemu/opensbi-riscv32-generic-fw_dynamic.elf 
373share/qemu/opensbi-riscv64-generic-fw_dynamic.bin 388share/qemu/opensbi-riscv64-generic-fw_dynamic.bin
374share/qemu/opensbi-riscv64-generic-fw_dynamic.elf 
375share/qemu/palcode-clipper 389share/qemu/palcode-clipper
376share/qemu/petalogix-ml605.dtb 390share/qemu/petalogix-ml605.dtb
377share/qemu/petalogix-s3adsp1800.dtb 391share/qemu/petalogix-s3adsp1800.dtb
378share/qemu/pvh.bin 392share/qemu/pvh.bin
379share/qemu/pxe-e1000.rom 393share/qemu/pxe-e1000.rom
380share/qemu/pxe-eepro100.rom 394share/qemu/pxe-eepro100.rom
381share/qemu/pxe-ne2k_pci.rom 395share/qemu/pxe-ne2k_pci.rom
382share/qemu/pxe-pcnet.rom 396share/qemu/pxe-pcnet.rom
383share/qemu/pxe-rtl8139.rom 397share/qemu/pxe-rtl8139.rom
384share/qemu/pxe-virtio.rom 398share/qemu/pxe-virtio.rom
385share/qemu/qboot.rom 399share/qemu/qboot.rom
386share/qemu/qemu-nsis.bmp 400share/qemu/qemu-nsis.bmp
387share/qemu/qemu_vga.ndrv 401share/qemu/qemu_vga.ndrv
@@ -392,13 +406,15 @@ share/qemu/skiboot.lid @@ -392,13 +406,15 @@ share/qemu/skiboot.lid
392share/qemu/slof.bin 406share/qemu/slof.bin
393share/qemu/trace-events-all 407share/qemu/trace-events-all
394share/qemu/u-boot-sam460-20100605.bin 408share/qemu/u-boot-sam460-20100605.bin
395share/qemu/u-boot.e500 409share/qemu/u-boot.e500
396share/qemu/vgabios-ati.bin 410share/qemu/vgabios-ati.bin
397share/qemu/vgabios-bochs-display.bin 411share/qemu/vgabios-bochs-display.bin
398share/qemu/vgabios-cirrus.bin 412share/qemu/vgabios-cirrus.bin
399share/qemu/vgabios-qxl.bin 413share/qemu/vgabios-qxl.bin
400share/qemu/vgabios-ramfb.bin 414share/qemu/vgabios-ramfb.bin
401share/qemu/vgabios-stdvga.bin 415share/qemu/vgabios-stdvga.bin
402share/qemu/vgabios-virtio.bin 416share/qemu/vgabios-virtio.bin
403share/qemu/vgabios-vmware.bin 417share/qemu/vgabios-vmware.bin
404share/qemu/vgabios.bin 418share/qemu/vgabios.bin
 419share/qemu/vof-nvram.bin
 420share/qemu/vof.bin

cvs diff -r1.190 -r1.191 pkgsrc/emulators/qemu/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/distinfo 2021/12/27 10:12:57 1.190
+++ pkgsrc/emulators/qemu/distinfo 2022/05/19 16:10:15 1.191
@@ -1,26 +1,25 @@ @@ -1,26 +1,25 @@
1$NetBSD: distinfo,v 1.190 2021/12/27 10:12:57 nia Exp $ 1$NetBSD: distinfo,v 1.191 2022/05/19 16:10:15 ryoon Exp $
2 2
3BLAKE2s (palcode-clipper-qemu-5.2.0nb8) = d388c896a80c1cc3d4785c8434d6688bbcfd54c28f7252ce550ab162a0bba321 3BLAKE2s (palcode-clipper-qemu-5.2.0nb8) = d388c896a80c1cc3d4785c8434d6688bbcfd54c28f7252ce550ab162a0bba321
4SHA512 (palcode-clipper-qemu-5.2.0nb8) = 33695d6001d86a19793a92d5e31775607c4dfc9ab9eea019ea6c4d543a2e11e8c07f83cca4934811a13ef829b528737ea37d9d2aaf66cba6f2746d44d2aa0b43 4SHA512 (palcode-clipper-qemu-5.2.0nb8) = 33695d6001d86a19793a92d5e31775607c4dfc9ab9eea019ea6c4d543a2e11e8c07f83cca4934811a13ef829b528737ea37d9d2aaf66cba6f2746d44d2aa0b43
5Size (palcode-clipper-qemu-5.2.0nb8) = 159808 bytes 5Size (palcode-clipper-qemu-5.2.0nb8) = 159808 bytes
6BLAKE2s (qemu-6.2.0.tar.xz) = f8a5e369a65ed0903c271712c81a3c8a1b8893f923dfb815a7db1359fc263ece 6BLAKE2s (qemu-7.0.0.tar.xz) = 1d0df58230a436f476df87a7b315ab381743a24837314978f687986d4d0f2a16
7SHA512 (qemu-6.2.0.tar.xz) = e9f8231c9e1cfcc41cb47f10a55d63f6b8aee307af00cf6acf64acb7aa4f49fa7e9d6330703a2abea15d8b7bbaba7d3cb08c83edd98d82642367b527df730817 7SHA512 (qemu-7.0.0.tar.xz) = 44ecd10c018a3763e1bc87d1d35b98890d0d5636acd69fe9b5cadf5024d5af6a31684d60cbe1c3370e02986434c1fb0ad99224e0e6f6fe7eda169992508157b1
8Size (qemu-6.2.0.tar.xz) = 115667324 bytes 8Size (qemu-7.0.0.tar.xz) = 125117636 bytes
9SHA1 (patch-audio_jackaudio.c) = 0c9e2bea94857007938e16285b721d1495fcb8e1 9SHA1 (patch-audio_jackaudio.c) = 0c9e2bea94857007938e16285b721d1495fcb8e1
10SHA1 (patch-backends_tpm_tpm__ioctl.h) = fbd6c877ad605f7120290efbb0ac653c69f351de 10SHA1 (patch-backends_tpm_tpm__ioctl.h) = fbd6c877ad605f7120290efbb0ac653c69f351de
11SHA1 (patch-hw-mips-Kconfig) = c7199ad26ac45116ab4d38252db4234ae93bdf9a 11SHA1 (patch-hw-mips-Kconfig) = c7199ad26ac45116ab4d38252db4234ae93bdf9a
12SHA1 (patch-hw-mips-mipssim.c) = 1f682b74b34398b3ff15f9e7f24a85f4b8bb4853 12SHA1 (patch-hw-mips-mipssim.c) = 1f682b74b34398b3ff15f9e7f24a85f4b8bb4853
13SHA1 (patch-hw_core_uboot__image.h) = 17eef02349343c5fcfb7a4069cb6f8fd11efcb59 13SHA1 (patch-hw_core_uboot__image.h) = 17eef02349343c5fcfb7a4069cb6f8fd11efcb59
14SHA1 (patch-hw_display_omap__dss.c) = 6b13242f28e32346bc70548c216c578d98fd3420 14SHA1 (patch-hw_display_omap__dss.c) = 6b13242f28e32346bc70548c216c578d98fd3420
15SHA1 (patch-hw_i386_acpi-build.c) = 7d23d09f71917cedca4226fd22baa45bcb0f7d33 
16SHA1 (patch-hw_mips_meson.build) = d9a07a81fe6d3c9e2bd45f41fe876cd927a40ced 15SHA1 (patch-hw_mips_meson.build) = d9a07a81fe6d3c9e2bd45f41fe876cd927a40ced
17SHA1 (patch-hw_net_etraxfs__eth.c) = e5dd1661d60dbcd27b332403e0843500ba9544bc 16SHA1 (patch-hw_net_etraxfs__eth.c) = e5dd1661d60dbcd27b332403e0843500ba9544bc
18SHA1 (patch-hw_net_xilinx__axienet.c) = ebcd2676d64ce6f31e4a8c976d4fdf530ad5e8b7 17SHA1 (patch-hw_net_xilinx__axienet.c) = ebcd2676d64ce6f31e4a8c976d4fdf530ad5e8b7
19SHA1 (patch-hw_rtc_mc146818rtc.c) = cc7a3b28010966b65b7a16db756226ac2669f310 18SHA1 (patch-hw_rtc_mc146818rtc.c) = cc7a3b28010966b65b7a16db756226ac2669f310
20SHA1 (patch-hw_scsi_scsi-disk.c) = fdbf2f962a6dcb1a115a7f8a5b8790ff9295fb33 19SHA1 (patch-hw_scsi_scsi-disk.c) = fdbf2f962a6dcb1a115a7f8a5b8790ff9295fb33
21SHA1 (patch-hw_usb_dev-mtp.c) = 94ddf53a41cc75810cfece1b8aef1831fab4ce43 20SHA1 (patch-hw_usb_dev-mtp.c) = 94ddf53a41cc75810cfece1b8aef1831fab4ce43
22SHA1 (patch-meson.build) = 8d9df8f4f02efc67412894ad72d0c53702451394 21SHA1 (patch-meson.build) = 67fcc428b1953a63e4c0aa32ac1d41ec234a2462
23SHA1 (patch-net_tap-solaris.c) = cc953c9a624dd55ace4e130d0b31bbfb956c17d5 22SHA1 (patch-net_tap-solaris.c) = cc953c9a624dd55ace4e130d0b31bbfb956c17d5
24SHA1 (patch-roms_u-boot-sam460ex_Makefile) = 3a1bbf19b1422c10ebdd819eb0b711fafc78e2f2 23SHA1 (patch-roms_u-boot-sam460ex_Makefile) = 3a1bbf19b1422c10ebdd819eb0b711fafc78e2f2
25SHA1 (patch-slirp_src_tcp__subr.c) = bd6d80ecf3baeaf6f8458b2361bcb92298d41f7e 24SHA1 (patch-slirp_src_tcp__subr.c) = bd6d80ecf3baeaf6f8458b2361bcb92298d41f7e
26SHA1 (patch-target_sparc_translate.c) = 7ec2add2fd808facb48b9a66ccc345599251bf76 25SHA1 (patch-target_sparc_translate.c) = 7ec2add2fd808facb48b9a66ccc345599251bf76

cvs diff -r1.10 -r1.11 pkgsrc/emulators/qemu/patches/patch-meson.build (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/patches/patch-meson.build 2021/12/16 12:59:43 1.10
+++ pkgsrc/emulators/qemu/patches/patch-meson.build 2022/05/19 16:10:15 1.11
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1$NetBSD: patch-meson.build,v 1.10 2021/12/16 12:59:43 tnn Exp $ 1$NetBSD: patch-meson.build,v 1.11 2022/05/19 16:10:15 ryoon Exp $
2 2
3* Detect iconv in libc properly for pkgsrc (pkgsrc removes -liconv) 3* Detect iconv in libc properly for pkgsrc (pkgsrc removes -liconv)
4 to fix qemu-system-aarch64 link. 4 to fix qemu-system-aarch64 link.
5* Detect curses (non-ncurses{,w} too) 5* Detect curses (non-ncurses{,w} too)
6 6
7--- meson.build.orig 2021-12-14 20:42:02.000000000 +0000 7--- meson.build.orig 2022-04-19 19:10:27.000000000 +0000
8+++ meson.build 8+++ meson.build
9@@ -722,7 +722,7 @@ if have_system and not get_option('curse 9@@ -768,7 +768,7 @@ if have_system and get_option('curses').
10 has_curses_h = cc.has_header('curses.h', args: curses_compile_args) 10 has_curses_h = cc.has_header('curses.h', args: curses_compile_args)
11 endif 11 endif
12 if has_curses_h 12 if has_curses_h
13- curses_libname_list = (targetos == 'windows' ? ['pdcurses'] : ['ncursesw', 'cursesw']) 13- curses_libname_list = (targetos == 'windows' ? ['pdcurses'] : ['ncursesw', 'cursesw'])
14+ curses_libname_list = (targetos == 'windows' ? ['pdcurses'] : ['ncursesw', 'cursesw', 'curses']) 14+ curses_libname_list = (targetos == 'windows' ? ['pdcurses'] : ['ncursesw', 'cursesw', 'curses'])
15 foreach curses_libname : curses_libname_list 15 foreach curses_libname : curses_libname_list
16 libcurses = cc.find_library(curses_libname, 16 libcurses = cc.find_library(curses_libname,
17 required: false, 17 required: false,
18@@ -740,7 +740,7 @@ if have_system and not get_option('curse 18@@ -786,7 +786,7 @@ if have_system and get_option('curses').
19 endif 19 endif
20 endif 20 endif
21 if not get_option('iconv').disabled() 21 if get_option('iconv').allowed()
22- foreach link_args : [ ['-liconv'], [] ] 22- foreach link_args : [ ['-liconv'], [] ]
23+ foreach link_args : [ [], ['-liconv'] ] 23+ foreach link_args : [ [], ['-liconv'] ]
24 # Programs will be linked with glib and this will bring in libiconv on FreeBSD. 24 # Programs will be linked with glib and this will bring in libiconv on FreeBSD.
25 # We need to use libiconv if available because mixing libiconv's headers with 25 # We need to use libiconv if available because mixing libiconv's headers with
26 # the system libc does not work. 26 # the system libc does not work.