[pkgsrc/trunk]: pkgsrc/emulators/qemu qemu: fix regression causing failure to...

[gson <gson%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/74aedafdc6b1
branches:  trunk
changeset: 441061:74aedafdc6b1
user:      gson <gson%pkgsrc.org@localhost>
date:      Sun Oct 25 08:21:35 2020 +0000

description:
qemu: fix regression causing failure to boot NetBSD/sparc

Fix the bug of https://bugs.launchpad.net/qemu/+bug/1892540/
by applying the patch submitted by Philippe Mathieu-Daude.
Bump PKGREVISION.

diffstat:

 emulators/qemu/Makefile                       |   4 +-
 emulators/qemu/distinfo                       |   3 +-
 emulators/qemu/patches/patch-hw_display_tcx.c |  54 +++++++++++++++++++++++++++
 3 files changed, 58 insertions(+), 3 deletions(-)

diffs (88 lines):

diff -r e857f0fcd929 -r 74aedafdc6b1 emulators/qemu/Makefile
--- a/emulators/qemu/Makefile   Sun Oct 25 08:19:46 2020 +0000
+++ b/emulators/qemu/Makefile   Sun Oct 25 08:21:35 2020 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.254 2020/10/10 16:29:21 martin Exp $
+# $NetBSD: Makefile,v 1.255 2020/10/25 08:21:35 gson Exp $
 
 DISTNAME=      qemu-5.1.0
-PKGREVISION=   7
+PKGREVISION=   8
 CATEGORIES=    emulators
 MASTER_SITES=  https://download.qemu.org/
 EXTRACT_SUFX=  .tar.xz
diff -r e857f0fcd929 -r 74aedafdc6b1 emulators/qemu/distinfo
--- a/emulators/qemu/distinfo   Sun Oct 25 08:19:46 2020 +0000
+++ b/emulators/qemu/distinfo   Sun Oct 25 08:21:35 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.165 2020/10/10 16:29:21 martin Exp $
+$NetBSD: distinfo,v 1.166 2020/10/25 08:21:35 gson Exp $
 
 SHA1 (palcode-clipper) = e25ae10a10e0801e47b62b9ee2d10c8ccb4ee940
 RMD160 (palcode-clipper) = a637f1cc38dabfdff36e3f02b6dd02d7c63cb8db
@@ -21,6 +21,7 @@
 SHA1 (patch-hw_alpha_typhoon.c) = 1bed5cd6f355c4163585c5331356ebf38c5c3a16
 SHA1 (patch-hw_core_uboot__image.h) = 17eef02349343c5fcfb7a4069cb6f8fd11efcb59
 SHA1 (patch-hw_display_omap__dss.c) = 6b13242f28e32346bc70548c216c578d98fd3420
+SHA1 (patch-hw_display_tcx.c) = 58f6c90bda734ec83b702b1b13d24c3e3219c7bd
 SHA1 (patch-hw_net_etraxfs__eth.c) = e5dd1661d60dbcd27b332403e0843500ba9544bc
 SHA1 (patch-hw_net_xilinx__axienet.c) = ebcd2676d64ce6f31e4a8c976d4fdf530ad5e8b7
 SHA1 (patch-hw_pci-host_sabre.c) = 75c076757ed96fc9f89cb0159f00c6cedcb39a27
diff -r e857f0fcd929 -r 74aedafdc6b1 emulators/qemu/patches/patch-hw_display_tcx.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/qemu/patches/patch-hw_display_tcx.c     Sun Oct 25 08:21:35 2020 +0000
@@ -0,0 +1,54 @@
+$NetBSD: patch-hw_display_tcx.c,v 1.1 2020/10/25 08:21:35 gson Exp $
+
+Fix for https://bugs.launchpad.net/qemu/+bug/1892540/
+by Philippe Mathieu-Daude.
+
+--- hw/display/tcx.c.orig      2020-08-11 19:17:15.000000000 +0000
++++ hw/display/tcx.c
+@@ -548,20 +548,28 @@ static const MemoryRegionOps tcx_stip_op
+     .read = tcx_stip_readl,
+     .write = tcx_stip_writel,
+     .endianness = DEVICE_NATIVE_ENDIAN,
+-    .valid = {
++    .impl = {
+         .min_access_size = 4,
+         .max_access_size = 4,
+     },
++    .valid = {
++        .min_access_size = 4,
++        .max_access_size = 8,
++    },
+ };
+ 
+ static const MemoryRegionOps tcx_rstip_ops = {
+     .read = tcx_stip_readl,
+     .write = tcx_rstip_writel,
+     .endianness = DEVICE_NATIVE_ENDIAN,
+-    .valid = {
++    .impl = {
+         .min_access_size = 4,
+         .max_access_size = 4,
+     },
++    .valid = {
++        .min_access_size = 4,
++        .max_access_size = 8,
++    },
+ };
+ 
+ static uint64_t tcx_blit_readl(void *opaque, hwaddr addr,
+@@ -650,10 +658,14 @@ static const MemoryRegionOps tcx_rblit_o
+     .read = tcx_blit_readl,
+     .write = tcx_rblit_writel,
+     .endianness = DEVICE_NATIVE_ENDIAN,
+-    .valid = {
++    .impl = {
+         .min_access_size = 4,
+         .max_access_size = 4,
+     },
++    .valid = {
++        .min_access_size = 4,
++        .max_access_size = 8,
++    },
+ };
+ 
+ static void tcx_invalidate_cursor_position(TCXState *s)