emulators/qemu-devel: Update snapshot to 20230531

4 files changed, 27 insertions, 54 deletions

diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile
index fc7152da349e..e7f1b8f5e023 100644
--- a/emulators/qemu-devel/Makefile
+++ b/emulators/qemu-devel/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	qemu
-DISTVERSION=	8.0.0.20230505
-PORTREVISION=	1
+DISTVERSION=	8.2.0.20230531
 CATEGORIES=	emulators
 PKGNAMESUFFIX=	-devel
 DIST_SUBDIR=	qemu/${PORTVERSION}
@@ -17,8 +16,6 @@ BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx \
 		${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} \
 		bash:shells/bash
 LIB_DEPENDS=	libepoxy.so:graphics/libepoxy \
-		libfontconfig.so:x11-fonts/fontconfig \
-		libfreetype.so:print/freetype2 \
 		libnettle.so:security/nettle \
 		libpcre2-8.so:devel/pcre2 \
 		libzstd.so:archivers/zstd
@@ -32,10 +29,11 @@ USE_PYTHON=	distutils noflavors
 USE_XORG=	pixman
 
 GL_ACCOUNT=	qemu-project
-GL_TAGNAME=	a9fe9e191b4305b88c356a1ed9ac3baf89eb18aa
-GL_TUPLE=	qemu-project:keycodemapdb:d21009b1c9f94b740ea66be8e48a1d8ad8124023:keycodemapdb/ui/keycodemapdb \
-		qemu-project:dtc:b6910bec11614980a21e46fbccc35934b671bd81:dtc/dtc \
-		qemu-project:meson:3a9b285a55b91b53b2acda987192274352ecb5be:meson/meson \
+GL_TAGNAME=	9824490dede64c1398b6a52095e5d22040529250
+GL_TUPLE=	qemu-project:keycodemapdb:f5772a62ec52591ff6870b7e8ef32482371f22c6:keycodemapdb/subprojects/keycodemapdb \
+		qemu-project:dtc:b6910bec11614980a21e46fbccc35934b671bd81:dtc/subprojects/dtc \
+		qemu-project:libvfio-user:0b28d205572c80b568a1003db2c8f37ca333e4d7:libvfio/subprojects/libvfio-user \
+		qemu-project:meson:cb0b6352b5b3fe548f2148999b4072eac76ff465:meson/meson \
 		qemu-project:berkeley-softfloat-3:b64af41c3276f97f0e181920400ee056b9c88037:berkeleysoftfloat3/tests/fp/berkeley-softfloat-3 \
 		qemu-project:berkeley-testfloat-3:40619cbb3bf32872df8c53cc457039229428a263:berkeleytestfloat3/tests/fp/berkeley-testfloat-3
 
@@ -64,7 +62,7 @@ VDE_DESC=		vde dependency (for vde networking)
 X86_TARGETS_DESC=	Build only x86 system targets
 CAPSTONE_CONFIGURE_ON=	--enable-capstone --extra-cflags=-I${LOCALBASE}/include/capstone
 CAPSTONE_CONFIGURE_OFF=	--disable-capstone
-CAPSTONE_LIB_DEPENDS=	libcapstone.so:devel/capstone4
+CAPSTONE_LIB_DEPENDS=	libcapstone.so:devel/capstone
 CURL_CONFIGURE_OFF=	--disable-curl
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 DOCS_CONFIGURE_ENABLE=	docs
diff --git a/emulators/qemu-devel/distinfo b/emulators/qemu-devel/distinfo
index 31aabdc15c6c..95af03e8d869 100644
--- a/emulators/qemu-devel/distinfo
+++ b/emulators/qemu-devel/distinfo
@@ -1,13 +1,15 @@
-TIMESTAMP = 1683383576
-SHA256 (qemu/8.0.0.20230505/qemu-project-qemu-a9fe9e191b4305b88c356a1ed9ac3baf89eb18aa_GL0.tar.gz) = 1d27f432a6111cb02640afb81116f6f4fabf6d9bb024342a4a5eed6c209f8631
-SIZE (qemu/8.0.0.20230505/qemu-project-qemu-a9fe9e191b4305b88c356a1ed9ac3baf89eb18aa_GL0.tar.gz) = 35769867
-SHA256 (qemu/8.0.0.20230505/qemu-project-keycodemapdb-d21009b1c9f94b740ea66be8e48a1d8ad8124023_GL0.tar.gz) = 9abbbc7a9886ed17fd5980c32d4564cb2cb4313621d2b79eb4ca50f5e95535f8
-SIZE (qemu/8.0.0.20230505/qemu-project-keycodemapdb-d21009b1c9f94b740ea66be8e48a1d8ad8124023_GL0.tar.gz) = 49077
-SHA256 (qemu/8.0.0.20230505/qemu-project-dtc-b6910bec11614980a21e46fbccc35934b671bd81_GL0.tar.gz) = e115f987eec23a1ba25150a46ced1675de3716072d3b4905afb3a9cda0f007c7
-SIZE (qemu/8.0.0.20230505/qemu-project-dtc-b6910bec11614980a21e46fbccc35934b671bd81_GL0.tar.gz) = 205556
-SHA256 (qemu/8.0.0.20230505/qemu-project-meson-3a9b285a55b91b53b2acda987192274352ecb5be_GL0.tar.gz) = 9c68a3513065b5c31223c6f5e86cd25463cebc580810849e7b98ebe69ec955bd
-SIZE (qemu/8.0.0.20230505/qemu-project-meson-3a9b285a55b91b53b2acda987192274352ecb5be_GL0.tar.gz) = 4503158
-SHA256 (qemu/8.0.0.20230505/qemu-project-berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037_GL0.tar.gz) = faae889814ea6a292f7ca03d9b36e6c7e95bab2a64777804883cc822b8d48757
-SIZE (qemu/8.0.0.20230505/qemu-project-berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037_GL0.tar.gz) = 148741
-SHA256 (qemu/8.0.0.20230505/qemu-project-berkeley-testfloat-3-40619cbb3bf32872df8c53cc457039229428a263_GL0.tar.gz) = e1374054bc43d75436f1454f92a2e4208046858ee03086d1f2dc5de6d09a3d66
-SIZE (qemu/8.0.0.20230505/qemu-project-berkeley-testfloat-3-40619cbb3bf32872df8c53cc457039229428a263_GL0.tar.gz) = 139281
+TIMESTAMP = 1695495134
+SHA256 (qemu/8.2.0.20230531/qemu-project-qemu-9824490dede64c1398b6a52095e5d22040529250_GL0.tar.gz) = 90ca97eefb00b0b26226ceb18d23c81d540a6de0a377dbcf73de4854863499ed
+SIZE (qemu/8.2.0.20230531/qemu-project-qemu-9824490dede64c1398b6a52095e5d22040529250_GL0.tar.gz) = 36800088
+SHA256 (qemu/8.2.0.20230531/qemu-project-keycodemapdb-f5772a62ec52591ff6870b7e8ef32482371f22c6_GL0.tar.gz) = d014b53382dbb17b8196ad12f50de7f20d0ef1b9f7d54b0be51a6cbb14209195
+SIZE (qemu/8.2.0.20230531/qemu-project-keycodemapdb-f5772a62ec52591ff6870b7e8ef32482371f22c6_GL0.tar.gz) = 29580
+SHA256 (qemu/8.2.0.20230531/qemu-project-dtc-b6910bec11614980a21e46fbccc35934b671bd81_GL0.tar.gz) = e115f987eec23a1ba25150a46ced1675de3716072d3b4905afb3a9cda0f007c7
+SIZE (qemu/8.2.0.20230531/qemu-project-dtc-b6910bec11614980a21e46fbccc35934b671bd81_GL0.tar.gz) = 205556
+SHA256 (qemu/8.2.0.20230531/qemu-project-libvfio-user-0b28d205572c80b568a1003db2c8f37ca333e4d7_GL0.tar.gz) = d2f60cd4f86f345aab1332953eb736cce3518159e6e99bcc2d10467c06f717fe
+SIZE (qemu/8.2.0.20230531/qemu-project-libvfio-user-0b28d205572c80b568a1003db2c8f37ca333e4d7_GL0.tar.gz) = 189943
+SHA256 (qemu/8.2.0.20230531/qemu-project-meson-cb0b6352b5b3fe548f2148999b4072eac76ff465_GL0.tar.gz) = e133564389ddffa531d04e48b84c8d5f9e00a88b9c001c710a3a851b74ed1779
+SIZE (qemu/8.2.0.20230531/qemu-project-meson-cb0b6352b5b3fe548f2148999b4072eac76ff465_GL0.tar.gz) = 4656019
+SHA256 (qemu/8.2.0.20230531/qemu-project-berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037_GL0.tar.gz) = faae889814ea6a292f7ca03d9b36e6c7e95bab2a64777804883cc822b8d48757
+SIZE (qemu/8.2.0.20230531/qemu-project-berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037_GL0.tar.gz) = 148741
+SHA256 (qemu/8.2.0.20230531/qemu-project-berkeley-testfloat-3-40619cbb3bf32872df8c53cc457039229428a263_GL0.tar.gz) = e1374054bc43d75436f1454f92a2e4208046858ee03086d1f2dc5de6d09a3d66
+SIZE (qemu/8.2.0.20230531/qemu-project-berkeley-testfloat-3-40619cbb3bf32872df8c53cc457039229428a263_GL0.tar.gz) = 139281
diff --git a/emulators/qemu-devel/pkg-message b/emulators/qemu-devel/pkg-message
index 4ce5e9a61853..505d43c65f2a 100644
--- a/emulators/qemu-devel/pkg-message
+++ b/emulators/qemu-devel/pkg-message
@@ -14,38 +14,6 @@ FreeBSD host notes
   to wait a bit for dhclient to do its thing; traffic to address 10.0.2.2 is
   routed to 127.1 on the host.
 
-- Expect timer problems when guest kernel HZ is > hosts, for example time
-  sleep 1 takes 49 seconds and booting sleeps for minutes at the acd0 probe
-  with a FreeSBIE 1.0 guest, thats because its kernel is built with HZ=5000,
-  and FreeBSD's default is 100...  (no longer a problem with FreeSBIE 1.1.)
-  The linux 2.6 kernel uses 1000 by default btw.  (changed to 250 later, and
-  recent linux kernels now no longer have a fixed HZ, aka `tickless
-  kernel'...)  Enabling /dev/rtc doesn't seem to help either (not included
-  since it needs a patch to emulators/rtc.)
-
-- Update: the above problem has gotten worse with FreeBSD guests
-  somewhere before 8.0, mainly since the kernel now usually wants
-  double or even quadruple number of timer irqs compared to HZ if
-  it detects an apic (and at least early versions of FreeBSD 8 had
-  a bug that essentially halved qemu's clock rate too); the only
-  reason you usually don't see symptoms of this with FreeBSD 8
-  guests is they automatically reduce their HZ to 100 when running
-  in a VM while the default for the host kernel is still HZ=1000.
-  Workaround: you can disable the apic clock in the guest by setting
-
-	hint.apic.0.clock="0"
-
-  in loader.conf(5) (or manually at the loader prompt), if that
-  doesn't work the only things you can do is either reduce the
-  guest's HZ to, say, 100 by setting e.g.
-
-	kern.hz="100"
-
-  from the loader as above (which usually is a good idea in a VM
-  anyway and FreeBSD 8 now does by itself as mentioned), or otherwise
-  increase the host's HZ to 2000 or even 4000 from the loader in
-  the same way.
-
 - The -smb option (smb-export local dir to guest using the default
   slirp networking) needs the samba port/package installed
   in addition to qemu. (SAMBA knob.)
diff --git a/emulators/qemu-devel/pkg-plist b/emulators/qemu-devel/pkg-plist
index a87e89adb958..d8f8f83a0d3e 100644
--- a/emulators/qemu-devel/pkg-plist
+++ b/emulators/qemu-devel/pkg-plist
@@ -40,6 +40,11 @@ bin/qemu-system-i386
 %%NO_X86_TARGETS%%bin/qemu-system-xtensaeb
 %%BSDUSER%%bin/qemu-x86_64
 include/qemu-plugin.h
+include/fdt.h
+include/libfdt.h
+include/libfdt_env.h
+lib/libfdt.a
+libdata/pkgconfig/libfdt.pc
 man/man1/qemu.1.gz
 man/man1/qemu-img.1.gz
 man/man7/qemu-block-drivers.7.gz