CVS commit: pkgsrc/emulators/qemu

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Sep  5 07:40:08 UTC 2024

Modified Files:
        pkgsrc/emulators/qemu: Makefile PLIST distinfo
        pkgsrc/emulators/qemu/patches: patch-hw-mips-Kconfig
            patch-hw_mips_meson.build

Log Message:
qemu: updated to 9.1.0

9.1.0
https://wiki.qemu.org/ChangeLog/9.1


To generate a diff of this commit:
cvs rdiff -u -r1.348 -r1.349 pkgsrc/emulators/qemu/Makefile
cvs rdiff -u -r1.89 -r1.90 pkgsrc/emulators/qemu/PLIST
cvs rdiff -u -r1.220 -r1.221 pkgsrc/emulators/qemu/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/emulators/qemu/patches/patch-hw-mips-Kconfig \
    pkgsrc/emulators/qemu/patches/patch-hw_mips_meson.build

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/qemu/Makefile
diff -u pkgsrc/emulators/qemu/Makefile:1.348 pkgsrc/emulators/qemu/Makefile:1.349
--- pkgsrc/emulators/qemu/Makefile:1.348        Sat Aug 10 07:00:51 2024
+++ pkgsrc/emulators/qemu/Makefile      Thu Sep  5 07:40:08 2024
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.348 2024/08/10 07:00:51 adam Exp $
+# $NetBSD: Makefile,v 1.349 2024/09/05 07:40:08 adam Exp $
 
-DISTNAME=      qemu-9.0.2
+DISTNAME=      qemu-9.1.0
 CATEGORIES=    emulators
 MASTER_SITES=  https://download.qemu.org/
 EXTRACT_SUFX=  .tar.xz
@@ -24,7 +24,12 @@ HAS_CONFIGURE=               yes
 # https://github.com/qemu/qemu/commit/56208a0d473c6db263cc333c787ca48b502d72ab
 GCC_REQD+=     7
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27 38 39 # py-sphinx
+PYTHON_VERSIONS_INCOMPATIBLE=  38 39 # py-sphinx
+
+.include "../../lang/python/pyversion.mk"
+.if ${PYTHON_VERSION} < 311
+DEPENDS+=      ${PYPKGPREFIX}-tomli>=1.0.0:../../textproc/py-tomli
+.endif
 
 .include "options.mk"
 
@@ -71,7 +76,6 @@ NOT_PAX_MPROTECT_SAFE+=       bin/qemu-system-
 NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-mips64
 NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-mips64el
 NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-mipsel
-NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-nios2
 NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-or1k
 NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-ppc
 NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-ppc64

Index: pkgsrc/emulators/qemu/PLIST
diff -u pkgsrc/emulators/qemu/PLIST:1.89 pkgsrc/emulators/qemu/PLIST:1.90
--- pkgsrc/emulators/qemu/PLIST:1.89    Wed Apr 24 07:20:59 2024
+++ pkgsrc/emulators/qemu/PLIST Thu Sep  5 07:40:08 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.89 2024/04/24 07:20:59 adam Exp $
+@comment $NetBSD: PLIST,v 1.90 2024/09/05 07:40:08 adam Exp $
 bin/elf2dmp
 ${PLIST.aarch64}bin/qemu-aarch64
 ${PLIST.aarch64_be}bin/qemu-aarch64_be
@@ -55,7 +55,6 @@ bin/qemu-system-mips
 bin/qemu-system-mips64
 bin/qemu-system-mips64el
 bin/qemu-system-mipsel
-bin/qemu-system-nios2
 bin/qemu-system-or1k
 bin/qemu-system-ppc
 bin/qemu-system-ppc64
@@ -110,6 +109,7 @@ 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/crypto.html
 share/doc/qemu/devel/decodetree.html
 share/doc/qemu/devel/docs.html
 share/doc/qemu/devel/ebpf_rss.html
@@ -122,6 +122,7 @@ share/doc/qemu/devel/index-tcg.html
 share/doc/qemu/devel/index.html
 share/doc/qemu/devel/kconfig.html
 share/doc/qemu/devel/loads-stores.html
+share/doc/qemu/devel/luks-detached-header.html
 share/doc/qemu/devel/maintainers.html
 share/doc/qemu/devel/memory.html
 share/doc/qemu/devel/migration/CPR.html
@@ -133,6 +134,8 @@ share/doc/qemu/devel/migration/index.htm
 share/doc/qemu/devel/migration/main.html
 share/doc/qemu/devel/migration/mapped-ram.html
 share/doc/qemu/devel/migration/postcopy.html
+share/doc/qemu/devel/migration/qpl-compression.html
+share/doc/qemu/devel/migration/uadk-compression.html
 share/doc/qemu/devel/migration/vfio.html
 share/doc/qemu/devel/migration/virtio.html
 share/doc/qemu/devel/modules.html
@@ -175,7 +178,10 @@ share/doc/qemu/interop/dbus-vmstate.html
 share/doc/qemu/interop/dbus.html
 share/doc/qemu/interop/index.html
 share/doc/qemu/interop/live-block-operations.html
+share/doc/qemu/interop/nbd.html
+share/doc/qemu/interop/parallels.html
 share/doc/qemu/interop/pr-helper.html
+share/doc/qemu/interop/prl-xml.html
 share/doc/qemu/interop/qemu-ga-ref.html
 share/doc/qemu/interop/qemu-ga.html
 share/doc/qemu/interop/qemu-qmp-ref.html
@@ -211,7 +217,10 @@ share/doc/qemu/specs/ppc-spapr-uv-hcalls
 share/doc/qemu/specs/ppc-spapr-xive.html
 share/doc/qemu/specs/ppc-xive.html
 share/doc/qemu/specs/pvpanic.html
+share/doc/qemu/specs/rapl-msr.html
+share/doc/qemu/specs/rocker.html
 share/doc/qemu/specs/sev-guest-firmware.html
+share/doc/qemu/specs/spdm.html
 share/doc/qemu/specs/standard-vga.html
 share/doc/qemu/specs/tpm.html
 share/doc/qemu/specs/virt-ctlr.html
@@ -253,6 +262,7 @@ share/doc/qemu/system/arm/vexpress.html
 share/doc/qemu/system/arm/virt.html
 share/doc/qemu/system/arm/xenpvh.html
 share/doc/qemu/system/arm/xlnx-versal-virt.html
+share/doc/qemu/system/arm/xlnx-zynq.html
 share/doc/qemu/system/arm/xscale.html
 share/doc/qemu/system/authz.html
 share/doc/qemu/system/barrier.html
@@ -353,6 +363,7 @@ 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/qemu-vmsr-helper.html
 share/doc/qemu/tools/virtfs-proxy-helper.html
 share/doc/qemu/user/index.html
 share/doc/qemu/user/main.html
@@ -389,6 +400,8 @@ share/qemu/edk2-i386-code.fd
 share/qemu/edk2-i386-secure-code.fd
 share/qemu/edk2-i386-vars.fd
 share/qemu/edk2-licenses.txt
+share/qemu/edk2-riscv-code.fd
+share/qemu/edk2-riscv-vars.fd
 share/qemu/edk2-x86_64-code.fd
 share/qemu/edk2-x86_64-secure-code.fd
 share/qemu/efi-e1000.rom

Index: pkgsrc/emulators/qemu/distinfo
diff -u pkgsrc/emulators/qemu/distinfo:1.220 pkgsrc/emulators/qemu/distinfo:1.221
--- pkgsrc/emulators/qemu/distinfo:1.220        Wed Jul 17 04:12:47 2024
+++ pkgsrc/emulators/qemu/distinfo      Thu Sep  5 07:40:08 2024
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.220 2024/07/17 04:12:47 adam Exp $
+$NetBSD: distinfo,v 1.221 2024/09/05 07:40:08 adam Exp $
 
 BLAKE2s (palcode-clipper-qemu-5.2.0nb8) = d388c896a80c1cc3d4785c8434d6688bbcfd54c28f7252ce550ab162a0bba321
 SHA512 (palcode-clipper-qemu-5.2.0nb8) = 33695d6001d86a19793a92d5e31775607c4dfc9ab9eea019ea6c4d543a2e11e8c07f83cca4934811a13ef829b528737ea37d9d2aaf66cba6f2746d44d2aa0b43
 Size (palcode-clipper-qemu-5.2.0nb8) = 159808 bytes
-BLAKE2s (qemu-9.0.2.tar.xz) = 636cabfc914e72ba90080a5c66c8f26753b563a478a6a0a3e2c82056e2882b6d
-SHA512 (qemu-9.0.2.tar.xz) = 58ed84f6fe6263d279356bc9193f96edf62cf3663fb151daa3f047d52329fe49cb91c2d45e09697e0469f4f5409be96403aec9572d4871ffa40848a786c21599
-Size (qemu-9.0.2.tar.xz) = 132387528 bytes
+BLAKE2s (qemu-9.1.0.tar.xz) = 734ecdd9816bfe392b681733f0a6a2f543355fd0894c3cdddc816c3843491be4
+SHA512 (qemu-9.1.0.tar.xz) = bf61d65e37945fa8ee8640712c719ace05164d86e6df700b98bdc5f79e0a8d5e8f85bd48e726edb62b2419db20673f63ec8b63a60393a914b09cb365621b35e2
+Size (qemu-9.1.0.tar.xz) = 132478356 bytes
 SHA1 (patch-audio_jackaudio.c) = 771c2779e565242a500adc0223ef6b1ae5b2b91f
-SHA1 (patch-hw-mips-Kconfig) = 77bebb1bcb68d8cbce23b4c16f965f99f0a43581
+SHA1 (patch-hw-mips-Kconfig) = c328e32e7dc8c87fe18b4e54adf1eafc828a516d
 SHA1 (patch-hw-mips-mipssim.c) = 1683a52c0f065a5adb342f0a71bc63d3e7ffd931
 SHA1 (patch-hw_display_omap__dss.c) = 68f6f5e86335114de64b397959a2238de84fcde2
-SHA1 (patch-hw_mips_meson.build) = 78bba0051a162bd1caec8273bc29cb15bb335fd4
+SHA1 (patch-hw_mips_meson.build) = 8bb977310e8dcd4fe12ddae343891855dd05c7d2
 SHA1 (patch-hw_net_etraxfs__eth.c) = e5dd1661d60dbcd27b332403e0843500ba9544bc
 SHA1 (patch-hw_net_xilinx__axienet.c) = ebcd2676d64ce6f31e4a8c976d4fdf530ad5e8b7
 SHA1 (patch-hw_rtc_mc146818rtc.c) = cc7a3b28010966b65b7a16db756226ac2669f310

Index: pkgsrc/emulators/qemu/patches/patch-hw-mips-Kconfig
diff -u pkgsrc/emulators/qemu/patches/patch-hw-mips-Kconfig:1.4 pkgsrc/emulators/qemu/patches/patch-hw-mips-Kconfig:1.5
--- pkgsrc/emulators/qemu/patches/patch-hw-mips-Kconfig:1.4     Wed Apr 24 07:20:59 2024
+++ pkgsrc/emulators/qemu/patches/patch-hw-mips-Kconfig Thu Sep  5 07:40:08 2024
@@ -1,9 +1,9 @@
-$NetBSD: patch-hw-mips-Kconfig,v 1.4 2024/04/24 07:20:59 adam Exp $
+$NetBSD: patch-hw-mips-Kconfig,v 1.5 2024/09/05 07:40:08 adam Exp $
 
---- hw/mips/Kconfig.orig       2024-04-10 17:43:25.000000000 +0000
+--- hw/mips/Kconfig.orig       2024-09-04 17:40:41.000000000 +0000
 +++ hw/mips/Kconfig
-@@ -15,6 +15,8 @@ config MIPSSIM
-     bool
+@@ -19,6 +19,8 @@ config MIPSSIM
+     depends on MIPS
      select SERIAL
      select MIPSNET
 +    select VIRTIO_MMIO
Index: pkgsrc/emulators/qemu/patches/patch-hw_mips_meson.build
diff -u pkgsrc/emulators/qemu/patches/patch-hw_mips_meson.build:1.4 pkgsrc/emulators/qemu/patches/patch-hw_mips_meson.build:1.5
--- pkgsrc/emulators/qemu/patches/patch-hw_mips_meson.build:1.4 Wed Apr 24 07:20:59 2024
+++ pkgsrc/emulators/qemu/patches/patch-hw_mips_meson.build     Thu Sep  5 07:40:08 2024
@@ -1,6 +1,6 @@
-$NetBSD: patch-hw_mips_meson.build,v 1.4 2024/04/24 07:20:59 adam Exp $
+$NetBSD: patch-hw_mips_meson.build,v 1.5 2024/09/05 07:40:08 adam Exp $
 
---- hw/mips/meson.build.orig   2024-04-10 17:43:25.000000000 +0000
+--- hw/mips/meson.build.orig   2024-09-04 17:40:41.000000000 +0000
 +++ hw/mips/meson.build
 @@ -7,7 +7,7 @@ mips_ss.add(when: 'CONFIG_MIPS_CPS', if_
  
@@ -9,5 +9,5 @@ $NetBSD: patch-hw_mips_meson.build,v 1.4
 -mips_ss.add(when: 'CONFIG_MIPSSIM', if_true: files('mipssim.c'))
 +mips_ss.add(when: 'CONFIG_MIPSSIM', if_true: files('mipssim.c', 'mipssim_virtio.c'))
  mips_ss.add(when: 'CONFIG_FULOONG', if_true: files('fuloong2e.c'))
- mips_ss.add(when: 'CONFIG_MIPS_BOSTON', if_true: [files('boston.c'), fdt])
+ mips_ss.add(when: 'CONFIG_MIPS_BOSTON', if_true: files('boston.c'))
  endif