Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 29 Apr 2024 21:55:26 GMT
From:      Muhammad Moinur Rahman <bofh@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 6274cf0f8c55 - main - emulators/qemu: Update version 8.2.2=>9.0.0
Message-ID:  <202404292155.43TLtQDc026437@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6274cf0f8c55e8b18513f208be4fcf1c89bc14c1

commit 6274cf0f8c55e8b18513f208be4fcf1c89bc14c1
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2024-04-29 21:51:49 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2024-04-29 21:55:05 +0000

    emulators/qemu: Update version 8.2.2=>9.0.0
    
    Changelog: https://wiki.qemu.org/ChangeLog/9.0
---
 emulators/qemu/Makefile                     | 10 +++++-----
 emulators/qemu/distinfo                     |  6 +++---
 emulators/qemu/files/patch-util_meson.build | 15 ---------------
 emulators/qemu/pkg-plist                    |  1 +
 4 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index 9f23e681bfed..13b8e0f82a2e 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	qemu
-PORTVERSION=	8.2.2
-PORTREVISION=	2
+DISTVERSION=	9.0.0
 CATEGORIES=	emulators
 MASTER_SITES=	https://download.qemu.org/
 DIST_SUBDIR=	qemu/${PORTVERSION}
@@ -19,8 +18,9 @@ ONLY_FOR_ARCHS=	aarch64 amd64 i386 powerpc64 powerpc64le
 BUILD_DEPENDS=	bash:shells/bash
 .if ${FLAVOR:U} != tools && ${FLAVOR:U} != guestagent
 LIB_DEPENDS+=	libfdt.so:sysutils/dtc \
-		libzstd.so:archivers/zstd \
-		libslirp.so:net/libslirp
+		libinotify.so:devel/libinotify \
+		libslirp.so:net/libslirp \
+		libzstd.so:archivers/zstd
 .endif
 .if (${FLAVOR:U} != nox11 && ${FLAVOR:U} != tools && ${FLAVOR:U} != guestagent)
 LIB_DEPENDS+=	libepoxy.so:graphics/libepoxy
@@ -238,7 +238,7 @@ PLIST_SUB+=	LINUXBOOT_DMA=""
 .endif
 
 post-patch-CDROM_DMA-off:
-	@${REINPLACE_CMD} -e '/USE_DMA_CDROM/d' ${WRKSRC}/include/hw/ide/internal.h
+	@${REINPLACE_CMD} -e '/USE_DMA_CDROM/d' ${WRKSRC}/hw/ide/ide-internal.h
 
 do-build:
 	cd ${WRKSRC} && ${SETENVI} ${WRK_ENV} ${GMAKE} -j${MAKE_JOBS_NUMBER}
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index 7b44f6a13a47..6975d0897fa3 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709670183
-SHA256 (qemu/8.2.2/qemu-8.2.2.tar.xz) = 847346c1b82c1a54b2c38f6edbd85549edeb17430b7d4d3da12620e2962bc4f3
-SIZE (qemu/8.2.2/qemu-8.2.2.tar.xz) = 129398020
+TIMESTAMP = 1714425085
+SHA256 (qemu/9.0.0/qemu-9.0.0.tar.xz) = 32708ac66c30d8c892633ea968c771c1c76d597d70ddead21a0d22ccf386da69
+SIZE (qemu/9.0.0/qemu-9.0.0.tar.xz) = 129789856
diff --git a/emulators/qemu/files/patch-util_meson.build b/emulators/qemu/files/patch-util_meson.build
deleted file mode 100644
index 1e42351652d7..000000000000
--- a/emulators/qemu/files/patch-util_meson.build
+++ /dev/null
@@ -1,15 +0,0 @@
---- util/meson.build.orig	2023-12-19 21:24:35 UTC
-+++ util/meson.build
-@@ -102,11 +102,7 @@ if have_block
-   util_ss.add(files('readline.c'))
-   util_ss.add(files('throttle.c'))
-   util_ss.add(files('timed-average.c'))
--  if config_host_data.get('CONFIG_INOTIFY1')
--    util_ss.add(files('filemonitor-inotify.c'))
--  else
--    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'))
- endif
- 
diff --git a/emulators/qemu/pkg-plist b/emulators/qemu/pkg-plist
index ecfff8c9de72..6bb413cb53d0 100644
--- a/emulators/qemu/pkg-plist
+++ b/emulators/qemu/pkg-plist
@@ -81,6 +81,7 @@ include/qemu-plugin.h
 %%DATADIR%%/firmware/60-edk2-i386.json
 %%DATADIR%%/firmware/60-edk2-x86_64.json
 %%DATADIR%%/hppa-firmware.img
+%%DATADIR%%/hppa-firmware64.img
 %%DATADIR%%/keymaps/ar
 %%DATADIR%%/keymaps/bepo
 %%DATADIR%%/keymaps/cz



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404292155.43TLtQDc026437>