From nobody Sun Sep 15 19:54:54 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 4X6Jfk52Rgz5WqvC; Sun, 15 Sep 2024 19:54:54 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X6Jfk3YBLz3yp2; Sun, 15 Sep 2024 19:54:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726430094; 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=Lv//bWEXu0XLaPTvjtiS8oaLmrNQpa/8ss1z58h6Wnw=; b=T4d+5IyXH/uG8Vk/cgEgGwOeu2P0iDBi5z++xyCEmgvycvLmBeopRVwC4OIo1sqGLyvWbs /cLzIK1G29o8Rdl9Moo5YKi0OOz/N2x/r5acNcZByoTHZVdfUv8U7Zmu4Vn2MmcoUMCABc NeslCkhaJoNODX9GMVHG3bznMNb5wI+fnnQb4+6hLM8a5Unh1XqNj4pVQk+aSZpEWZcr7T Va+RABAdagqZEUNJBQTU0lvmunCL/9cc8wgknCG+pGykgmbgUylsOdKqG+inWiAqhrsDA3 Hf4VToX+eU/n4EAs0VAnMItM8UU3NLBAB0+j16BJG1bUORLmaPWfXrwHQbXYlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726430094; a=rsa-sha256; cv=none; b=crUDmyW7y/td5gquDvRDFsMJnAliSVrPYjDZmZd8pZYFxhVLLms13H1Kve50KjclgpdMUD RvnxcaN2NguDViGm3GyXF1/kYRWv0lyl0N8D+/mIGAns2zr/VRyYr2AUxJEAIoaQ0XWt31 oZd3YPXZqwPh+HM1oQUZkKClUg5G1F2HqcegT1OsbjSZZ8V3FvmTm9P7EH5pv4Pl5+owJ/ oaXUGrX4MF0+uewFckgiZ6sgLEcoLvUVzottx2BM39ICGfDmPkeXxJHzAkaN0E3nqALuc0 IXl881gsjN/bcZra3NJS4e4ScF13byrTtxM+znICMLdwYdgg0PSw8co+2wT14g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726430094; 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=Lv//bWEXu0XLaPTvjtiS8oaLmrNQpa/8ss1z58h6Wnw=; b=vUqD2Bd7wd/ccZYvc7WyeYRwRelFvePC5KNz4tUGD2YdF1IUE/TLDLsrrSwLs6urq4FaV3 07a2G2CmiFR/F+4t6OmIEWn9mgZpMSQqcRMvsNUqOK0QoqfsevRoXn1l+Ak1CkQvHXYhu4 eibsaBaEtg0eiDN9eV2NZJniyN/J7cBDiFrg6W2M5vziGRaK8JmYp0ZnzGVz/cjz3acp2N m6+iLSmLKLBFIEEO32obGn75uRoIwgop22cem9489v6hjZl1jOsfpEeM7YnF4kVnAMizle 27nytocI8AimGBvX0cHo2Zuw+KgFdP1FDLhWzlK9MdBhgxFxMOGGVCm+12IdXA== 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 4X6Jfk39MrzNwW; Sun, 15 Sep 2024 19:54:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48FJss7o041569; Sun, 15 Sep 2024 19:54:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48FJss96041566; Sun, 15 Sep 2024 19:54:54 GMT (envelope-from git) Date: Sun, 15 Sep 2024 19:54:54 GMT Message-Id: <202409151954.48FJss96041566@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: 55fa6b6a6d61 - main - emulators/qemu-devel: Update version 8.3.0.20240630=>8.3.0.20240731 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: 55fa6b6a6d6168d801afcb78759e31915794994e Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=55fa6b6a6d6168d801afcb78759e31915794994e commit 55fa6b6a6d6168d801afcb78759e31915794994e Author: Muhammad Moinur Rahman AuthorDate: 2024-09-15 19:53:57 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2024-09-15 19:54:38 +0000 emulators/qemu-devel: Update version 8.3.0.20240630=>8.3.0.20240731 --- emulators/qemu-devel/Makefile | 6 ++-- emulators/qemu-devel/distinfo | 30 +++++++++---------- .../qemu-devel/files/patch-util_cpuinfo-ppc.c | 34 ---------------------- emulators/qemu-devel/pkg-plist | 3 ++ 4 files changed, 21 insertions(+), 52 deletions(-) diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile index 0a3fad114e29..9865c9d96077 100644 --- a/emulators/qemu-devel/Makefile +++ b/emulators/qemu-devel/Makefile @@ -1,5 +1,5 @@ PORTNAME= qemu -DISTVERSION= 8.3.0.20240630 +DISTVERSION= 8.3.0.20240731 CATEGORIES= emulators PKGNAMESUFFIX= -devel DIST_SUBDIR= qemu/${PORTVERSION} @@ -23,11 +23,11 @@ USES= bison compiler:c11 cpe gmake gnome iconv:wchar_t localbase:ldflags \ ninja perl5 pkgconfig python:build shebangfix tar:xz xorg USE_GITLAB= yes GL_ACCOUNT= qemu-project -GL_TAGNAME= b6d32a06fc0984e537091cba08f2e1ed9f775d74 +GL_TAGNAME= e9d2db818ff934afb366aea566d0b33acf7bced1 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:dc1b4be6be321e39d21604ab4287c9ce972be4da:meson/meson \ + qemu-project:meson:bdc2f2774c35ad2c81e3fea8621fdff6905c021b: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 diff --git a/emulators/qemu-devel/distinfo b/emulators/qemu-devel/distinfo index 2fd2dae63f96..f0bf388cfe95 100644 --- a/emulators/qemu-devel/distinfo +++ b/emulators/qemu-devel/distinfo @@ -1,15 +1,15 @@ -TIMESTAMP = 1726314789 -SHA256 (qemu/8.3.0.20240630/qemu-project-qemu-b6d32a06fc0984e537091cba08f2e1ed9f775d74_GL0.tar.gz) = 5612653207e00b6f4e0f4846149f688d2fb0dc05d83e4f6f12d5ac93d6d66a7c -SIZE (qemu/8.3.0.20240630/qemu-project-qemu-b6d32a06fc0984e537091cba08f2e1ed9f775d74_GL0.tar.gz) = 38107529 -SHA256 (qemu/8.3.0.20240630/qemu-project-keycodemapdb-f5772a62ec52591ff6870b7e8ef32482371f22c6_GL0.tar.gz) = d014b53382dbb17b8196ad12f50de7f20d0ef1b9f7d54b0be51a6cbb14209195 -SIZE (qemu/8.3.0.20240630/qemu-project-keycodemapdb-f5772a62ec52591ff6870b7e8ef32482371f22c6_GL0.tar.gz) = 29580 -SHA256 (qemu/8.3.0.20240630/qemu-project-dtc-b6910bec11614980a21e46fbccc35934b671bd81_GL0.tar.gz) = e115f987eec23a1ba25150a46ced1675de3716072d3b4905afb3a9cda0f007c7 -SIZE (qemu/8.3.0.20240630/qemu-project-dtc-b6910bec11614980a21e46fbccc35934b671bd81_GL0.tar.gz) = 205556 -SHA256 (qemu/8.3.0.20240630/qemu-project-libvfio-user-0b28d205572c80b568a1003db2c8f37ca333e4d7_GL0.tar.gz) = d2f60cd4f86f345aab1332953eb736cce3518159e6e99bcc2d10467c06f717fe -SIZE (qemu/8.3.0.20240630/qemu-project-libvfio-user-0b28d205572c80b568a1003db2c8f37ca333e4d7_GL0.tar.gz) = 189943 -SHA256 (qemu/8.3.0.20240630/qemu-project-meson-dc1b4be6be321e39d21604ab4287c9ce972be4da_GL0.tar.gz) = 297a05a364170f8610758cfdc63124f7d76b03b44241a46f329620c2dc5c72d0 -SIZE (qemu/8.3.0.20240630/qemu-project-meson-dc1b4be6be321e39d21604ab4287c9ce972be4da_GL0.tar.gz) = 4802490 -SHA256 (qemu/8.3.0.20240630/qemu-project-berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037_GL0.tar.gz) = faae889814ea6a292f7ca03d9b36e6c7e95bab2a64777804883cc822b8d48757 -SIZE (qemu/8.3.0.20240630/qemu-project-berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037_GL0.tar.gz) = 148741 -SHA256 (qemu/8.3.0.20240630/qemu-project-berkeley-testfloat-3-e7af9751d9f9fd3b47911f51a5cfd08af256a9ab_GL0.tar.gz) = e7a09d51dc7e96cb8422c919c85fc3833d4f788567638c9162ef5cd7db59b1df -SIZE (qemu/8.3.0.20240630/qemu-project-berkeley-testfloat-3-e7af9751d9f9fd3b47911f51a5cfd08af256a9ab_GL0.tar.gz) = 139308 +TIMESTAMP = 1726415007 +SHA256 (qemu/8.3.0.20240731/qemu-project-qemu-e9d2db818ff934afb366aea566d0b33acf7bced1_GL0.tar.gz) = 2253fd4db346c53b16146bf061f9da779b98bab8ad60d8f5f7f8ece90f97d3a1 +SIZE (qemu/8.3.0.20240731/qemu-project-qemu-e9d2db818ff934afb366aea566d0b33acf7bced1_GL0.tar.gz) = 38260853 +SHA256 (qemu/8.3.0.20240731/qemu-project-keycodemapdb-f5772a62ec52591ff6870b7e8ef32482371f22c6_GL0.tar.gz) = d014b53382dbb17b8196ad12f50de7f20d0ef1b9f7d54b0be51a6cbb14209195 +SIZE (qemu/8.3.0.20240731/qemu-project-keycodemapdb-f5772a62ec52591ff6870b7e8ef32482371f22c6_GL0.tar.gz) = 29580 +SHA256 (qemu/8.3.0.20240731/qemu-project-dtc-b6910bec11614980a21e46fbccc35934b671bd81_GL0.tar.gz) = e115f987eec23a1ba25150a46ced1675de3716072d3b4905afb3a9cda0f007c7 +SIZE (qemu/8.3.0.20240731/qemu-project-dtc-b6910bec11614980a21e46fbccc35934b671bd81_GL0.tar.gz) = 205556 +SHA256 (qemu/8.3.0.20240731/qemu-project-libvfio-user-0b28d205572c80b568a1003db2c8f37ca333e4d7_GL0.tar.gz) = d2f60cd4f86f345aab1332953eb736cce3518159e6e99bcc2d10467c06f717fe +SIZE (qemu/8.3.0.20240731/qemu-project-libvfio-user-0b28d205572c80b568a1003db2c8f37ca333e4d7_GL0.tar.gz) = 189943 +SHA256 (qemu/8.3.0.20240731/qemu-project-meson-bdc2f2774c35ad2c81e3fea8621fdff6905c021b_GL0.tar.gz) = 033d79a6c1a3bdb3c83112079f9d0a31438dc17da0c13f71413744c6b1174843 +SIZE (qemu/8.3.0.20240731/qemu-project-meson-bdc2f2774c35ad2c81e3fea8621fdff6905c021b_GL0.tar.gz) = 4809236 +SHA256 (qemu/8.3.0.20240731/qemu-project-berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037_GL0.tar.gz) = faae889814ea6a292f7ca03d9b36e6c7e95bab2a64777804883cc822b8d48757 +SIZE (qemu/8.3.0.20240731/qemu-project-berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037_GL0.tar.gz) = 148741 +SHA256 (qemu/8.3.0.20240731/qemu-project-berkeley-testfloat-3-e7af9751d9f9fd3b47911f51a5cfd08af256a9ab_GL0.tar.gz) = e7a09d51dc7e96cb8422c919c85fc3833d4f788567638c9162ef5cd7db59b1df +SIZE (qemu/8.3.0.20240731/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 deleted file mode 100644 index af9999a22108..000000000000 --- a/emulators/qemu-devel/files/patch-util_cpuinfo-ppc.c +++ /dev/null @@ -1,34 +0,0 @@ ---- util/cpuinfo-ppc.c.orig 2024-01-29 19:13:22 UTC -+++ util/cpuinfo-ppc.c -@@ -6,13 +6,21 @@ - #include "qemu/osdep.h" - #include "host/cpuinfo.h" - --#include - #ifdef CONFIG_GETAUXVAL - # include - #else -+# ifdef __linux__ -+# include -+# elif defined(__FreeBSD__) -+# include -+# endif - # include "elf.h" - #endif - -+#ifndef PPC_FEATURE2_ARCH_3_1 -+# define PPC_FEATURE2_ARCH_3_1 0x00040000 -+#endif -+ - unsigned cpuinfo; - - /* Called both as constructor and (possibly) via other constructors. */ -@@ -53,7 +61,7 @@ unsigned __attribute__((constructor)) cpuinfo_init(voi - * always have both anyway, since VSX came with Power7 - * and crypto came with Power8. - */ -- if (hwcap2 & PPC_FEATURE2_VEC_CRYPTO) { -+ if (hwcap2 & PPC_FEATURE2_HAS_VEC_CRYPTO) { - info |= CPUINFO_CRYPTO; - } - } diff --git a/emulators/qemu-devel/pkg-plist b/emulators/qemu-devel/pkg-plist index cb6a9d1d54a2..5d9064c7f713 100644 --- a/emulators/qemu-devel/pkg-plist +++ b/emulators/qemu-devel/pkg-plist @@ -1,5 +1,6 @@ bin/elf2dmp %%BSDUSER%%bin/qemu-arm +%%BSDUSER%%bin/qemu-aarch64 bin/qemu-edid %%BSDUSER%%bin/qemu-i386 bin/qemu-img @@ -68,6 +69,8 @@ share/man/man7/qemu-storage-daemon-qmp-ref.7.gz %%DATADIR%%/edk2-i386-secure-code.fd %%DATADIR%%/edk2-i386-vars.fd %%DATADIR%%/edk2-licenses.txt +%%DATADIR%%/edk2-riscv-code.fd +%%DATADIR%%/edk2-riscv-vars.fd %%DATADIR%%/edk2-x86_64-code.fd %%DATADIR%%/edk2-x86_64-secure-code.fd %%DATADIR%%/efi-e1000.rom