Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_169580304447690"
MIME-Version: 1.0
Date: Wed, 27 Sep 2023 08:24:04 +0000
From: "Adam Ciarcinski" <adam@netbsd.org>
Subject: CVS commit: pkgsrc/emulators/qemu
To: pkgsrc-changes@NetBSD.org
Approved: commit_and_comment
Reply-To: adam@netbsd.org
Message-Id: <20230927082404.D4F8EFBDB@cvs.NetBSD.org>

This is a multi-part message in MIME format.

--_----------=_169580304447690
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	adam
Date:		Wed Sep 27 08:24:04 UTC 2023

Modified Files:
	pkgsrc/emulators/qemu: Makefile distinfo
	pkgsrc/emulators/qemu/patches: patch-meson.build

Log Message:
qemu: updated to 8.1.1

8.1.1
Bug fixes


To generate a diff of this commit:
cvs rdiff -u -r1.323 -r1.324 pkgsrc/emulators/qemu/Makefile
cvs rdiff -u -r1.209 -r1.210 pkgsrc/emulators/qemu/distinfo
cvs rdiff -u -r1.13 -r1.14 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.


--_----------=_169580304447690
Content-Disposition: inline
Content-Length: 4721
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/emulators/qemu/Makefile
diff -u pkgsrc/emulators/qemu/Makefile:1.323 pkgsrc/emulators/qemu/Makefile:1.324
--- pkgsrc/emulators/qemu/Makefile:1.323	Sun Sep 17 12:14:47 2023
+++ pkgsrc/emulators/qemu/Makefile	Wed Sep 27 08:24:04 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.323 2023/09/17 12:14:47 tnn Exp $
+# $NetBSD: Makefile,v 1.324 2023/09/27 08:24:04 adam Exp $
 
-DISTNAME=	qemu-8.1.0
+DISTNAME=	qemu-8.1.1
 CATEGORIES=	emulators
 MASTER_SITES=	https://download.qemu.org/
 EXTRACT_SUFX=	.tar.xz

Index: pkgsrc/emulators/qemu/distinfo
diff -u pkgsrc/emulators/qemu/distinfo:1.209 pkgsrc/emulators/qemu/distinfo:1.210
--- pkgsrc/emulators/qemu/distinfo:1.209	Sun Sep 10 16:16:14 2023
+++ pkgsrc/emulators/qemu/distinfo	Wed Sep 27 08:24:04 2023
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.209 2023/09/10 16:16:14 jperkin Exp $
+$NetBSD: distinfo,v 1.210 2023/09/27 08:24:04 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.1.0.tar.xz) = 1cc9e5b6997ea9700a6dead14fa02cfa18a72e74f6c4a92c28044a096cd104c6
-SHA512 (qemu-8.1.0.tar.xz) = c5f5e7ce2d8e3c93a02012b136c866e8577df07da4705a0045916c71caeaa21fa1b2d59a4b22a660789a4159b192e12a443e7cbb0724ee85fea258251731724c
-Size (qemu-8.1.0.tar.xz) = 123550284 bytes
+BLAKE2s (qemu-8.1.1.tar.xz) = 0a385929b7b7b5ff668aa9af3c2a4f2e901c4f4c391f1d450d885d476c2e2365
+SHA512 (qemu-8.1.1.tar.xz) = 199db58f9a413cbe4449ff557bc362e666c6c0291f9963cb74e5542e8abd1edcd65001fa1fd453b850a376de455f93258707ce6feee5a44bf40753b12a2e956c
+Size (qemu-8.1.1.tar.xz) = 123558860 bytes
 SHA1 (patch-audio_jackaudio.c) = 771c2779e565242a500adc0223ef6b1ae5b2b91f
 SHA1 (patch-hw-mips-Kconfig) = c7199ad26ac45116ab4d38252db4234ae93bdf9a
 SHA1 (patch-hw-mips-mipssim.c) = 1f682b74b34398b3ff15f9e7f24a85f4b8bb4853
@@ -16,7 +16,7 @@ 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) = edece4d8e02193230732de390bebeac43fba7d5f
+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

Index: pkgsrc/emulators/qemu/patches/patch-meson.build
diff -u pkgsrc/emulators/qemu/patches/patch-meson.build:1.13 pkgsrc/emulators/qemu/patches/patch-meson.build:1.14
--- pkgsrc/emulators/qemu/patches/patch-meson.build:1.13	Sun Sep 10 16:16:14 2023
+++ pkgsrc/emulators/qemu/patches/patch-meson.build	Wed Sep 27 08:24:04 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-meson.build,v 1.13 2023/09/10 16:16:14 jperkin Exp $
+$NetBSD: patch-meson.build,v 1.14 2023/09/27 08:24:04 adam Exp $
 
 * Detect iconv in libc properly for pkgsrc (pkgsrc removes -liconv)
   to fix qemu-system-aarch64 link.
@@ -6,15 +6,6 @@ $NetBSD: patch-meson.build,v 1.13 2023/0
 
 --- meson.build.orig	2023-08-22 15:34:02.000000000 +0000
 +++ meson.build
-@@ -225,7 +225,7 @@ if targetos == 'darwin'
-   # Disable attempts to use ObjectiveC features in os/object.h since they
-   # won't work when we're compiling with gcc as a C compiler.
-   qemu_common_flags += '-DOS_OBJECT_USE_OBJC=0'
--elif targetos == 'solaris'
-+elif targetos == 'sunos'
-   # needed for CMSG_ macros in sys/socket.h
-   qemu_common_flags += '-D_XOPEN_SOURCE=600'
-   # needed for TIOCWIN* defines in termios.h
 @@ -1184,7 +1184,7 @@ if have_system and get_option('curses').
        has_curses_h = cc.has_header('curses.h', args: curses_compile_args)
      endif
@@ -33,12 +24,3 @@ $NetBSD: patch-meson.build,v 1.13 2023/0
        # Programs will be linked with glib and this will bring in libiconv on FreeBSD.
        # We need to use libiconv if available because mixing libiconv's headers with
        # the system libc does not work.
-@@ -2056,7 +2056,7 @@ have_slirp_smbd = get_option('slirp_smbd
- if have_slirp_smbd
-   smbd_path = get_option('smbd')
-   if smbd_path == ''
--    smbd_path = (targetos == 'solaris' ? '/usr/sfw/sbin/smbd' : '/usr/sbin/smbd')
-+    smbd_path = (targetos == 'sunos' ? '/usr/sfw/sbin/smbd' : '/usr/sbin/smbd')
-   endif
-   config_host_data.set_quoted('CONFIG_SMBD_COMMAND', smbd_path)
- endif


--_----------=_169580304447690--