From nobody Mon Apr 29 21:55: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 4VSy7L2RLcz5Jws9; Mon, 29 Apr 2024 22:05:18 +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 4VSy7K4WCNz40pW; Mon, 29 Apr 2024 22:05:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714428317; 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=xrYQX134JnGMK+XgBmFw48jRH27ag0G8QW/e9E1WswI=; b=B14fZzUXqGHXaQGyvIFD/MICem3bVHa2QBcB4t8J7Et9M1tZUwP8jOGSwwYiwNUSKk4giX R8vlkRnpitgfvvjs2+Xcs8b19J82oEONrcF75z6LzcQ+dTKnpBgMIp9yV6PkU4oyv1TU8D 0oHrbEW1YKFLqVHwjwWarcZIRas0Fuh4pmovhxkoQ90wrXmfeVc2wR+k35AbfBDZV5FtcQ ou67mVPyEKWJGJjom/8BAV7jksFpl0AnOIIceGX6jpuBA66TZcnoJiOC7zdI/w9oApIx50 G7+E/dViuCI0Hp/MD43Aw37qVLU/9jbT0Jc5QdfSaQ4sy86faV90+JGTwI5Etg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714428317; a=rsa-sha256; cv=none; b=PW5fFecaHPetZ0hDBDIW9gHRqWJpnI1DCE96pAf9sD/RW56E/ZRmlbRCBGXKSBlKBGNytd /nC32imyYG+9ZnAEV9yMp7NIuQubbQbRsxdhyHbKDUpERbXf8za6L/b/Z2QwpPm52/va9U IZf0AlIPK294aEoLVIKaAIehww3iNDTQtI7GYAvapaT8xEQ4/I8M+MLkmV6OHUSzjSwHb4 98DJVMzTjcMTp9rNX73JeFMLFn9m37Sxil6SDrUnX3LlhqpPAZkbMNvPiq7aMwu01+Nijo wRUg/IL61KFA6zFblFAvww/Ubpj/XdBywWblTuCwgemwEWSxN3u8dUFulc1N+g== 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=1714428317; 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=xrYQX134JnGMK+XgBmFw48jRH27ag0G8QW/e9E1WswI=; b=c4JV2G5HTq0rhI6rl/o68SdgxKySPQlLxTUiX/yAZyBYvFCVYLi0RGFlge2AaVVha9SC4z 1ksUMTAcr6jF1ZBb8TW5SI3XH8edj7J792uQb8bzM2M41LBI+xSEmfNUohfiBw/oF10d0d 1JNa+6zlq+BlkCkvpaNVjyuid8RIoiGxzHrU5vxdQ0K/UNbp86camPUhs6xehQDfFGGdQ2 61iAoIyMLFYyZLDZVkXBYWa8pE4T1EAnnUV0AEU99jzx5e9i/8H0caYJb6UNwUgL8EWXYP m+vtA1L/u2NwcpcBUF4nC5eCzPUiu5CNUrheqMbtoA/49jeVxl1KdWqZhhesvQ== 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 4VSxvw4ZqPz1MHp; Mon, 29 Apr 2024 21:55:24 +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 43TLtOru026353; Mon, 29 Apr 2024 21:55:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43TLtOgX026350; Mon, 29 Apr 2024 21:55:24 GMT (envelope-from git) Date: Mon, 29 Apr 2024 21:55:24 GMT Message-Id: <202404292155.43TLtOgX026350@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: ab0167ebb595 - main - emulators/qemu7: Update version 7.2.10=>7.2.11 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: ab0167ebb595aa1d7d42e909eed60249cc9f5d27 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=ab0167ebb595aa1d7d42e909eed60249cc9f5d27 commit ab0167ebb595aa1d7d42e909eed60249cc9f5d27 Author: Muhammad Moinur Rahman AuthorDate: 2024-04-29 20:58:49 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2024-04-29 21:55:04 +0000 emulators/qemu7: Update version 7.2.10=>7.2.11 - Remove qemu7-tools as it looks redundant with qemu-tools - Mark DEPRECATED as qemu 9.X.X has been released - Set EXPIRATION_DATE to 2024-06-30 Changelog: https://wiki.qemu.org/ChangeLog/7.2 --- MOVED | 1 + emulators/qemu7/Makefile | 74 ++++++----------------------------------- emulators/qemu7/distinfo | 6 ++-- emulators/qemu7/pkg-descr-tools | 5 --- emulators/qemu7/pkg-plist-tools | 50 ---------------------------- 5 files changed, 15 insertions(+), 121 deletions(-) diff --git a/MOVED b/MOVED index bf33184e382f..f92132c78840 100644 --- a/MOVED +++ b/MOVED @@ -3200,3 +3200,4 @@ www/mod_tidy||2024-04-24|Has expired: Last upstream release was in 2005 net-p2p/go-prysm||2024-04-24|Has expired: Broken for more than 6 months x11-toolkits/p5-Gtk2-Ex-Dialogs||2024-04-24|Has expired: No longer works with modern Gtk2 math/mathlibtools||2024-04-28|Project is obsolete and archived on GitHub since Aug 2023, not compatible with math/lean4 +emulators/qemu7@tools|emulators/qemu@tools|2024-04-29|Use emulators/qemu@tools instead diff --git a/emulators/qemu7/Makefile b/emulators/qemu7/Makefile index c13117b00246..ec871d29cf50 100644 --- a/emulators/qemu7/Makefile +++ b/emulators/qemu7/Makefile @@ -1,5 +1,5 @@ PORTNAME= qemu -PORTVERSION= 7.2.10 +PORTVERSION= 7.2.11 CATEGORIES= emulators MASTER_SITES= https://download.qemu.org/ DIST_SUBDIR= qemu/${PORTVERSION} @@ -10,44 +10,35 @@ WWW= https://www.qemu.org/ LICENSE= GPLv2 -.if ${FLAVOR:U} != tools ONLY_FOR_ARCHS= aarch64 amd64 i386 powerpc64 # At the moment it broken on powerpc64le # We need to check if it build with other ARCHS -.endif + +DEPRECATED= qemu 9.X.X is out, so time to retire this one +EXPIRATION_DATE= 2024-06-30 BUILD_DEPENDS= bash:shells/bash -.if ${FLAVOR:U} != tools LIB_DEPENDS+= libfdt.so:sysutils/dtc \ libzstd.so:archivers/zstd \ libslirp.so:net/libslirp -.endif -.if (${FLAVOR:U} != nox11 && ${FLAVOR:U} != tools) +.if ${FLAVOR:U} != nox11 LIB_DEPENDS+= libepoxy.so:graphics/libepoxy .endif -FLAVORS= default nox11 tools +FLAVORS= default nox11 FLAVOR?= ${FLAVORS:[1]} default_PKGNAMESUFFIX= 7 default_CONFLICTS_INSTALL= qemu-devel qemu-nox11 qemu-tools qemu-utils \ - qemu6* + qemu8* nox11_PKGNAMESUFFIX= 7-nox11 -nox11_CONFLICTS_INSTALL= qemu qemu-devel qemu6* +nox11_CONFLICTS_INSTALL= qemu qemu-devel qemu7* nox11_COMMENT= (without X11) -tools_PKGNAMESUFFIX= 7-tools -tools_COMMENT= (tools only) -tools_CONFLICTS_INSTALL= qemu qemu-devel qemu-nox11 qemu-utils qemu6* \ - qemu-guest-agent -tools_DESCR= ${.CURDIR}/pkg-descr-tools -tools_PLIST= ${.CURDIR}/pkg-plist-tools USES= cpe gmake gnome ninja perl5 pkgconfig python:build tar:xz USE_GNOME= glib20 USE_PERL5= build -.if ${FLAVOR:U} != tools USES+= iconv:wchar_t -.endif -.if (${FLAVOR:U} != nox11 && ${FLAVOR:U} != tools) +.if ${FLAVOR:U} != nox11 USE_GNOME+= cairo .endif @@ -65,41 +56,8 @@ CONFIGURE_ARGS+= --cc=${CC} \ --mandir=${PREFIX}/share/man \ --prefix=${PREFIX} \ --python=${PYTHON_CMD} -.if ${FLAVOR:U} != tools CONFIGURE_ARGS+= --enable-fdt=system \ --enable-netmap -.endif -.if ${FLAVOR:U} == tools -CONFIGURE_ARGS+= --disable-attr \ - --disable-blobs \ - --disable-brlapi \ - --disable-bzip2 \ - --disable-cap-ng \ - --disable-coroutine-pool \ - --disable-curses \ - --disable-fdt \ - --disable-gcrypt \ - --disable-glusterfs \ - --disable-libnfs \ - --disable-libusb \ - --disable-lzo \ - --disable-netmap \ - --disable-nettle \ - --disable-numa \ - --disable-rbd \ - --disable-rdma \ - --disable-seccomp \ - --disable-smartcard \ - --disable-snappy \ - --disable-spice \ - --disable-system \ - --disable-tpm \ - --disable-user \ - --disable-vhost-net \ - --disable-virtfs \ - --disable-vnc \ - --enable-tools -.endif CFLAGS:= ${CFLAGS:C/-fno-tree-vrp//} WITHOUT_CPU_CFLAGS= yes #to avoid problems with register allocation @@ -118,12 +76,6 @@ OPTIONS_SINGLE_NCURSES= NCURSES_BASE NCURSES_DEFAULT NCURSES_PORT .if ${FLAVOR:U} == nox11 OPTIONS_EXCLUDE:= GTK3 OPENGL X11 .endif -.if ${FLAVOR:U} == tools -OPTIONS_EXCLUDE:= CAPSTONE CDROM_DMA CURL DEBUG GNUTLS GTK3 ISCSI \ - JPEG NCURSES NCURSES_BASE NCURSES_DEFAULT \ - NCURSES_PORT OPENGL PNG SAMBA SASL STATIC_LINK \ - USBREDIR VDE X11 X86_TARGETS -.endif OPTIONS_SUB= yes CAPSTONE_DESC= Disassembly framework support CDROM_DMA_DESC= IDE CDROM DMA @@ -188,8 +140,7 @@ X11_USE= GNOME=gdkpixbuf2 \ SDL=sdl2 \ XORG=x11,xext X11_CONFIGURE_ENABLE= sdl -.if (empty(FLAVOR) || ${FLAVOR:U} == default || ${FLAVOR:U} == nox11) && \ - (${FLAVOR:U} != tools || ${PKGNAMESUFFIX} != "-guest-agent") +.if (empty(FLAVOR) || ${FLAVOR:U} == default || ${FLAVOR:U} == nox11) X86_TARGETS_USES_OFF= xorg X86_TARGETS_USE_OFF= XORG=pixman,x11 X86_TARGETS_CONFIGURE_ON= --target-list='i386-softmmu i386-bsd-user x86_64-softmmu x86_64-bsd-user' @@ -197,8 +148,7 @@ X86_TARGETS_CONFIGURE_ON= --target-list='i386-softmmu i386-bsd-user x86_64-softm .include -.if (empty(FLAVOR) || ${FLAVOR:U} == default || ${FLAVOR:U} == nox11) && \ - (${FLAVOR:U} != tools || ${PKGNAMESUFFIX} != "-guest-agent") +.if (empty(FLAVOR) || ${FLAVOR:U} == default || ${FLAVOR:U} == nox11) .if ${ARCH} == "amd64" MAKE_ARGS+= ARCH=x86_64 .endif @@ -231,10 +181,8 @@ do-install: .if !target(post-install) post-install: -.if ${FLAVOR:U} != tools ${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifup.sample ${STAGEDIR}${PREFIX}/etc ${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifdown.sample ${STAGEDIR}${PREFIX}/etc -.endif @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qemu-* post-install-DOCS-on: diff --git a/emulators/qemu7/distinfo b/emulators/qemu7/distinfo index 67f88ad288d4..b1121f150e8e 100644 --- a/emulators/qemu7/distinfo +++ b/emulators/qemu7/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1709666318 -SHA256 (qemu/7.2.10/qemu-7.2.10.tar.xz) = ece96cfe9c379920dbd2827fc9cc2ea0a0e1ec4619e6ef337f82d67c502eef76 -SIZE (qemu/7.2.10/qemu-7.2.10.tar.xz) = 121311584 +TIMESTAMP = 1714421803 +SHA256 (qemu/7.2.11/qemu-7.2.11.tar.xz) = c356e7b53c998aed60f2306e4166aa0902381f51c515bb7bf97aca8a2dbcaed7 +SIZE (qemu/7.2.11/qemu-7.2.11.tar.xz) = 121877020 diff --git a/emulators/qemu7/pkg-descr-tools b/emulators/qemu7/pkg-descr-tools deleted file mode 100644 index b58edd81932b..000000000000 --- a/emulators/qemu7/pkg-descr-tools +++ /dev/null @@ -1,5 +0,0 @@ -Miscellaneous tools that can be used without the rest of QEMU - -* qemu-img: QEMU disk image utility -* qemu-io: QEMU disk exerciser -* qemu-nbd: QEMU disk network block device server diff --git a/emulators/qemu7/pkg-plist-tools b/emulators/qemu7/pkg-plist-tools deleted file mode 100644 index 1aaf7955a50f..000000000000 --- a/emulators/qemu7/pkg-plist-tools +++ /dev/null @@ -1,50 +0,0 @@ -bin/qemu-edid -bin/qemu-img -bin/qemu-io -bin/qemu-nbd -bin/qemu-storage-daemon -include/qemu-plugin.h -%%PORTDOCS%%share/man/man1/qemu.1.gz -%%PORTDOCS%%share/man/man1/qemu-img.1.gz -%%PORTDOCS%%share/man/man7/qemu-block-drivers.7.gz -%%PORTDOCS%%share/man/man7/qemu-cpu-models.7.gz -%%PORTDOCS%%share/man/man8/qemu-nbd.8.gz -%%PORTDOCS%%share/man/man8/qemu-pr-helper.8.gz -%%PORTDOCS%%share/man/man7/qemu-qmp-ref.7.gz -%%PORTDOCS%%share/man/man1/qemu-storage-daemon.1.gz -%%PORTDOCS%%share/man/man7/qemu-storage-daemon-qmp-ref.7.gz -%%DATADIR%%/keymaps/ar -%%DATADIR%%/keymaps/bepo -%%DATADIR%%/keymaps/cz -%%DATADIR%%/keymaps/da -%%DATADIR%%/keymaps/de -%%DATADIR%%/keymaps/de-ch -%%DATADIR%%/keymaps/en-gb -%%DATADIR%%/keymaps/en-us -%%DATADIR%%/keymaps/es -%%DATADIR%%/keymaps/et -%%DATADIR%%/keymaps/fi -%%DATADIR%%/keymaps/fo -%%DATADIR%%/keymaps/fr -%%DATADIR%%/keymaps/fr-be -%%DATADIR%%/keymaps/fr-ca -%%DATADIR%%/keymaps/fr-ch -%%DATADIR%%/keymaps/hr -%%DATADIR%%/keymaps/hu -%%DATADIR%%/keymaps/is -%%DATADIR%%/keymaps/it -%%DATADIR%%/keymaps/ja -%%DATADIR%%/keymaps/lt -%%DATADIR%%/keymaps/lv -%%DATADIR%%/keymaps/mk -%%DATADIR%%/keymaps/nl -%%DATADIR%%/keymaps/no -%%DATADIR%%/keymaps/pl -%%DATADIR%%/keymaps/pt -%%DATADIR%%/keymaps/pt-br -%%DATADIR%%/keymaps/ru -%%DATADIR%%/keymaps/sl -%%DATADIR%%/keymaps/sv -%%DATADIR%%/keymaps/th -%%DATADIR%%/keymaps/tr -%%DATADIR%%/trace-events-all