CVS commit: pkgsrc/emulators/qemu

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/emulators/qemu
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Wed, 24 Apr 2024 07:20:59 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Apr 24 07:20:59 UTC 2024

Modified Files:
        pkgsrc/emulators/qemu: Makefile PLIST distinfo
        pkgsrc/emulators/qemu/files: hw-mips-mipssim_virtio.c
        pkgsrc/emulators/qemu/patches: patch-hw-mips-Kconfig
            patch-hw-mips-mipssim.c patch-hw_mips_meson.build patch-meson.build
            patch-target_i386_cpu.c

Log Message:
qemu: updated to 9.0.0

9.0.0
https://wiki.qemu.org/ChangeLog/9.0


To generate a diff of this commit:
cvs rdiff -u -r1.340 -r1.341 pkgsrc/emulators/qemu/Makefile
cvs rdiff -u -r1.88 -r1.89 pkgsrc/emulators/qemu/PLIST
cvs rdiff -u -r1.216 -r1.217 pkgsrc/emulators/qemu/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/emulators/qemu/files/hw-mips-mipssim_virtio.c
cvs rdiff -u -r1.3 -r1.4 pkgsrc/emulators/qemu/patches/patch-hw-mips-Kconfig \
    pkgsrc/emulators/qemu/patches/patch-hw_mips_meson.build \
    pkgsrc/emulators/qemu/patches/patch-target_i386_cpu.c
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/emulators/qemu/patches/patch-hw-mips-mipssim.c
cvs rdiff -u -r1.14 -r1.15 pkgsrc/emulators/qemu/patches/patch-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.340 pkgsrc/emulators/qemu/Makefile:1.341
--- pkgsrc/emulators/qemu/Makefile:1.340        Sun Apr  7 07:33:58 2024
+++ pkgsrc/emulators/qemu/Makefile      Wed Apr 24 07:20:59 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.340 2024/04/07 07:33:58 wiz Exp $
+# $NetBSD: Makefile,v 1.341 2024/04/24 07:20:59 adam Exp $
 
-DISTNAME=      qemu-8.2.2
-PKGREVISION=   2
+DISTNAME=      qemu-9.0.0
 CATEGORIES=    emulators
 MASTER_SITES=  https://download.qemu.org/
 EXTRACT_SUFX=  .tar.xz
@@ -23,7 +22,7 @@ UNLIMIT_RESOURCES=    datasize
 HAS_CONFIGURE=         yes
 
 # https://github.com/qemu/qemu/commit/56208a0d473c6db263cc333c787ca48b502d72ab
-GCC_REQD+=             7
+GCC_REQD+=     7
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
@@ -212,6 +211,7 @@ post-install:
 .include "../../lang/python/tool.mk"
 .include "../../net/libslirp/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
+.include "../../security/libtasn1/buildlink3.mk"
 .include "../../sysutils/dtc/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../x11/pixman/buildlink3.mk"

Index: pkgsrc/emulators/qemu/PLIST
diff -u pkgsrc/emulators/qemu/PLIST:1.88 pkgsrc/emulators/qemu/PLIST:1.89
--- pkgsrc/emulators/qemu/PLIST:1.88    Thu Dec 28 17:15:39 2023
+++ pkgsrc/emulators/qemu/PLIST Wed Apr 24 07:20:59 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.88 2023/12/28 17:15:39 adam Exp $
+@comment $NetBSD: PLIST,v 1.89 2024/04/24 07:20:59 adam Exp $
 bin/elf2dmp
 ${PLIST.aarch64}bin/qemu-aarch64
 ${PLIST.aarch64_be}bin/qemu-aarch64_be
@@ -111,6 +111,7 @@ share/doc/qemu/devel/code-of-conduct.htm
 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/docs.html
 share/doc/qemu/devel/ebpf_rss.html
 share/doc/qemu/devel/fuzzing.html
 share/doc/qemu/devel/index-api.html
@@ -123,7 +124,17 @@ share/doc/qemu/devel/kconfig.html
 share/doc/qemu/devel/loads-stores.html
 share/doc/qemu/devel/maintainers.html
 share/doc/qemu/devel/memory.html
-share/doc/qemu/devel/migration.html
+share/doc/qemu/devel/migration/CPR.html
+share/doc/qemu/devel/migration/best-practices.html
+share/doc/qemu/devel/migration/compatibility.html
+share/doc/qemu/devel/migration/dirty-limit.html
+share/doc/qemu/devel/migration/features.html
+share/doc/qemu/devel/migration/index.html
+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/vfio.html
+share/doc/qemu/devel/migration/virtio.html
 share/doc/qemu/devel/modules.html
 share/doc/qemu/devel/multi-process.html
 share/doc/qemu/devel/multi-thread-tcg.html
@@ -151,7 +162,7 @@ share/doc/qemu/devel/testing.html
 share/doc/qemu/devel/tracing.html
 share/doc/qemu/devel/trivial-patches.html
 share/doc/qemu/devel/ui.html
-share/doc/qemu/devel/vfio-migration.html
+share/doc/qemu/devel/vfio-iommufd.html
 share/doc/qemu/devel/virtio-backends.html
 share/doc/qemu/devel/writing-monitor-commands.html
 share/doc/qemu/devel/zoned-storage.html
@@ -186,6 +197,7 @@ share/doc/qemu/specs/acpi_mem_hotplug.ht
 share/doc/qemu/specs/acpi_nvdimm.html
 share/doc/qemu/specs/acpi_pci_hotplug.html
 share/doc/qemu/specs/edu.html
+share/doc/qemu/specs/fsi.html
 share/doc/qemu/specs/fw_cfg.html
 share/doc/qemu/specs/index.html
 share/doc/qemu/specs/ivshmem-spec.html
@@ -207,6 +219,7 @@ share/doc/qemu/specs/vmcoreinfo.html
 share/doc/qemu/specs/vmgenid.html
 share/doc/qemu/specs/vmw_pvscsi-spec.html
 share/doc/qemu/system/arm/aspeed.html
+share/doc/qemu/system/arm/b-l475e-iot01a.html
 share/doc/qemu/system/arm/bananapi_m2u.html
 share/doc/qemu/system/arm/collie.html
 share/doc/qemu/system/arm/cpu-features.html
@@ -258,6 +271,7 @@ 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-input.html
 share/doc/qemu/system/devices/vhost-user-rng.html
 share/doc/qemu/system/devices/vhost-user.html
 share/doc/qemu/system/devices/virtio-gpu.html
@@ -289,6 +303,7 @@ share/doc/qemu/system/openrisc/cpu-featu
 share/doc/qemu/system/openrisc/emulation.html
 share/doc/qemu/system/openrisc/or1k-sim.html
 share/doc/qemu/system/openrisc/virt.html
+share/doc/qemu/system/ppc/amigang.html
 share/doc/qemu/system/ppc/embedded.html
 share/doc/qemu/system/ppc/powermac.html
 share/doc/qemu/system/ppc/powernv.html
@@ -391,6 +406,7 @@ share/qemu/firmware/60-edk2-arm.json
 share/qemu/firmware/60-edk2-i386.json
 share/qemu/firmware/60-edk2-x86_64.json
 share/qemu/hppa-firmware.img
+share/qemu/hppa-firmware64.img
 share/qemu/keymaps/ar
 share/qemu/keymaps/bepo
 share/qemu/keymaps/cz

Index: pkgsrc/emulators/qemu/distinfo
diff -u pkgsrc/emulators/qemu/distinfo:1.216 pkgsrc/emulators/qemu/distinfo:1.217
--- pkgsrc/emulators/qemu/distinfo:1.216        Mon Mar  4 18:46:38 2024
+++ pkgsrc/emulators/qemu/distinfo      Wed Apr 24 07:20:59 2024
@@ -1,25 +1,25 @@
-$NetBSD: distinfo,v 1.216 2024/03/04 18:46:38 adam Exp $
+$NetBSD: distinfo,v 1.217 2024/04/24 07:20:59 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.2.2.tar.xz) = f24a5b17834a3317580fb7ef6e49c027d4e4e20151cdebb9f88c62cd9e790286
-SHA512 (qemu-8.2.2.tar.xz) = dfd2e1305f9e51bfbc90a7738c69336d5f805481a626ea527b971bdfb6dbe6867e5df7461d48d1c22b79be2dc18e057ea9fa36ef593127cd8b262a5c33f1aa41
-Size (qemu-8.2.2.tar.xz) = 129398020 bytes
+BLAKE2s (qemu-9.0.0.tar.xz) = c284922daf1b760b5e506e10044c41a850bc7edb481fdaf90818d86ce81c99ce
+SHA512 (qemu-9.0.0.tar.xz) = 1603517cd4c93632ba60ad7261eb67374f12a744bf58f10b0e8686e46d3a02d8b6bf58a0c617f23a1868084aaba6386c24341894f75539e0b816091718721427
+Size (qemu-9.0.0.tar.xz) = 129789856 bytes
 SHA1 (patch-audio_jackaudio.c) = 771c2779e565242a500adc0223ef6b1ae5b2b91f
-SHA1 (patch-hw-mips-Kconfig) = c7199ad26ac45116ab4d38252db4234ae93bdf9a
-SHA1 (patch-hw-mips-mipssim.c) = 1f682b74b34398b3ff15f9e7f24a85f4b8bb4853
+SHA1 (patch-hw-mips-Kconfig) = 77bebb1bcb68d8cbce23b4c16f965f99f0a43581
+SHA1 (patch-hw-mips-mipssim.c) = 1683a52c0f065a5adb342f0a71bc63d3e7ffd931
 SHA1 (patch-hw_display_omap__dss.c) = 68f6f5e86335114de64b397959a2238de84fcde2
-SHA1 (patch-hw_mips_meson.build) = d9a07a81fe6d3c9e2bd45f41fe876cd927a40ced
+SHA1 (patch-hw_mips_meson.build) = 78bba0051a162bd1caec8273bc29cb15bb335fd4
 SHA1 (patch-hw_net_etraxfs__eth.c) = e5dd1661d60dbcd27b332403e0843500ba9544bc
 SHA1 (patch-hw_net_xilinx__axienet.c) = ebcd2676d64ce6f31e4a8c976d4fdf530ad5e8b7
 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) = 0a3e28d8bf6bf6be311787d964ac4694c58c2fca
+SHA1 (patch-meson.build) = 6b0607903b84c84d26bd5c54f3f0b9e4b256d787
 SHA1 (patch-roms_u-boot-sam460ex_Makefile) = 3a1bbf19b1422c10ebdd819eb0b711fafc78e2f2
 SHA1 (patch-target_arm_tcg_translate-sve.c) = b5eeb08331e61a16b2cf4b7ab9b668755aa9a04e
-SHA1 (patch-target_i386_cpu.c) = 696b1137a7aac18f70933025cab5318b965aee66
+SHA1 (patch-target_i386_cpu.c) = f55795305c385784caee00c2a767a1cafa42ed91
 SHA1 (patch-target_i386_meson.build) = b8f413866ac1079d3ddeb21aacf226509e25ae9c
 SHA1 (patch-target_i386_nvmm_nvmm-all.c) = 28184cc3d1afc064d332bdd2530db16d8258222f
 SHA1 (patch-util_coroutine-ucontext.c) = 02cdf634e64f7e71029047b93747f192df715e6a

Index: pkgsrc/emulators/qemu/files/hw-mips-mipssim_virtio.c
diff -u pkgsrc/emulators/qemu/files/hw-mips-mipssim_virtio.c:1.3 pkgsrc/emulators/qemu/files/hw-mips-mipssim_virtio.c:1.4
--- pkgsrc/emulators/qemu/files/hw-mips-mipssim_virtio.c:1.3    Thu Dec 28 17:15:39 2023
+++ pkgsrc/emulators/qemu/files/hw-mips-mipssim_virtio.c        Wed Apr 24 07:20:59 2024
@@ -40,7 +40,6 @@
 #include "net/net.h"
 #include "sysemu/sysemu.h"
 #include "hw/boards.h"
-#include "hw/mips/bios.h"
 #include "hw/loader.h"
 #include "hw/or-irq.h"
 #include "elf.h"

Index: pkgsrc/emulators/qemu/patches/patch-hw-mips-Kconfig
diff -u pkgsrc/emulators/qemu/patches/patch-hw-mips-Kconfig:1.3 pkgsrc/emulators/qemu/patches/patch-hw-mips-Kconfig:1.4
--- pkgsrc/emulators/qemu/patches/patch-hw-mips-Kconfig:1.3     Sat Feb 20 22:59:29 2021
+++ pkgsrc/emulators/qemu/patches/patch-hw-mips-Kconfig Wed Apr 24 07:20:59 2024
@@ -1,10 +1,10 @@
-$NetBSD: patch-hw-mips-Kconfig,v 1.3 2021/02/20 22:59:29 ryoon Exp $
+$NetBSD: patch-hw-mips-Kconfig,v 1.4 2024/04/24 07:20:59 adam Exp $
 
---- hw/mips/Kconfig.orig       2020-08-11 19:17:15.000000000 +0000
+--- hw/mips/Kconfig.orig       2024-04-10 17:43:25.000000000 +0000
 +++ hw/mips/Kconfig
-@@ -20,6 +20,8 @@ config MIPSSIM
-     select ISA_BUS
-     select SERIAL_ISA
+@@ -15,6 +15,8 @@ config MIPSSIM
+     bool
+     select SERIAL
      select MIPSNET
 +    select VIRTIO_MMIO
 +    select OR_IRQ
Index: pkgsrc/emulators/qemu/patches/patch-hw_mips_meson.build
diff -u pkgsrc/emulators/qemu/patches/patch-hw_mips_meson.build:1.3 pkgsrc/emulators/qemu/patches/patch-hw_mips_meson.build:1.4
--- pkgsrc/emulators/qemu/patches/patch-hw_mips_meson.build:1.3 Fri Aug 27 03:32:37 2021
+++ pkgsrc/emulators/qemu/patches/patch-hw_mips_meson.build     Wed Apr 24 07:20:59 2024
@@ -1,10 +1,10 @@
-$NetBSD: patch-hw_mips_meson.build,v 1.3 2021/08/27 03:32:37 ryoon Exp $
+$NetBSD: patch-hw_mips_meson.build,v 1.4 2024/04/24 07:20:59 adam Exp $
 
---- hw/mips/meson.build.orig   2021-08-04 16:29:07.000000000 +0000
+--- hw/mips/meson.build.orig   2024-04-10 17:43:25.000000000 +0000
 +++ hw/mips/meson.build
 @@ -7,7 +7,7 @@ mips_ss.add(when: 'CONFIG_MIPS_CPS', if_
  
- if 'CONFIG_TCG' in config_all
+ if 'CONFIG_TCG' in config_all_accel
  mips_ss.add(when: 'CONFIG_JAZZ', if_true: files('jazz.c'))
 -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'))
Index: pkgsrc/emulators/qemu/patches/patch-target_i386_cpu.c
diff -u pkgsrc/emulators/qemu/patches/patch-target_i386_cpu.c:1.3 pkgsrc/emulators/qemu/patches/patch-target_i386_cpu.c:1.4
--- pkgsrc/emulators/qemu/patches/patch-target_i386_cpu.c:1.3   Thu Dec 28 17:15:39 2023
+++ pkgsrc/emulators/qemu/patches/patch-target_i386_cpu.c       Wed Apr 24 07:20:59 2024
@@ -1,18 +1,18 @@
-$NetBSD: patch-target_i386_cpu.c,v 1.3 2023/12/28 17:15:39 adam Exp $
+$NetBSD: patch-target_i386_cpu.c,v 1.4 2024/04/24 07:20:59 adam Exp $
 
 Permit to use `-cpu host' with NVMM.
 
---- target/i386/cpu.c.orig     2023-12-19 21:24:34.000000000 +0000
+--- target/i386/cpu.c.orig     2024-04-10 17:43:26.000000000 +0000
 +++ target/i386/cpu.c
-@@ -26,6 +26,7 @@
+@@ -25,6 +25,7 @@
+ #include "cpu.h"
  #include "tcg/helper-tcg.h"
- #include "sysemu/reset.h"
  #include "sysemu/hvf.h"
 +#include "sysemu/nvmm.h"
  #include "hvf/hvf-i386.h"
  #include "kvm/kvm_i386.h"
  #include "sev.h"
-@@ -1643,7 +1644,7 @@ uint32_t xsave_area_size(uint64_t mask,
+@@ -1644,7 +1645,7 @@ uint32_t xsave_area_size(uint64_t mask,
  
  static inline bool accel_uses_host_cpuid(void)
  {
@@ -21,7 +21,7 @@ Permit to use `-cpu host' with NVMM.
  }
  
  static inline uint64_t x86_cpu_xsave_xcr0_components(X86CPU *cpu)
-@@ -7314,7 +7315,8 @@ static void x86_cpu_realizefn(DeviceStat
+@@ -7325,7 +7326,8 @@ static void x86_cpu_realizefn(DeviceStat
  
      if (xcc->host_cpuid_required && !accel_uses_host_cpuid()) {
          g_autofree char *name = x86_cpu_class_get_model_name(xcc);

Index: pkgsrc/emulators/qemu/patches/patch-hw-mips-mipssim.c
diff -u pkgsrc/emulators/qemu/patches/patch-hw-mips-mipssim.c:1.4 pkgsrc/emulators/qemu/patches/patch-hw-mips-mipssim.c:1.5
--- pkgsrc/emulators/qemu/patches/patch-hw-mips-mipssim.c:1.4   Fri Aug 27 03:32:37 2021
+++ pkgsrc/emulators/qemu/patches/patch-hw-mips-mipssim.c       Wed Apr 24 07:20:59 2024
@@ -1,29 +1,16 @@
-$NetBSD: patch-hw-mips-mipssim.c,v 1.4 2021/08/27 03:32:37 ryoon Exp $
+$NetBSD: patch-hw-mips-mipssim.c,v 1.5 2024/04/24 07:20:59 adam Exp $
 
---- hw/mips/mipssim.c.orig     2021-08-04 16:29:07.000000000 +0000
+--- hw/mips/mipssim.c.orig     2024-04-10 17:43:25.000000000 +0000
 +++ hw/mips/mipssim.c
-@@ -39,12 +39,20 @@
+@@ -36,6 +36,7 @@
+ #include "sysemu/sysemu.h"
  #include "hw/boards.h"
- #include "hw/mips/bios.h"
  #include "hw/loader.h"
 +#include "hw/or-irq.h"
  #include "elf.h"
  #include "hw/sysbus.h"
  #include "hw/qdev-properties.h"
- #include "qemu/error-report.h"
- #include "sysemu/qtest.h"
- #include "sysemu/reset.h"
-+#include "hw/virtio/virtio-mmio.h"
-+
-+#define NUM_VIRTIO_TRANSPORTS 32
-+
-+#define DEV_SPACING           0x10000         /* space devices every 64k */
-+#define ISA_BASE              0x1fd00000
-+#define       VIRTIO_MMIO_BASE        (ISA_BASE + DEV_SPACING)
- 
- static struct _loaderparams {
-     int ram_size;
-@@ -135,7 +143,7 @@ static void mipsnet_init(int base, qemu_
+@@ -136,7 +137,7 @@ static void mipsnet_init(int base, qemu_
                                  sysbus_mmio_get_region(s, 0));
  }
  
@@ -32,7 +19,7 @@ $NetBSD: patch-hw-mips-mipssim.c,v 1.4 2
  mips_mipssim_init(MachineState *machine)
  {
      const char *kernel_filename = machine->kernel_filename;
-@@ -146,6 +154,7 @@ mips_mipssim_init(MachineState *machine)
+@@ -147,6 +148,7 @@ mips_mipssim_init(MachineState *machine)
      MemoryRegion *isa = g_new(MemoryRegion, 1);
      MemoryRegion *bios = g_new(MemoryRegion, 1);
      Clock *cpuclk;
@@ -40,19 +27,10 @@ $NetBSD: patch-hw-mips-mipssim.c,v 1.4 2
      MIPSCPU *cpu;
      CPUMIPSState *env;
      ResetData *reset_info;
-@@ -208,7 +217,7 @@ mips_mipssim_init(MachineState *machine)
-     /* Register 64 KB of ISA IO space at 0x1fd00000. */
-     memory_region_init_alias(isa, NULL, "isa_mmio",
-                              get_system_io(), 0, 0x00010000);
--    memory_region_add_subregion(get_system_memory(), 0x1fd00000, isa);
-+    memory_region_add_subregion(get_system_memory(), ISA_BASE, isa);
+@@ -233,6 +235,23 @@ mips_mipssim_init(MachineState *machine)
  
-     /*
-      * A single 16450 sits at offset 0x3f8. It is attached to
-@@ -229,6 +238,23 @@ mips_mipssim_init(MachineState *machine)
-     if (nd_table[0].used)
-         /* MIPSnet uses the MIPS CPU INT0, which is interrupt 2. */
-         mipsnet_init(0x4200, env->irq[2], &nd_table[0]);
+     /* MIPSnet uses the MIPS CPU INT0, which is interrupt 2. */
+     mipsnet_init(0x4200, env->irq[2]);
 +
 +    /*
 +     * virtio extention; register 32 virtio devices just after the ISA space
@@ -61,10 +39,10 @@ $NetBSD: patch-hw-mips-mipssim.c,v 1.4 2
 +     */
 +    virtio_orgate = DEVICE(object_new(TYPE_OR_IRQ));
 +    object_property_set_int(OBJECT(virtio_orgate),
-+         "num-lines", NUM_VIRTIO_TRANSPORTS, &error_fatal);
++         "num-lines", 32 /*NUM_VIRTIO_TRANSPORTS*/, &error_fatal);
 +    qdev_realize_and_unref(virtio_orgate, NULL, &error_fatal);
 +
-+    for (int i = NUM_VIRTIO_TRANSPORTS - 1; i >= 0; i--) {
++    for (int i = 31 /*NUM_VIRTIO_TRANSPORTS - 1*/; i >= 0; i--) {
 +        sysbus_create_simple("virtio-mmio",
 +            0x1fd10000 + i * 512,
 +            qdev_get_gpio_in(virtio_orgate, i));

Index: pkgsrc/emulators/qemu/patches/patch-meson.build
diff -u pkgsrc/emulators/qemu/patches/patch-meson.build:1.14 pkgsrc/emulators/qemu/patches/patch-meson.build:1.15
--- pkgsrc/emulators/qemu/patches/patch-meson.build:1.14        Wed Sep 27 08:24:04 2023
+++ pkgsrc/emulators/qemu/patches/patch-meson.build     Wed Apr 24 07:20:59 2024
@@ -1,21 +1,21 @@
-$NetBSD: patch-meson.build,v 1.14 2023/09/27 08:24:04 adam Exp $
+$NetBSD: patch-meson.build,v 1.15 2024/04/24 07:20:59 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   2023-08-22 15:34:02.000000000 +0000
+--- meson.build.orig   2024-04-10 17:43:26.000000000 +0000
 +++ meson.build
-@@ -1184,7 +1184,7 @@ if have_system and get_option('curses').
+@@ -1329,7 +1329,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
--      curses_libname_list = (targetos == 'windows' ? ['pdcurses'] : ['ncursesw', 'cursesw'])
-+      curses_libname_list = (targetos == 'windows' ? ['pdcurses'] : ['ncursesw', 'cursesw', 'curses'])
+-      curses_libname_list = (host_os == 'windows' ? ['pdcurses'] : ['ncursesw', 'cursesw'])
++      curses_libname_list = (host_os == 'windows' ? ['pdcurses'] : ['ncursesw', 'cursesw', 'curses'])
        foreach curses_libname : curses_libname_list
          libcurses = cc.find_library(curses_libname,
                                      required: false)
-@@ -1201,7 +1201,7 @@ if have_system and get_option('curses').
+@@ -1346,7 +1346,7 @@ if have_system and get_option('curses').
      endif
    endif
    if get_option('iconv').allowed()

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/www/py-django-tastypie
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/www/py-django-tastypie
Indexes:

Home | Main Index | Thread Index | Old Index