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: Fri, 20 Jan 2023 08:36:24 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Jan 20 08:36:24 UTC 2023

Modified Files:
        pkgsrc/emulators/qemu: Makefile PLIST distinfo
        pkgsrc/emulators/qemu/patches: patch-backends_tpm_tpm__ioctl.h
            patch-hw_display_omap__dss.c

Log Message:
qemu: updated to 7.2.0

https://wiki.qemu.org/ChangeLog/7.2


To generate a diff of this commit:
cvs rdiff -u -r1.307 -r1.308 pkgsrc/emulators/qemu/Makefile
cvs rdiff -u -r1.83 -r1.84 pkgsrc/emulators/qemu/PLIST
cvs rdiff -u -r1.197 -r1.198 pkgsrc/emulators/qemu/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/emulators/qemu/patches/patch-backends_tpm_tpm__ioctl.h
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/emulators/qemu/patches/patch-hw_display_omap__dss.c

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.307 pkgsrc/emulators/qemu/Makefile:1.308
--- pkgsrc/emulators/qemu/Makefile:1.307        Tue Jan  3 17:37:05 2023
+++ pkgsrc/emulators/qemu/Makefile      Fri Jan 20 08:36:24 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.307 2023/01/03 17:37:05 wiz Exp $
+# $NetBSD: Makefile,v 1.308 2023/01/20 08:36:24 adam Exp $
 
-DISTNAME=      qemu-7.1.0
-PKGREVISION=   2
+DISTNAME=      qemu-7.2.0
 CATEGORIES=    emulators
 MASTER_SITES=  https://download.qemu.org/
 EXTRACT_SUFX=  .tar.xz
@@ -123,7 +122,7 @@ CONFIGURE_ARGS+=            --disable-bsd-user
 CONFIGURE_ARGS+=               --enable-bsd-user
 USER_EMUL=                     i386 x86_64
 .  endif
-.elif !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly"
+.elif ${OPSYS:M*BSD} || ${OPSYS} == "DragonFly"
 USER_EMUL=                     i386 x86_64
 PLIST.nbd=                     yes
 .elif ${OPSYS} == "Darwin"

Index: pkgsrc/emulators/qemu/PLIST
diff -u pkgsrc/emulators/qemu/PLIST:1.83 pkgsrc/emulators/qemu/PLIST:1.84
--- pkgsrc/emulators/qemu/PLIST:1.83    Sat Sep 17 14:05:36 2022
+++ pkgsrc/emulators/qemu/PLIST Fri Jan 20 08:36:24 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.83 2022/09/17 14:05:36 tnn Exp $
+@comment $NetBSD: PLIST,v 1.84 2023/01/20 08:36:24 adam Exp $
 bin/elf2dmp
 ${PLIST.aarch64}bin/qemu-aarch64
 ${PLIST.aarch64_be}bin/qemu-aarch64_be
@@ -98,6 +98,7 @@ share/doc/qemu/about/index.html
 share/doc/qemu/about/license.html
 share/doc/qemu/about/removed-features.html
 share/doc/qemu/dbus-dbusindex.html
+share/doc/qemu/devel/acpi-bits.html
 share/doc/qemu/devel/atomics.html
 share/doc/qemu/devel/bitops.html
 share/doc/qemu/devel/block-coroutine-wrapper.html
@@ -118,6 +119,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/maintainers.html
 share/doc/qemu/devel/memory.html
 share/doc/qemu/devel/migration.html
 share/doc/qemu/devel/modules.html
@@ -253,6 +255,10 @@ share/doc/qemu/system/managed-startup.ht
 share/doc/qemu/system/monitor.html
 share/doc/qemu/system/multi-process.html
 share/doc/qemu/system/mux-chardev.html
+share/doc/qemu/system/openrisc/cpu-features.html
+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/embedded.html
 share/doc/qemu/system/ppc/powermac.html
 share/doc/qemu/system/ppc/powernv.html
@@ -282,6 +288,7 @@ share/doc/qemu/system/target-avr.html
 share/doc/qemu/system/target-i386.html
 share/doc/qemu/system/target-m68k.html
 share/doc/qemu/system/target-mips.html
+share/doc/qemu/system/target-openrisc.html
 share/doc/qemu/system/target-ppc.html
 share/doc/qemu/system/target-riscv.html
 share/doc/qemu/system/target-rx.html

Index: pkgsrc/emulators/qemu/distinfo
diff -u pkgsrc/emulators/qemu/distinfo:1.197 pkgsrc/emulators/qemu/distinfo:1.198
--- pkgsrc/emulators/qemu/distinfo:1.197        Tue Oct 25 18:46:08 2022
+++ pkgsrc/emulators/qemu/distinfo      Fri Jan 20 08:36:24 2023
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.197 2022/10/25 18:46:08 jperkin Exp $
+$NetBSD: distinfo,v 1.198 2023/01/20 08:36:24 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-7.1.0.tar.xz) = b441c04ebb4e1b79d8ce2c772c6f2cd65b741e1c24d1de59eb1391f84e50a2fe
-SHA512 (qemu-7.1.0.tar.xz) = c60c5ff8ec99b7552e485768908920658fdd8035ff7a6fa370fb6881957dc8b7e5f18ff1a8f49bd6aa22909ede2a7c084986d8244f12074ccd33ebe40a0c411f
-Size (qemu-7.1.0.tar.xz) = 121833004 bytes
+BLAKE2s (qemu-7.2.0.tar.xz) = 725b12f40c29fb26f4af1820864b6e70dc5484dffd8f8c731fc694edb95c4d96
+SHA512 (qemu-7.2.0.tar.xz) = f3cfa00da739ba819a218d7e6e95c77fb79a8e0f487b024ddd281602e785249b81144595e3f8c746c32a4f5c4d1a88c6aebae3c162603edfbb50ae3722d7ed13
+Size (qemu-7.2.0.tar.xz) = 122408576 bytes
 SHA1 (patch-audio_jackaudio.c) = 771c2779e565242a500adc0223ef6b1ae5b2b91f
-SHA1 (patch-backends_tpm_tpm__ioctl.h) = fbd6c877ad605f7120290efbb0ac653c69f351de
+SHA1 (patch-backends_tpm_tpm__ioctl.h) = 5e18e0c9d0581386e0100a566694b3e631618585
 SHA1 (patch-hw-mips-Kconfig) = c7199ad26ac45116ab4d38252db4234ae93bdf9a
 SHA1 (patch-hw-mips-mipssim.c) = 1f682b74b34398b3ff15f9e7f24a85f4b8bb4853
-SHA1 (patch-hw_display_omap__dss.c) = 6b13242f28e32346bc70548c216c578d98fd3420
+SHA1 (patch-hw_display_omap__dss.c) = 68f6f5e86335114de64b397959a2238de84fcde2
 SHA1 (patch-hw_mips_meson.build) = d9a07a81fe6d3c9e2bd45f41fe876cd927a40ced
 SHA1 (patch-hw_net_etraxfs__eth.c) = e5dd1661d60dbcd27b332403e0843500ba9544bc
 SHA1 (patch-hw_net_xilinx__axienet.c) = ebcd2676d64ce6f31e4a8c976d4fdf530ad5e8b7

Index: pkgsrc/emulators/qemu/patches/patch-backends_tpm_tpm__ioctl.h
diff -u pkgsrc/emulators/qemu/patches/patch-backends_tpm_tpm__ioctl.h:1.1 pkgsrc/emulators/qemu/patches/patch-backends_tpm_tpm__ioctl.h:1.2
--- pkgsrc/emulators/qemu/patches/patch-backends_tpm_tpm__ioctl.h:1.1   Wed Aug 12 18:31:27 2020
+++ pkgsrc/emulators/qemu/patches/patch-backends_tpm_tpm__ioctl.h       Fri Jan 20 08:36:24 2023
@@ -1,16 +1,16 @@
-$NetBSD: patch-backends_tpm_tpm__ioctl.h,v 1.1 2020/08/12 18:31:27 ryoon Exp $
+$NetBSD: patch-backends_tpm_tpm__ioctl.h,v 1.2 2023/01/20 08:36:24 adam Exp $
 
 SunOS needs filio.h for _IO*() macros.
 
---- backends/tpm/tpm_ioctl.h.orig      2019-08-15 19:01:42.000000000 +0000
+--- backends/tpm/tpm_ioctl.h.orig      2022-12-14 16:28:45.000000000 +0000
 +++ backends/tpm/tpm_ioctl.h
-@@ -9,6 +9,9 @@
- #ifndef TPM_IOCTL_H
- #define TPM_IOCTL_H
+@@ -14,6 +14,9 @@
  
+ #include <stdint.h>
+ #include <sys/types.h>
 +#ifdef __sun
 +#include <sys/filio.h>
 +#endif
+ #ifndef _WIN32
  #include <sys/uio.h>
  #include <sys/ioctl.h>
- 

Index: pkgsrc/emulators/qemu/patches/patch-hw_display_omap__dss.c
diff -u pkgsrc/emulators/qemu/patches/patch-hw_display_omap__dss.c:1.2 pkgsrc/emulators/qemu/patches/patch-hw_display_omap__dss.c:1.3
--- pkgsrc/emulators/qemu/patches/patch-hw_display_omap__dss.c:1.2      Wed Jan 15 18:26:20 2014
+++ pkgsrc/emulators/qemu/patches/patch-hw_display_omap__dss.c  Fri Jan 20 08:36:24 2023
@@ -1,13 +1,13 @@
-$NetBSD: patch-hw_display_omap__dss.c,v 1.2 2014/01/15 18:26:20 wiz Exp $
+$NetBSD: patch-hw_display_omap__dss.c,v 1.3 2023/01/20 08:36:24 adam Exp $
 
 Avoid conflicts with SSP read() macro in NetBSD's <ssp/unistd.h>
 (PR lib/43832: ssp causes common names to be defines)
 
---- hw/display/omap_dss.c.orig 2013-11-27 22:15:55.000000000 +0000
+--- hw/display/omap_dss.c.orig 2022-12-14 16:28:45.000000000 +0000
 +++ hw/display/omap_dss.c
-@@ -791,18 +791,18 @@ static void omap_rfbi_write(void *opaque
+@@ -798,18 +798,18 @@ static void omap_rfbi_write(void *opaque
          break;
-     case 0x58:        /* RFBI_READ */
+     case 0x58:  /* RFBI_READ */
          if ((s->rfbi.control & (1 << 2)) && s->rfbi.chip[0])
 -            s->rfbi.rxbuf = s->rfbi.chip[0]->read(s->rfbi.chip[0]->opaque, 1);
 +            s->rfbi.rxbuf = (*s->rfbi.chip[0]->read)(s->rfbi.chip[0]->opaque, 1);
@@ -18,7 +18,7 @@ Avoid conflicts with SSP read() macro in
              omap_rfbi_transfer_stop(s);
          break;
  
-     case 0x5c:        /* RFBI_STATUS */
+     case 0x5c:  /* RFBI_STATUS */
          if ((s->rfbi.control & (1 << 2)) && s->rfbi.chip[0])
 -            s->rfbi.rxbuf = s->rfbi.chip[0]->read(s->rfbi.chip[0]->opaque, 0);
 +            s->rfbi.rxbuf = (*s->rfbi.chip[0]->read)(s->rfbi.chip[0]->opaque, 0);

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/net/haproxy
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/net/haproxy
Indexes:

Home | Main Index | Thread Index | Old Index