CVS commit: pkgsrc/emulators/qemu

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Aug 23 15:19:02 UTC 2023

Modified Files:
        pkgsrc/emulators/qemu: Makefile PLIST distinfo options.mk
        pkgsrc/emulators/qemu/patches: patch-meson.build
            patch-target_i386_meson.build
Removed Files:
        pkgsrc/emulators/qemu/patches:
            patch-meson_mesonbuild_linkers_linkers.py

Log Message:
qemu: updated to 8.1.0

PkgSrc:
- SDL option is now suggested for all platforms

8.1.0
Read this: https://wiki.qemu.org/ChangeLog/8.1


To generate a diff of this commit:
cvs rdiff -u -r1.320 -r1.321 pkgsrc/emulators/qemu/Makefile
cvs rdiff -u -r1.85 -r1.86 pkgsrc/emulators/qemu/PLIST
cvs rdiff -u -r1.207 -r1.208 pkgsrc/emulators/qemu/distinfo
cvs rdiff -u -r1.20 -r1.21 pkgsrc/emulators/qemu/options.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/emulators/qemu/patches/patch-meson.build
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/emulators/qemu/patches/patch-meson_mesonbuild_linkers_linkers.py
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/emulators/qemu/patches/patch-target_i386_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.320 pkgsrc/emulators/qemu/Makefile:1.321
--- pkgsrc/emulators/qemu/Makefile:1.320        Mon Aug 21 12:10:59 2023
+++ pkgsrc/emulators/qemu/Makefile      Wed Aug 23 15:19:02 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.320 2023/08/21 12:10:59 adam Exp $
+# $NetBSD: Makefile,v 1.321 2023/08/23 15:19:02 adam Exp $
 
-DISTNAME=      qemu-8.0.4
+DISTNAME=      qemu-8.1.0
 CATEGORIES=    emulators
 MASTER_SITES=  https://download.qemu.org/
 EXTRACT_SUFX=  .tar.xz
@@ -10,7 +10,10 @@ HOMEPAGE=    https://www.qemu.org/
 COMMENT=       CPU emulator using dynamic translation
 LICENSE=       gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit AND modified-bsd
 
+TOOL_DEPENDS+= meson-[0-9]*:../../devel/meson
 TOOL_DEPENDS+= ninja-build-[0-9]*:../../devel/ninja-build
+TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
+TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx-rtd-theme>=1.2.0:../../textproc/py-sphinx-rtd-theme
 
 USE_CURSES=            resize_term wide
 USE_LANGUAGES+=                c c++
@@ -23,10 +26,6 @@ GCC_REQD+=           7
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
-TOOL_DEPENDS+=         ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
-TOOL_DEPENDS+=         ${PYPKGPREFIX}-sphinx-rtd-theme>=1.2.0:../../textproc/py-sphinx-rtd-theme
-CONFIGURE_ARGS+=       --sphinx-build=${PREFIX}/bin/sphinx-build-${PYVERSSUFFIX}
-
 .include "options.mk"
 
 .include "../../mk/bsd.prefs.mk"

Index: pkgsrc/emulators/qemu/PLIST
diff -u pkgsrc/emulators/qemu/PLIST:1.85 pkgsrc/emulators/qemu/PLIST:1.86
--- pkgsrc/emulators/qemu/PLIST:1.85    Sat May  6 19:22:37 2023
+++ pkgsrc/emulators/qemu/PLIST Wed Aug 23 15:19:02 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.85 2023/05/06 19:22:37 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.86 2023/08/23 15:19:02 adam Exp $
 bin/elf2dmp
 ${PLIST.aarch64}bin/qemu-aarch64
 ${PLIST.aarch64_be}bin/qemu-aarch64_be
@@ -127,7 +127,9 @@ 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/qdev-api.html
 share/doc/qemu/devel/qgraph.html
+share/doc/qemu/devel/qom-api.html
 share/doc/qemu/devel/qom.html
 share/doc/qemu/devel/qtest.html
 share/doc/qemu/devel/replay.html
@@ -149,6 +151,7 @@ share/doc/qemu/devel/ui.html
 share/doc/qemu/devel/vfio-migration.html
 share/doc/qemu/devel/virtio-backends.html
 share/doc/qemu/devel/writing-monitor-commands.html
+share/doc/qemu/devel/zoned-storage.html
 share/doc/qemu/genindex.html
 share/doc/qemu/index.html
 share/doc/qemu/interop/barrier.html
@@ -163,6 +166,7 @@ share/doc/qemu/interop/qemu-ga-ref.html
 share/doc/qemu/interop/qemu-ga.html
 share/doc/qemu/interop/qemu-qmp-ref.html
 share/doc/qemu/interop/qemu-storage-daemon-qmp-ref.html
+share/doc/qemu/interop/qmp-spec.html
 share/doc/qemu/interop/vhost-user-gpu.html
 share/doc/qemu/interop/vhost-user.html
 share/doc/qemu/interop/vhost-vdpa.html
@@ -180,6 +184,9 @@ share/doc/qemu/specs/acpi_nvdimm.html
 share/doc/qemu/specs/acpi_pci_hotplug.html
 share/doc/qemu/specs/fw_cfg.html
 share/doc/qemu/specs/index.html
+share/doc/qemu/specs/pci-ids.html
+share/doc/qemu/specs/pci-serial.html
+share/doc/qemu/specs/pci-testdev.html
 share/doc/qemu/specs/ppc-spapr-hcalls.html
 share/doc/qemu/specs/ppc-spapr-hotplug.html
 share/doc/qemu/specs/ppc-spapr-numa.html
@@ -189,6 +196,7 @@ share/doc/qemu/specs/ppc-xive.html
 share/doc/qemu/specs/sev-guest-firmware.html
 share/doc/qemu/specs/tpm.html
 share/doc/qemu/system/arm/aspeed.html
+share/doc/qemu/system/arm/bananapi_m2u.html
 share/doc/qemu/system/arm/collie.html
 share/doc/qemu/system/arm/cpu-features.html
 share/doc/qemu/system/arm/cubieboard.html
@@ -219,6 +227,7 @@ 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/xenpvh.html
 share/doc/qemu/system/arm/xlnx-versal-virt.html
 share/doc/qemu/system/arm/xscale.html
 share/doc/qemu/system/authz.html
@@ -233,8 +242,10 @@ share/doc/qemu/system/devices/ccid.html
 share/doc/qemu/system/devices/cxl.html
 share/doc/qemu/system/devices/igb.html
 share/doc/qemu/system/devices/ivshmem.html
+share/doc/qemu/system/devices/keyboard.html
 share/doc/qemu/system/devices/net.html
 share/doc/qemu/system/devices/nvme.html
+share/doc/qemu/system/devices/usb-u2f.html
 share/doc/qemu/system/devices/usb.html
 share/doc/qemu/system/devices/vhost-user-rng.html
 share/doc/qemu/system/devices/vhost-user.html

Index: pkgsrc/emulators/qemu/distinfo
diff -u pkgsrc/emulators/qemu/distinfo:1.207 pkgsrc/emulators/qemu/distinfo:1.208
--- pkgsrc/emulators/qemu/distinfo:1.207        Mon Aug 21 12:10:59 2023
+++ pkgsrc/emulators/qemu/distinfo      Wed Aug 23 15:19:02 2023
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.207 2023/08/21 12:10:59 adam Exp $
+$NetBSD: distinfo,v 1.208 2023/08/23 15:19:02 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-8.0.4.tar.xz) = ea17da5264c0c700e18f1464b1754914d4b1212caf2f44094d723cdb790ace9a
-SHA512 (qemu-8.0.4.tar.xz) = bd5ed682d51f974abd4be93f949701f9b5bfb87fd9929e31df130534da2f2c03b99adc9f924b3efd47d3b254e0e3c0046f4e69fbe9f6d0c4ac1f6babecb29449
-Size (qemu-8.0.4.tar.xz) = 126179324 bytes
+BLAKE2s (qemu-8.1.0.tar.xz) = 1cc9e5b6997ea9700a6dead14fa02cfa18a72e74f6c4a92c28044a096cd104c6
+SHA512 (qemu-8.1.0.tar.xz) = c5f5e7ce2d8e3c93a02012b136c866e8577df07da4705a0045916c71caeaa21fa1b2d59a4b22a660789a4159b192e12a443e7cbb0724ee85fea258251731724c
+Size (qemu-8.1.0.tar.xz) = 123550284 bytes
 SHA1 (patch-audio_jackaudio.c) = 771c2779e565242a500adc0223ef6b1ae5b2b91f
 SHA1 (patch-hw-mips-Kconfig) = c7199ad26ac45116ab4d38252db4234ae93bdf9a
 SHA1 (patch-hw-mips-mipssim.c) = 1f682b74b34398b3ff15f9e7f24a85f4b8bb4853
@@ -16,12 +16,11 @@ SHA1 (patch-hw_net_xilinx__axienet.c) = 
 SHA1 (patch-hw_rtc_mc146818rtc.c) = cc7a3b28010966b65b7a16db756226ac2669f310
 SHA1 (patch-hw_scsi_scsi-disk.c) = fdbf2f962a6dcb1a115a7f8a5b8790ff9295fb33
 SHA1 (patch-hw_usb_dev-mtp.c) = 94ddf53a41cc75810cfece1b8aef1831fab4ce43
-SHA1 (patch-meson.build) = 67fcc428b1953a63e4c0aa32ac1d41ec234a2462
-SHA1 (patch-meson_mesonbuild_linkers_linkers.py) = 842b01f543c99c66630df8450f71ab9fc422ff32
+SHA1 (patch-meson.build) = 0a3e28d8bf6bf6be311787d964ac4694c58c2fca
 SHA1 (patch-roms_u-boot-sam460ex_Makefile) = 3a1bbf19b1422c10ebdd819eb0b711fafc78e2f2
 SHA1 (patch-target_arm_tcg_translate-sve.c) = b5eeb08331e61a16b2cf4b7ab9b668755aa9a04e
 SHA1 (patch-target_i386_cpu.c) = afa8a2f83399b2d142709322eb88d1112f1547e4
-SHA1 (patch-target_i386_meson.build) = 0ef0636dd68e5eeb9a2a34473e2a24bf3c141c0f
+SHA1 (patch-target_i386_meson.build) = b8f413866ac1079d3ddeb21aacf226509e25ae9c
 SHA1 (patch-target_sparc_translate.c) = f633b3953847c1a7e93f1d09a67964431979b197
 SHA1 (patch-util_coroutine-ucontext.c) = 890767e1f034b34f4aad6c791745fc0b151b8e3c
 SHA1 (patch-util_osdep.c) = 1e5bcde7be23792f487334d35797869bff686d25

Index: pkgsrc/emulators/qemu/options.mk
diff -u pkgsrc/emulators/qemu/options.mk:1.20 pkgsrc/emulators/qemu/options.mk:1.21
--- pkgsrc/emulators/qemu/options.mk:1.20       Sat May  6 19:22:37 2023
+++ pkgsrc/emulators/qemu/options.mk    Wed Aug 23 15:19:02 2023
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.20 2023/05/06 19:22:37 ryoon Exp $
+# $NetBSD: options.mk,v 1.21 2023/08/23 15:19:02 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.qemu
 PKG_SUPPORTED_OPTIONS= debug-info gtk3 iscsi jack sdl spice
-PKG_SUGGESTED_OPTIONS+=        iscsi spice
+PKG_SUGGESTED_OPTIONS+=        iscsi sdl spice
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -16,9 +16,7 @@ PKG_SUPPORTED_OPTIONS+=       virtfs-proxy-hel
 .  include "../../graphics/MesaLib/features.mk"
 .  if !empty(MESALIB_SUPPORTS_EGL:M[Yy][Ee][Ss])
 PKG_SUPPORTED_OPTIONS+=        opengl
-PKG_SUGGESTED_OPTIONS+=        opengl sdl
-.  else
-PKG_SUGGESTED_OPTIONS+=        sdl
+PKG_SUGGESTED_OPTIONS+=        opengl
 .  endif
 .endif
 

Index: pkgsrc/emulators/qemu/patches/patch-meson.build
diff -u pkgsrc/emulators/qemu/patches/patch-meson.build:1.11 pkgsrc/emulators/qemu/patches/patch-meson.build:1.12
--- pkgsrc/emulators/qemu/patches/patch-meson.build:1.11        Thu May 19 16:10:15 2022
+++ pkgsrc/emulators/qemu/patches/patch-meson.build     Wed Aug 23 15:19:02 2023
@@ -1,12 +1,12 @@
-$NetBSD: patch-meson.build,v 1.11 2022/05/19 16:10:15 ryoon Exp $
+$NetBSD: patch-meson.build,v 1.12 2023/08/23 15:19:02 adam Exp $
 
 * Detect iconv in libc properly for pkgsrc (pkgsrc removes -liconv)
   to fix qemu-system-aarch64 link.
 * Detect curses (non-ncurses{,w} too)
 
---- meson.build.orig   2022-04-19 19:10:27.000000000 +0000
+--- meson.build.orig   2023-08-22 15:34:02.000000000 +0000
 +++ meson.build
-@@ -768,7 +768,7 @@ if have_system and get_option('curses').
+@@ -1184,7 +1184,7 @@ if have_system and get_option('curses').
        has_curses_h = cc.has_header('curses.h', args: curses_compile_args)
      endif
      if has_curses_h
@@ -14,8 +14,8 @@ $NetBSD: patch-meson.build,v 1.11 2022/0
 +      curses_libname_list = (targetos == 'windows' ? ['pdcurses'] : ['ncursesw', 'cursesw', 'curses'])
        foreach curses_libname : curses_libname_list
          libcurses = cc.find_library(curses_libname,
-                                     required: false,
-@@ -786,7 +786,7 @@ if have_system and get_option('curses').
+                                     required: false)
+@@ -1201,7 +1201,7 @@ if have_system and get_option('curses').
      endif
    endif
    if get_option('iconv').allowed()

Index: pkgsrc/emulators/qemu/patches/patch-target_i386_meson.build
diff -u pkgsrc/emulators/qemu/patches/patch-target_i386_meson.build:1.4 pkgsrc/emulators/qemu/patches/patch-target_i386_meson.build:1.5
--- pkgsrc/emulators/qemu/patches/patch-target_i386_meson.build:1.4     Sun Jun 12 13:49:28 2022
+++ pkgsrc/emulators/qemu/patches/patch-target_i386_meson.build Wed Aug 23 15:19:02 2023
@@ -1,8 +1,8 @@
-$NetBSD: patch-target_i386_meson.build,v 1.4 2022/06/12 13:49:28 leot Exp $
+$NetBSD: patch-target_i386_meson.build,v 1.5 2023/08/23 15:19:02 adam Exp $
 
 Permit to use `-cpu host' with NVMM.
 
---- target/i386/meson.build.orig       2022-04-19 19:10:27.000000000 +0000
+--- target/i386/meson.build.orig       2023-08-22 15:34:02.000000000 +0000
 +++ target/i386/meson.build
 @@ -11,6 +11,7 @@ i386_ss.add(when: 'CONFIG_SEV', if_true:
  # x86 cpu type
@@ -10,5 +10,5 @@ Permit to use `-cpu host' with NVMM.
  i386_ss.add(when: 'CONFIG_HVF', if_true: files('host-cpu.c'))
 +i386_ss.add(when: 'CONFIG_NVMM', if_true: files('host-cpu.c'))
  
- i386_softmmu_ss = ss.source_set()
- i386_softmmu_ss.add(files(
+ i386_system_ss = ss.source_set()
+ i386_system_ss.add(files(