From nobody Mon Jan 29 19:54:50 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNzXq0FR1z59Jld; Mon, 29 Jan 2024 19:54:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TNzXp6Gfkz4FWc; Mon, 29 Jan 2024 19:54:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706558090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tf08aE14avBtoQ8Gc7CRM0SbOl5UdqoIzp9KdBajBtw=; b=ITYxISd3FXPeIKk375WBJmHijs6coHH1AvUpVEwmd4wV3YTMU06hL2vc7lg4OtyuYYgOuE W1JgZSGHo0E6sdz5A6F1eoxgGIMYOf9aTiaZWmGhVsNzDvp5a325knlqtiy+haox3wAfzq ktboYC6a4BSJhDa0H9/Rhpq5w8RZOE4qUeZe9CA0TEQ9PWO9PtR3r/SCiY+80DRk4CX3li spXCjJ9rM5xEi92hwkzFDYkaazikaD7KZzHtr1IJEKKYHzLHDzBpRZJxBhNUDpWmt29HJK m4S30W3q0HHTiUPgP/xWM7EWE+Bgtm3Z6JERpH6y+igSmeNpSiZWNykFMJaMtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706558090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tf08aE14avBtoQ8Gc7CRM0SbOl5UdqoIzp9KdBajBtw=; b=WlFMecdJG+2UqcMcoaJzqM0NSUzpYIio5vv6XN5OlUEZm1FoEA27AhJ/KLMEpeXfUfIco9 0Jr4SVzQRUTmahcr2VJxqoTAuGwXKWQ9UP9l0YSk3Nzx2E+dYXv6yPOj56C+p3/byvs5cx 9ViIBEgydOdsQJL4U6eqV3vbEfCcIi/UstPWXAqSCzVQZYyYrlZ5whghkp3bdDrVcLEl9Q fnOn4i357ix40W7/EViZG/3RuB4N8AuSIWEiGxRcbZU1gK6kvJq7EdpN8m1mPm6fNFB+7G EupuBDrWxpHL4olYbReRTVIpSwdLcf/vv4kx19kcIwDfD/1lcAuQRXefaOL6eQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706558090; a=rsa-sha256; cv=none; b=POYxkjgUDM5MqjDKMgqBMT1zd2eyOuYTtTKN1EP3cr/948NyXfSPutz7eGGqxyCW4+mg3g W9zPICLrj0Q02S/Lq4aw3gUQHCu87xXJGGOulAxuNd95oFp4Smef36/TeX95HlAqtf9b6i M4S3ghP6gg2NQKAJq0GKnV61fLtHSWUhf/gw3VMyvrQUXKITNGWX2NnWDCumcomrLbQv0b CNEFH4R9rYLrxcJ5cGv3sWBZu2ED7ymaeIA3cbobw02vMk4tTGw4U0ttZUME0WFvRbN8wD qFajJ0V4T/rPzDnDQS4H3JkUeA8dFwP7zdeTMDX6NFzdgki6tUxCJVy/IGcprg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNzXp2dnQz1537; Mon, 29 Jan 2024 19:54:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40TJsoit043407; Mon, 29 Jan 2024 19:54:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40TJsoU1043404; Mon, 29 Jan 2024 19:54:50 GMT (envelope-from git) Date: Mon, 29 Jan 2024 19:54:50 GMT Message-Id: <202401291954.40TJsoU1043404@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 4927ace0dd70 - main - emulators/qemu-devel: Update version 8.3.0.20231231=>8.3.0.20240126 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4927ace0dd70205553c501b36f585e5494d55dac Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=4927ace0dd70205553c501b36f585e5494d55dac commit 4927ace0dd70205553c501b36f585e5494d55dac Author: Muhammad Moinur Rahman AuthorDate: 2024-01-29 19:14:36 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2024-01-29 19:54:23 +0000 emulators/qemu-devel: Update version 8.3.0.20231231=>8.3.0.20240126 --- emulators/qemu-devel/Makefile | 8 +++--- emulators/qemu-devel/distinfo | 30 +++++++++++----------- .../qemu-devel/files/patch-util_cpuinfo-ppc.c | 11 +++++--- emulators/qemu-devel/files/patch-util_meson.build | 10 ++++---- emulators/qemu-devel/pkg-plist | 18 ++++++------- 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 #ifdef CONFIG_GETAUXVAL # include - #else --# include +# ifdef __linux__ +# include +# 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