emulators/qemu-devel: Update version 8.3.0.20231231=>8.3.0.20240126

5 files changed, 40 insertions, 37 deletions

diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile
index 7ba7fbcb6e24..cd0e79fe7c51 100644
--- a/emulators/qemu-devel/Makefile
+++ b/emulators/qemu-devel/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	qemu
-DISTVERSION=	8.3.0.20231231
+DISTVERSION=	8.3.0.20240126
 CATEGORIES=	emulators
 PKGNAMESUFFIX=	-devel
 DIST_SUBDIR=	qemu/${PORTVERSION}
@@ -22,11 +22,11 @@ USES=		bison compiler:c11 cpe gmake gnome iconv:wchar_t ninja perl5 \
 		pkgconfig python:build shebangfix tar:xz xorg
 USE_GITLAB=	yes
 GL_ACCOUNT=	qemu-project
-GL_TAGNAME=	7425b6277f12e82952cede1f531bfc689bf77fb1
+GL_TAGNAME=	7a1dc45af581d2b643cdbf33c01fd96271616fbd
 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:4a96ad0170126f82b0aa13c26a31013f5d8127d8:meson/meson \
+		qemu-project:meson:314d9f0c74b34905f1ebb697d1374f078ea32854:meson/meson \
 		qemu-project:berkeley-softfloat-3:b64af41c3276f97f0e181920400ee056b9c88037:berkeleysoftfloat3/subprojects/berkeley-softfloat-3 \
 		qemu-project:berkeley-testfloat-3:e7af9751d9f9fd3b47911f51a5cfd08af256a9ab:berkeleytestfloat3/subprojects/berkeley-testfloat-3
 USE_GNOME=	cairo glib20
@@ -37,7 +37,7 @@ USE_XORG=	pixman
 SHEBANG_FILES=	scripts/xml-preprocess.py
 
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--localstatedir=/var --mandir=man --extra-ldflags=-L\"/usr/lib\" \
+CONFIGURE_ARGS=	--localstatedir=/var --mandir=share/man --extra-ldflags=-L\"/usr/lib\" \
 		--extra-ldflags=-L\"${LOCALBASE}/lib\" --enable-debug \
 		--prefix=${PREFIX} --cc=${CC} --enable-netmap --disable-kvm \
 		--disable-linux-user --disable-linux-aio --disable-xen \
diff --git a/emulators/qemu-devel/distinfo b/emulators/qemu-devel/distinfo
index 1fc63164342a..9d72ad28319e 100644
--- a/emulators/qemu-devel/distinfo
+++ b/emulators/qemu-devel/distinfo
@@ -1,15 +1,15 @@
-TIMESTAMP = 1704122231
-SHA256 (qemu/8.3.0.20231231/qemu-project-qemu-7425b6277f12e82952cede1f531bfc689bf77fb1_GL0.tar.gz) = 5269ac626aed2cdfc96937cd32f6fba5953a9a4985e2daac8ff2b5fce4ad36d5
-SIZE (qemu/8.3.0.20231231/qemu-project-qemu-7425b6277f12e82952cede1f531bfc689bf77fb1_GL0.tar.gz) = 38372391
-SHA256 (qemu/8.3.0.20231231/qemu-project-keycodemapdb-f5772a62ec52591ff6870b7e8ef32482371f22c6_GL0.tar.gz) = d014b53382dbb17b8196ad12f50de7f20d0ef1b9f7d54b0be51a6cbb14209195
-SIZE (qemu/8.3.0.20231231/qemu-project-keycodemapdb-f5772a62ec52591ff6870b7e8ef32482371f22c6_GL0.tar.gz) = 29580
-SHA256 (qemu/8.3.0.20231231/qemu-project-dtc-b6910bec11614980a21e46fbccc35934b671bd81_GL0.tar.gz) = e115f987eec23a1ba25150a46ced1675de3716072d3b4905afb3a9cda0f007c7
-SIZE (qemu/8.3.0.20231231/qemu-project-dtc-b6910bec11614980a21e46fbccc35934b671bd81_GL0.tar.gz) = 205556
-SHA256 (qemu/8.3.0.20231231/qemu-project-libvfio-user-0b28d205572c80b568a1003db2c8f37ca333e4d7_GL0.tar.gz) = d2f60cd4f86f345aab1332953eb736cce3518159e6e99bcc2d10467c06f717fe
-SIZE (qemu/8.3.0.20231231/qemu-project-libvfio-user-0b28d205572c80b568a1003db2c8f37ca333e4d7_GL0.tar.gz) = 189943
-SHA256 (qemu/8.3.0.20231231/qemu-project-meson-4a96ad0170126f82b0aa13c26a31013f5d8127d8_GL0.tar.gz) = e72b8497f449e10136c9c60f3cd4e9e28dcfb5b812cd09de0492ad26a006024a
-SIZE (qemu/8.3.0.20231231/qemu-project-meson-4a96ad0170126f82b0aa13c26a31013f5d8127d8_GL0.tar.gz) = 4737718
-SHA256 (qemu/8.3.0.20231231/qemu-project-berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037_GL0.tar.gz) = faae889814ea6a292f7ca03d9b36e6c7e95bab2a64777804883cc822b8d48757
-SIZE (qemu/8.3.0.20231231/qemu-project-berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037_GL0.tar.gz) = 148741
-SHA256 (qemu/8.3.0.20231231/qemu-project-berkeley-testfloat-3-e7af9751d9f9fd3b47911f51a5cfd08af256a9ab_GL0.tar.gz) = e7a09d51dc7e96cb8422c919c85fc3833d4f788567638c9162ef5cd7db59b1df
-SIZE (qemu/8.3.0.20231231/qemu-project-berkeley-testfloat-3-e7af9751d9f9fd3b47911f51a5cfd08af256a9ab_GL0.tar.gz) = 139308
+TIMESTAMP = 1706553187
+SHA256 (qemu/8.3.0.20240126/qemu-project-qemu-7a1dc45af581d2b643cdbf33c01fd96271616fbd_GL0.tar.gz) = fc7eca28f698d472400f79fe4299dd70612679d0a9d8cc03468adabe3aae5b42
+SIZE (qemu/8.3.0.20240126/qemu-project-qemu-7a1dc45af581d2b643cdbf33c01fd96271616fbd_GL0.tar.gz) = 38215851
+SHA256 (qemu/8.3.0.20240126/qemu-project-keycodemapdb-f5772a62ec52591ff6870b7e8ef32482371f22c6_GL0.tar.gz) = d014b53382dbb17b8196ad12f50de7f20d0ef1b9f7d54b0be51a6cbb14209195
+SIZE (qemu/8.3.0.20240126/qemu-project-keycodemapdb-f5772a62ec52591ff6870b7e8ef32482371f22c6_GL0.tar.gz) = 29580
+SHA256 (qemu/8.3.0.20240126/qemu-project-dtc-b6910bec11614980a21e46fbccc35934b671bd81_GL0.tar.gz) = e115f987eec23a1ba25150a46ced1675de3716072d3b4905afb3a9cda0f007c7
+SIZE (qemu/8.3.0.20240126/qemu-project-dtc-b6910bec11614980a21e46fbccc35934b671bd81_GL0.tar.gz) = 205556
+SHA256 (qemu/8.3.0.20240126/qemu-project-libvfio-user-0b28d205572c80b568a1003db2c8f37ca333e4d7_GL0.tar.gz) = d2f60cd4f86f345aab1332953eb736cce3518159e6e99bcc2d10467c06f717fe
+SIZE (qemu/8.3.0.20240126/qemu-project-libvfio-user-0b28d205572c80b568a1003db2c8f37ca333e4d7_GL0.tar.gz) = 189943
+SHA256 (qemu/8.3.0.20240126/qemu-project-meson-314d9f0c74b34905f1ebb697d1374f078ea32854_GL0.tar.gz) = c7902d9d1df965a993912538bec85d3e3d9685f49a06cefd7bcf26c1bb010c7e
+SIZE (qemu/8.3.0.20240126/qemu-project-meson-314d9f0c74b34905f1ebb697d1374f078ea32854_GL0.tar.gz) = 4742530
+SHA256 (qemu/8.3.0.20240126/qemu-project-berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037_GL0.tar.gz) = faae889814ea6a292f7ca03d9b36e6c7e95bab2a64777804883cc822b8d48757
+SIZE (qemu/8.3.0.20240126/qemu-project-berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037_GL0.tar.gz) = 148741
+SHA256 (qemu/8.3.0.20240126/qemu-project-berkeley-testfloat-3-e7af9751d9f9fd3b47911f51a5cfd08af256a9ab_GL0.tar.gz) = e7a09d51dc7e96cb8422c919c85fc3833d4f788567638c9162ef5cd7db59b1df
+SIZE (qemu/8.3.0.20240126/qemu-project-berkeley-testfloat-3-e7af9751d9f9fd3b47911f51a5cfd08af256a9ab_GL0.tar.gz) = 139308
diff --git a/emulators/qemu-devel/files/patch-util_cpuinfo-ppc.c b/emulators/qemu-devel/files/patch-util_cpuinfo-ppc.c
index 499de6e86db0..ae39b6c3f4ae 100644
--- a/emulators/qemu-devel/files/patch-util_cpuinfo-ppc.c
+++ b/emulators/qemu-devel/files/patch-util_cpuinfo-ppc.c
@@ -1,13 +1,16 @@
---- util/cpuinfo-ppc.c.orig	2023-08-29 11:28:39 UTC
+--- util/cpuinfo-ppc.c.orig	2024-01-26 18:16:35 UTC
 +++ util/cpuinfo-ppc.c
-@@ -9,8 +9,14 @@
+@@ -6,11 +6,17 @@
+ #include "qemu/osdep.h"
+ #include "host/cpuinfo.h"
+ 
+-#include <asm/cputable.h>
  #ifdef CONFIG_GETAUXVAL
  # include <sys/auxv.h>
- #else
--# include <asm/cputable.h>
 +# ifdef __linux__
 +#  include <asm/cputable.h>
 +# endif
+ #else
  # include "elf.h"
 +#endif
 +
diff --git a/emulators/qemu-devel/files/patch-util_meson.build b/emulators/qemu-devel/files/patch-util_meson.build
index 1d5e2986b7dd..abc95426e00a 100644
--- a/emulators/qemu-devel/files/patch-util_meson.build
+++ b/emulators/qemu-devel/files/patch-util_meson.build
@@ -1,6 +1,6 @@
---- util/meson.build.orig	2023-12-27 10:15:32 UTC
+--- util/meson.build.orig	2024-01-26 18:16:35 UTC
 +++ util/meson.build
-@@ -102,11 +102,7 @@ if have_block
+@@ -103,11 +103,7 @@ if have_block
    util_ss.add(files('readline.c'))
    util_ss.add(files('throttle.c'))
    util_ss.add(files('timed-average.c'))
@@ -10,6 +10,6 @@
 -    util_ss.add(files('filemonitor-stub.c'))
 -  endif
 +  util_ss.add(files('filemonitor-stub.c'))
-   util_ss.add(when: 'CONFIG_LINUX', if_true: files('vfio-helpers.c'))
-   util_ss.add(when: 'CONFIG_LINUX', if_true: files('chardev_open.c'))
- endif
+   if host_os == 'linux'
+     util_ss.add(files('vhost-user-server.c'), vhost_user)
+     util_ss.add(files('vfio-helpers.c'))
diff --git a/emulators/qemu-devel/pkg-plist b/emulators/qemu-devel/pkg-plist
index d8f8f83a0d3e..0d12ae51f7a4 100644
--- a/emulators/qemu-devel/pkg-plist
+++ b/emulators/qemu-devel/pkg-plist
@@ -45,15 +45,15 @@ 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
-man/man7/qemu-cpu-models.7.gz
-man/man8/qemu-nbd.8.gz
-man/man8/qemu-pr-helper.8.gz
-man/man7/qemu-qmp-ref.7.gz
-man/man1/qemu-storage-daemon.1.gz
-man/man7/qemu-storage-daemon-qmp-ref.7.gz
+share/man/man1/qemu.1.gz
+share/man/man1/qemu-img.1.gz
+share/man/man7/qemu-block-drivers.7.gz
+share/man/man7/qemu-cpu-models.7.gz
+share/man/man8/qemu-nbd.8.gz
+share/man/man8/qemu-pr-helper.8.gz
+share/man/man7/qemu-qmp-ref.7.gz
+share/man/man1/qemu-storage-daemon.1.gz
+share/man/man7/qemu-storage-daemon-qmp-ref.7.gz
 @sample etc/qemu-ifup.sample
 @sample etc/qemu-ifdown.sample
 %%DATADIR%%/QEMU,tcx.bin