From nobody Thu Sep 12 15:10:24 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 4X4LTs1ChPz5W1ng; Thu, 12 Sep 2024 15:10:25 +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 4X4LTr66mrz4Dyq; Thu, 12 Sep 2024 15:10:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726153824; 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=NQ/AgtgcNolhCy4tPpGtAeCrqeB0NywP1BPFdTjKSNY=; b=ZNNCbBcxdjRrDeUtl+0/QEbDzs01ArCXd3fDaxJ6IxbAPjNfVvtMRb/WIM1V5QzPPDTTj/ AzApld8G3FYgBqqikdGRwSDQuNqTpsZ19Z/yE11C7YpfmObWODPbf92a0RRbuVN732eZ6j Cju11wTkO0bfY2i5oqcuE54vkAskv0DgBsj/twW01qG1nK1GdBtZwmujsxcaxtLpGtpTLk 3zxl8nJ7Cpmhlc2XkjU2ZufaQUCp+q/3EYWElY4+op/4g0liItk/6CbZq5dcVl6SAxv0aI A9xntwl7SjRR5lMhBKbIKJQZsFHzAX/9Ibm2l8PqavPQULbgC2Vcv5AR+kHcpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726153824; a=rsa-sha256; cv=none; b=Zew44lO/3MkQp91Qwee2HHO6s+Sv3rNiEZ6BJDxYnxA2xanffvRPABw0lJtZJBMtrO81xW eg6aTCon0znOLeSGYGK8YFJXMb336ZXOg049GQeLCwlvNnvXPfrcaBo0Y4zmrzidyysjez fpdYaX0URCxOVemo8sDV3s1i3oScx6q3jnrHvvtEZhnztaKrLDoOzTwE/U7j8josclhjCB tNzGmlfAMQ1q8Nz6Ew/LPR5VxLZGQje6JN5Lrm7y7BKFgdO9hla/sNVOyofcSGsgJjtoeG CODqIDwNRTtKUqzxbxjPmLFY4mTaA+ID3lIHkNcDzovPEziStjWK2ARLqC6iiA== 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=1726153824; 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=NQ/AgtgcNolhCy4tPpGtAeCrqeB0NywP1BPFdTjKSNY=; b=Rhi+PF464uFr3ynRZysyX42czVeFD0ajr8P8Z4W7JYNRuiD4eBLR4r8Z7Ha8ju9e//XS0a yy9hz+5bx29Mv3HrcgIS5Nd2aLmodnKmup+kaZiXxfhMPsGu9WFYW8df/WHe1/3yCxzxL1 gaSyilf2mUncstzD1Ilku7PGXcVRsPfeLb041PluKh7Y/4B9lVvkM4BKGI5nG2Iy0zoO5d 62Gejgvgp+7cx5eKk85H6xAXRDzCAX6dqmpru/8y8wDTfgWF7R4W9qItoRt/5C8EnpGqwv f6Jspe7uwczfOabcxW/M2tKTbQ6eJtKPiBR9LrW1qTMYs8DkJ0Wu2rIW6Kpnww== 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 4X4LTr5fyNz1Jxl; Thu, 12 Sep 2024 15:10:24 +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 48CFAOQB014610; Thu, 12 Sep 2024 15:10:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48CFAOQ3014607; Thu, 12 Sep 2024 15:10:24 GMT (envelope-from git) Date: Thu, 12 Sep 2024 15:10:24 GMT Message-Id: <202409121510.48CFAOQ3014607@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: b680da690134 - main - emulators/qemu: Update version 9.0.2 => 9.1.0 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: b680da690134d4b3011588482f2046129c2f1646 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=b680da690134d4b3011588482f2046129c2f1646 commit b680da690134d4b3011588482f2046129c2f1646 Author: Muhammad Moinur Rahman AuthorDate: 2024-09-12 13:30:44 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2024-09-12 15:09:46 +0000 emulators/qemu: Update version 9.0.2 => 9.1.0 Changelog: https://wiki.qemu.org/ChangeLog/9.1 --- emulators/qemu/Makefile | 2 +- emulators/qemu/distinfo | 6 ++--- emulators/qemu/files/patch-util_cpuinfo-ppc.c | 34 --------------------------- emulators/qemu/pkg-plist | 4 +++- 4 files changed, 7 insertions(+), 39 deletions(-) diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile index 028c8a2f3492..d24810776e83 100644 --- a/emulators/qemu/Makefile +++ b/emulators/qemu/Makefile @@ -1,5 +1,5 @@ PORTNAME= qemu -DISTVERSION= 9.0.2 +DISTVERSION= 9.1.0 CATEGORIES= emulators MASTER_SITES= https://download.qemu.org/ DIST_SUBDIR= qemu/${PORTVERSION} diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo index 98df1f532670..89279a436e82 100644 --- a/emulators/qemu/distinfo +++ b/emulators/qemu/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1722075777 -SHA256 (qemu/9.0.2/qemu-9.0.2.tar.xz) = a8c3f596aece96da3b00cafb74baafa0d14515eafb8ed1ee3f7f5c2d0ebf02b6 -SIZE (qemu/9.0.2/qemu-9.0.2.tar.xz) = 132387528 +TIMESTAMP = 1726146765 +SHA256 (qemu/9.1.0/qemu-9.1.0.tar.xz) = 816b7022a8ba7c2ac30e2e0cf973e826f6bcc8505339603212c5ede8e94d7834 +SIZE (qemu/9.1.0/qemu-9.1.0.tar.xz) = 132478356 diff --git a/emulators/qemu/files/patch-util_cpuinfo-ppc.c b/emulators/qemu/files/patch-util_cpuinfo-ppc.c deleted file mode 100644 index af9999a22108..000000000000 --- a/emulators/qemu/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/pkg-plist b/emulators/qemu/pkg-plist index 6bb413cb53d0..209373d7f881 100644 --- a/emulators/qemu/pkg-plist +++ b/emulators/qemu/pkg-plist @@ -1,4 +1,5 @@ %%CURL%%bin/elf2dmp +%%BSDUSER%%%%NO_X86_TARGETS%%bin/qemu-aarch64 %%BSDUSER%%%%NO_X86_TARGETS%%bin/qemu-arm bin/qemu-edid %%BSDUSER%%bin/qemu-i386 @@ -22,7 +23,6 @@ bin/qemu-system-i386 %%NO_X86_TARGETS%%bin/qemu-system-mips64 %%NO_X86_TARGETS%%bin/qemu-system-mips64el %%NO_X86_TARGETS%%bin/qemu-system-mipsel -%%NO_X86_TARGETS%%bin/qemu-system-nios2 %%NO_X86_TARGETS%%bin/qemu-system-or1k %%NO_X86_TARGETS%%bin/qemu-system-ppc %%NO_X86_TARGETS%%bin/qemu-system-ppc64 @@ -64,6 +64,8 @@ include/qemu-plugin.h %%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