git: 850914520423 - main - emulators/qemu-devel: Update version 7.2.0.20221221=>8.0.0.20230505

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Muhammad Moinur Rahman <bofh_at_FreeBSD.org>
Date: Sun, 07 May 2023 19:26:29 UTC
The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=850914520423e615ecaf1b085a87c68e32db757f

commit 850914520423e615ecaf1b085a87c68e32db757f
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-05-06 22:27:58 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-05-07 19:26:16 +0000

    emulators/qemu-devel: Update version 7.2.0.20221221=>8.0.0.20230505
    
    - Unbreak on i386
---
 emulators/qemu-devel/Makefile                      | 19 +++++++---------
 emulators/qemu-devel/distinfo                      | 26 +++++++++++-----------
 .../files/patch-bsd-user_host_i386_host-signal.h   | 10 +++++++++
 emulators/qemu-devel/files/patch-util_meson.build  |  4 ++--
 emulators/qemu-devel/pkg-plist                     |  1 -
 5 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile
index 932e6d856fcf..2a4349d0ea2b 100644
--- a/emulators/qemu-devel/Makefile
+++ b/emulators/qemu-devel/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	qemu
-DISTVERSION=	7.2.0.20221221
-PORTREVISION=	1
+DISTVERSION=	8.0.0.20230505
 CATEGORIES=	emulators
 PKGNAMESUFFIX=	-devel
 DIST_SUBDIR=	qemu/${PORTVERSION}
@@ -11,7 +10,7 @@ WWW=		https://www.qemu.org/
 
 LICENSE=	GPLv2
 
-ONLY_FOR_ARCHS=	amd64 powerpc powerpc64 powerpc64 powerpc64le
+ONLY_FOR_ARCHS=	amd64 i386 powerpc powerpc64 powerpc64 powerpc64le
 
 BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx \
 		${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} \
@@ -31,15 +30,13 @@ USE_PERL5=	build
 USE_PYTHON=	distutils noflavors
 USE_XORG=	pixman
 
-GL_COMMIT=	222059a0fccf4af3be776fe35a5ea2d6a68f9a0b
-GL_TUPLE=	qemu-project:keycodemapdb:0c3623cfd9ecbcfe60bb8584a0e4c10bd48a4378:keycodemapdb/ui/keycodemapdb \
-		qemu-project:dtc:2cd89f862cdb04d91c5d59c5b39647f7d5d5b3b8:dtc/dtc \
-		qemu-project:meson:0544ffabf1f252494f6b9699a2b9007682fc322e:meson/meson \
+GL_ACCOUNT=	qemu-project
+GL_COMMIT=	a9fe9e191b4305b88c356a1ed9ac3baf89eb18aa
+GL_TUPLE=	qemu-project:keycodemapdb:d21009b1c9f94b740ea66be8e48a1d8ad8124023:keycodemapdb/ui/keycodemapdb \
+		qemu-project:dtc:b6910bec11614980a21e46fbccc35934b671bd81:dtc/dtc \
+		qemu-project:meson:3a9b285a55b91b53b2acda987192274352ecb5be:meson/meson \
 		qemu-project:berkeley-softfloat-3:b64af41c3276f97f0e181920400ee056b9c88037:berkeleysoftfloat3/tests/fp/berkeley-softfloat-3 \
-		qemu-project:berkeley-testfloat-3:5a59dcec19327396a011a17fd924aed4fec416b3:berkeleytestfloat3/tests/fp/berkeley-testfloat-3
-
-#.if !defined(PKGNAMESUFFIX) || (${PKGNAMESUFFIX} != "-utils" && ${PKGNAMESUFFIX} != "-guest-agent")
-#.endif
+		qemu-project:berkeley-testfloat-3:40619cbb3bf32872df8c53cc457039229428a263:berkeleytestfloat3/tests/fp/berkeley-testfloat-3
 
 HAS_CONFIGURE=	yes
 
diff --git a/emulators/qemu-devel/distinfo b/emulators/qemu-devel/distinfo
index 23da8fea6cda..31aabdc15c6c 100644
--- a/emulators/qemu-devel/distinfo
+++ b/emulators/qemu-devel/distinfo
@@ -1,13 +1,13 @@
-TIMESTAMP = 1672436879
-SHA256 (qemu/7.2.0.20221221/qemu-qemu-222059a0fccf4af3be776fe35a5ea2d6a68f9a0b_GL0.tar.gz) = e51949a2dd87a7b29d70a04758a3221c5e51a0c3e5652abac8753b317fe28380
-SIZE (qemu/7.2.0.20221221/qemu-qemu-222059a0fccf4af3be776fe35a5ea2d6a68f9a0b_GL0.tar.gz) = 31467387
-SHA256 (qemu/7.2.0.20221221/qemu-project-keycodemapdb-0c3623cfd9ecbcfe60bb8584a0e4c10bd48a4378_GL0.tar.gz) = 37b2c5a627bbee1f601539465ab1f76832e77a7ad7de8e311291cda9e1819d7c
-SIZE (qemu/7.2.0.20221221/qemu-project-keycodemapdb-0c3623cfd9ecbcfe60bb8584a0e4c10bd48a4378_GL0.tar.gz) = 49278
-SHA256 (qemu/7.2.0.20221221/qemu-project-dtc-2cd89f862cdb04d91c5d59c5b39647f7d5d5b3b8_GL0.tar.gz) = 5516354d3f6cee0697056ba0a407008d9f7128bb9185e39eae9058b929740e20
-SIZE (qemu/7.2.0.20221221/qemu-project-dtc-2cd89f862cdb04d91c5d59c5b39647f7d5d5b3b8_GL0.tar.gz) = 211584
-SHA256 (qemu/7.2.0.20221221/qemu-project-meson-0544ffabf1f252494f6b9699a2b9007682fc322e_GL0.tar.gz) = f4824bf3b557c93b44abd8d899829437124997b624bc0045239a5b2bbc9bcc68
-SIZE (qemu/7.2.0.20221221/qemu-project-meson-0544ffabf1f252494f6b9699a2b9007682fc322e_GL0.tar.gz) = 4612759
-SHA256 (qemu/7.2.0.20221221/qemu-project-berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037_GL0.tar.gz) = faae889814ea6a292f7ca03d9b36e6c7e95bab2a64777804883cc822b8d48757
-SIZE (qemu/7.2.0.20221221/qemu-project-berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037_GL0.tar.gz) = 148741
-SHA256 (qemu/7.2.0.20221221/qemu-project-berkeley-testfloat-3-5a59dcec19327396a011a17fd924aed4fec416b3_GL0.tar.gz) = c1f92abe87764de22f6cf8372d697717d18e7951ceb11b6e12c6767b7d1e3a65
-SIZE (qemu/7.2.0.20221221/qemu-project-berkeley-testfloat-3-5a59dcec19327396a011a17fd924aed4fec416b3_GL0.tar.gz) = 139221
+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
diff --git a/emulators/qemu-devel/files/patch-bsd-user_host_i386_host-signal.h b/emulators/qemu-devel/files/patch-bsd-user_host_i386_host-signal.h
new file mode 100644
index 000000000000..4c696c23a532
--- /dev/null
+++ b/emulators/qemu-devel/files/patch-bsd-user_host_i386_host-signal.h
@@ -0,0 +1,10 @@
+--- bsd-user/host/i386/host-signal.h.orig	2023-05-05 21:12:05 UTC
++++ bsd-user/host/i386/host-signal.h
+@@ -12,6 +12,7 @@
+ #include <sys/param.h>
+ #include <sys/ucontext.h>
+ #include <machine/trap.h>
++#include <vm/vm.h>
+ #include <vm/pmap.h>
+ #include <machine/pmap.h>
+ 
diff --git a/emulators/qemu-devel/files/patch-util_meson.build b/emulators/qemu-devel/files/patch-util_meson.build
index 44889d1fb32f..ab0762b72891 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	2022-08-05 20:40:05 UTC
+--- util/meson.build.orig	2023-05-05 08:25:13 UTC
 +++ util/meson.build
-@@ -91,10 +91,6 @@ if have_block
+@@ -99,10 +99,6 @@ if have_block
    util_ss.add(files('readline.c'))
    util_ss.add(files('throttle.c'))
    util_ss.add(files('timed-average.c'))
diff --git a/emulators/qemu-devel/pkg-plist b/emulators/qemu-devel/pkg-plist
index 2fdbbe61ff5a..a87e89adb958 100644
--- a/emulators/qemu-devel/pkg-plist
+++ b/emulators/qemu-devel/pkg-plist
@@ -147,7 +147,6 @@ man/man7/qemu-storage-daemon-qmp-ref.7.gz
 %%DATADIR%%/vgabios-stdvga.bin
 %%DATADIR%%/vgabios-virtio.bin
 %%DATADIR%%/vgabios-vmware.bin
-%%DATADIR%%/sgabios.bin
 %%DATADIR%%/skiboot.lid
 %%DATADIR%%/trace-events-all
 %%DATADIR%%/petalogix-s3adsp1800.dtb