diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile index 01a98f31421e..91af05ec4496 100644 --- a/emulators/qemu/Makefile +++ b/emulators/qemu/Makefile @@ -1,205 +1,204 @@ # Created by: Juergen Lock PORTNAME= qemu -PORTVERSION= 6.1.0 -PORTREVISION= 3 +PORTVERSION= 6.2.0 CATEGORIES= emulators MASTER_SITES= https://download.qemu.org/ DIST_SUBDIR= qemu/${PORTVERSION} MAINTAINER= bofh@FreeBSD.org COMMENT= QEMU CPU Emulator ${${FLAVOR}_COMMENT} LICENSE= GPLv2 BUILD_DEPENDS= bash:shells/bash .if ${FLAVOR:U} != tools LIB_DEPENDS+= libfdt.so:sysutils/dtc \ libzstd.so:archivers/zstd .endif .if (${FLAVOR:U} != nox11 && ${FLAVOR:U} != tools) LIB_DEPENDS+= libepoxy.so:graphics/libepoxy .endif FLAVORS= default nox11 tools FLAVOR?= ${FLAVORS:[1]} default_CONFLICTS_INSTALL= qemu5* qemu42 qemu-devel qemu-nox11 qemu-tools qemu-utils nox11_PKGNAMESUFFIX= -nox11 nox11_CONFLICTS_INSTALL= qemu5* qemu42 qemu-devel qemu nox11_COMMENT= (without X11) tools_PKGNAMESUFFIX= -tools tools_COMMENT= (tools only) tools_CONFLICTS_INSTALL= qemu5* qemu42 qemu-devel qemu-nox11 qemu qemu-utils 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 ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64 powerpc64 powerpc64le USES+= iconv:wchar_t .endif .if (${FLAVOR:U} != nox11 && ${FLAVOR:U} != tools) USE_GNOME+= cairo .endif HAS_CONFIGURE= yes OPTIONS_SINGLE= NCURSES OPTIONS_SINGLE_NCURSES= NCURSES_DEFAULT NCURSES_BASE NCURSES_PORT OPTIONS_DEFINE= SAMBA X11 GTK3 OPENGL GNUTLS SASL JPEG PNG CURL VDE \ CDROM_DMA USBREDIR X86_TARGETS STATIC_LINK DOCS ISCSI CAPSTONE DEBUG \ STRIP OPTIONS_DEFAULT=X11 GTK3 OPENGL GNUTLS SASL JPEG PNG CDROM_DMA CURL NCURSES_DEFAULT VDE .if ${FLAVOR:U} == nox11 OPTIONS_EXCLUDE:= GTK3 X11 .endif .if ${FLAVOR:U} == tools OPTIONS_EXCLUDE:= SAMBA X11 GTK3 OPENGL GNUTLS SASL JPEG PNG CURL VDE \ CDROM_DMA USBREDIR X86_TARGETS STATIC_LINK ISCSI CAPSTONE DEBUG \ NCURSES_DEFAULT NCURSES_BASE NCURSES_PORT NCURSES .endif OPTIONS_SUB= yes CAPSTONE_DESC= Disassembly framework support CDROM_DMA_DESC= IDE CDROM DMA GNUTLS_DESC= gnutls dependency (vnc encryption) ISCSI_DESC= libiscsi dependency (iSCSI client for emulated drives) JPEG_DESC= jpeg dependency (vnc lossy compression) NCURSES_DEFAULT_DESC= Depend on ncurses (ports if installed, otherwise base) NCURSES_BASE_DESC= Depend on ncurses in base NCURSES_PORT_DESC= Depend on devel/ncurses in ports PNG_DESC= png dependency (vnc compression) SAMBA_DESC= samba dependency (for -smb) SASL_DESC= cyrus-sasl dependency (vnc encryption) STATIC_LINK_DESC= Statically link the executables USBREDIR_DESC= usb device network redirection (experimental!) VDE_DESC= vde dependency (for vde networking) X86_TARGETS_DESC= Build only x86 system targets CAPSTONE_CONFIGURE_ON= --enable-capstone=system --extra-cflags=-I${LOCALBASE}/include/capstone CAPSTONE_CONFIGURE_OFF= --disable-capstone CAPSTONE_LIB_DEPENDS= libcapstone.so:devel/capstone4 CURL_CONFIGURE_OFF= --disable-curl CURL_LIB_DEPENDS= libcurl.so:ftp/curl DEBUG_CONFIGURE_ON= --enable-debug DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} DOCS_CONFIGURE_ENABLE= docs GNUTLS_CONFIGURE_OFF= --disable-gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GTK3_CONFIGURE_OFF= --disable-gtk --disable-vte GTK3_LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon GTK3_USE= GNOME=gdkpixbuf2,gtk30,vte3 XORG=x11,xext GTK3_USES= gettext gl ISCSI_LIB_DEPENDS= libiscsi.so:net/libiscsi ISCSI_CONFIGURE_OFF= --disable-libiscsi JPEG_CONFIGURE_OFF= --disable-vnc-jpeg JPEG_USES= jpeg NCURSES_DEFAULT_USES= ncurses NCURSES_BASE_USES= ncurses:base NCURSES_PORT_USES= ncurses:port OPENGL_CONFIGURE_OFF= --disable-opengl OPENGL_USE= GL=gbm,gl OPENGL_USES= gl PNG_CONFIGURE_OFF= --disable-vnc-png PNG_LIB_DEPENDS= libpng.so:graphics/png SAMBA_CONFIGURE_ON= --smbd=${LOCALBASE}/sbin/smbd SASL_CONFIGURE_OFF= --disable-vnc-sasl SAMBA_USES= samba:run # smbd SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 STATIC_LINK_CONFIGURE_ON= --static STATIC_LINK_PREVENTS= GTK3 X11 STATIC_LINK_PREVENTS_MSG= X11 ui cannot be built static STRIP_CONFIGURE_OFF= --disable-strip USBREDIR_BUILD_DEPENDS= usbredir>=0.6:net/usbredir USBREDIR_CONFIGURE_OFF= --disable-usb-redir USBREDIR_RUN_DEPENDS= usbredir>=0.6:net/usbredir VDE_CONFIGURE_OFF= --disable-vde VDE_LIB_DEPENDS= libvdeplug.so:net/vde2 X11_CONFIGURE_ENABLE= sdl X11_USE= SDL=sdl2 XORG=x11,xext GNOME=gdkpixbuf2 X11_USES= sdl .if (empty(FLAVOR) || ${FLAVOR:U} == default || ${FLAVOR:U} == nox11) && (${FLAVOR:U} != tools || ${PKGNAMESUFFIX} != "-guest-agent") X86_TARGETS_USE_OFF= XORG=pixman,x11 X86_TARGETS_USES_OFF= xorg X86_TARGETS_CONFIGURE_ON= --target-list='i386-softmmu i386-bsd-user x86_64-softmmu x86_64-bsd-user' .endif PORTDOCS= .buildinfo _static/* about/* devel/* docs genindex.html \ index.html interop/* objects.inv search.html searchindex.js \ specs/* system/* tools/* user/* WITHOUT_CPU_CFLAGS=yes #to avoid problems with register allocation CFLAGS:= ${CFLAGS:C/-fno-tree-vrp//} CONFIGURE_ARGS+=--localstatedir=/var --extra-ldflags=-L/usr/lib \ --extra-ldflags=-L${LOCALBASE}/lib \ --prefix=${PREFIX} --cc=${CC} --disable-kvm \ --disable-linux-user --disable-linux-aio --disable-xen \ - --python=${PYTHON_CMD} \ + --python=${PYTHON_CMD} --mandir=${PREFIX}/man \ --extra-cflags=-I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"\"${PREFIX}\\\"\" .if ${FLAVOR:U} != tools CONFIGURE_ARGS+=--enable-netmap --enable-fdt=system .endif .if ${FLAVOR:U} == tools CONFIGURE_ARGS+=--disable-netmap --disable-system --disable-user \ --disable-nettle --disable-gcrypt --disable-curses \ --disable-vnc --disable-virtfs --disable-brlapi \ --disable-fdt --disable-rdma --disable-guest-agent \ --disable-cap-ng --disable-attr \ --disable-vhost-net --disable-spice \ --disable-rbd --disable-libnfs \ --disable-smartcard --disable-libusb \ --disable-lzo --disable-snappy \ --disable-bzip2 --disable-seccomp \ --disable-coroutine-pool --disable-glusterfs \ --disable-tpm --disable-numa \ --disable-blobs --enable-tools .endif .include .if (empty(FLAVOR) || ${FLAVOR:U} == default || ${FLAVOR:U} == nox11) && (${FLAVOR:U} != tools || ${PKGNAMESUFFIX} != "-guest-agent") .if ${ARCH} == "amd64" MAKE_ARGS+= ARCH=x86_64 .endif .if ${ARCH} == "powerpc" CFLAGS+= -D_CALL_SYSV MAKE_ARGS+= ARCH=ppc USE_GCC= yes .endif .if ${ARCH} == "powerpc64" MAKE_ARGS+= ARCH=ppc64 .endif .if ${ARCH} == "sparc64" CONFIGURE_ARGS+= --sparc_cpu=v9 .endif PLIST_SUB+= LINUXBOOT_DMA="" .endif post-patch-CDROM_DMA-off: @${REINPLACE_CMD} -e '/USE_DMA_CDROM/d' ${WRKSRC}/include/hw/ide/internal.h do-build: cd ${WRKSRC} && ${GMAKE} do-install: cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} ${GMAKE} 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 @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qemu-* .endif post-install-DOCS-on: @(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR}/) .endif .include diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo index c2e256758269..be4bf5295273 100644 --- a/emulators/qemu/distinfo +++ b/emulators/qemu/distinfo @@ -1,7 +1,3 @@ -TIMESTAMP = 1638663814 -SHA256 (qemu/6.1.0/qemu-6.1.0.tar.xz) = eebc089db3414bbeedf1e464beda0a7515aad30f73261abc246c9b27503a3c96 -SIZE (qemu/6.1.0/qemu-6.1.0.tar.xz) = 111258808 -SHA256 (qemu/6.1.0/55765822804f.patch) = 10c2cc93ad01b02d854e26a9e445ba22bb5434dda1ef25baeb979be6292fa8ef -SIZE (qemu/6.1.0/55765822804f.patch) = 2271 -SHA256 (qemu/6.1.0/aa4d30f6618d.patch) = eeddc5f5e08a460d2c133b4193d115fa1f00f206e0833f33ec66379981473efe -SIZE (qemu/6.1.0/aa4d30f6618d.patch) = 2211 +TIMESTAMP = 1639582833 +SHA256 (qemu/6.2.0/qemu-6.2.0.tar.xz) = 68e15d8e45ac56326e0b9a4afa8b49a3dfe8aba3488221d098c84698bca65b45 +SIZE (qemu/6.2.0/qemu-6.2.0.tar.xz) = 115667324 diff --git a/emulators/qemu/files/patch-configure b/emulators/qemu/files/patch-configure deleted file mode 100644 index 4e00150cb80e..000000000000 --- a/emulators/qemu/files/patch-configure +++ /dev/null @@ -1,21 +0,0 @@ ---- configure.orig 2021-08-24 17:35:40 UTC -+++ configure -@@ -1640,7 +1640,7 @@ if test "$mingw32" = "yes" ; then - else - bindir="${bindir:-$prefix/bin}" - fi --mandir="${mandir:-$prefix/share/man}" -+mandir="${mandir:-$prefix/man}" - datadir="${datadir:-$prefix/share}" - docdir="${docdir:-$prefix/share/doc}" - sysconfdir="${sysconfdir:-$prefix/etc}" -@@ -4612,6 +4612,9 @@ echo "CONFIG_TLS_PRIORITY=\"$tls_priority\"" >> $confi - # if this macro is set. - if test "$have_fsxattr" = "yes" ; then - echo "HAVE_FSXATTR=y" >> $config_host_mak -+fi -+if test "$have_ifaddrs_h" = "yes" ; then -+ echo "HAVE_IFADDRS_H=y" >> $config_host_mak - fi - if test "$xen" = "enabled" ; then - echo "CONFIG_XEN_BACKEND=y" >> $config_host_mak diff --git a/emulators/qemu/pkg-plist b/emulators/qemu/pkg-plist index d1492cc97c8a..badf1fd8c7d4 100644 --- a/emulators/qemu/pkg-plist +++ b/emulators/qemu/pkg-plist @@ -1,180 +1,181 @@ %%CURL%%bin/elf2dmp bin/qemu-edid bin/qemu-ga bin/qemu-i386 bin/qemu-img bin/qemu-io %%GTK3%%bin/qemu-keymap bin/qemu-nbd bin/qemu-storage-daemon %%NO_X86_TARGETS%%bin/qemu-system-aarch64 %%NO_X86_TARGETS%%bin/qemu-system-alpha %%NO_X86_TARGETS%%bin/qemu-system-avr %%NO_X86_TARGETS%%bin/qemu-system-arm %%NO_X86_TARGETS%%bin/qemu-system-cris %%NO_X86_TARGETS%%bin/qemu-system-hppa bin/qemu-system-i386 %%NO_X86_TARGETS%%bin/qemu-system-m68k %%NO_X86_TARGETS%%bin/qemu-system-microblaze %%NO_X86_TARGETS%%bin/qemu-system-microblazeel %%NO_X86_TARGETS%%bin/qemu-system-mips %%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 %%NO_X86_TARGETS%%bin/qemu-system-riscv32 %%NO_X86_TARGETS%%bin/qemu-system-riscv64 %%NO_X86_TARGETS%%bin/qemu-system-rx %%NO_X86_TARGETS%%bin/qemu-system-s390x %%NO_X86_TARGETS%%bin/qemu-system-sh4 %%NO_X86_TARGETS%%bin/qemu-system-sh4eb %%NO_X86_TARGETS%%bin/qemu-system-sparc %%NO_X86_TARGETS%%bin/qemu-system-sparc64 %%NO_X86_TARGETS%%bin/qemu-system-tricore bin/qemu-system-x86_64 %%NO_X86_TARGETS%%bin/qemu-system-xtensa %%NO_X86_TARGETS%%bin/qemu-system-xtensaeb bin/qemu-x86_64 include/qemu-plugin.h %%PORTDOCS%%man/man1/qemu.1.gz %%PORTDOCS%%man/man1/qemu-img.1.gz %%PORTDOCS%%man/man7/qemu-block-drivers.7.gz %%PORTDOCS%%man/man7/qemu-cpu-models.7.gz %%PORTDOCS%%man/man8/qemu-ga.8.gz %%PORTDOCS%%man/man7/qemu-ga-ref.7.gz %%PORTDOCS%%man/man8/qemu-nbd.8.gz %%PORTDOCS%%man/man8/qemu-pr-helper.8.gz %%PORTDOCS%%man/man7/qemu-qmp-ref.7.gz %%PORTDOCS%%man/man1/qemu-storage-daemon.1.gz %%PORTDOCS%%man/man7/qemu-storage-daemon-qmp-ref.7.gz @sample etc/qemu-ifup.sample @sample etc/qemu-ifdown.sample %%DATADIR%%/QEMU,tcx.bin %%DATADIR%%/QEMU,cgthree.bin %%DATADIR%%/bios-256k.bin %%DATADIR%%/bios-microvm.bin %%DATADIR%%/bios.bin %%DATADIR%%/canyonlands.dtb %%DATADIR%%/edk2-aarch64-code.fd %%DATADIR%%/edk2-arm-code.fd %%DATADIR%%/edk2-arm-vars.fd %%DATADIR%%/edk2-i386-code.fd %%DATADIR%%/edk2-i386-secure-code.fd %%DATADIR%%/edk2-i386-vars.fd %%DATADIR%%/edk2-licenses.txt %%DATADIR%%/edk2-x86_64-code.fd %%DATADIR%%/edk2-x86_64-secure-code.fd %%DATADIR%%/efi-e1000.rom %%DATADIR%%/efi-e1000e.rom %%DATADIR%%/efi-eepro100.rom %%DATADIR%%/efi-ne2k_pci.rom %%DATADIR%%/efi-pcnet.rom %%DATADIR%%/efi-rtl8139.rom %%DATADIR%%/efi-virtio.rom %%DATADIR%%/efi-vmxnet3.rom %%DATADIR%%/firmware/50-edk2-i386-secure.json %%DATADIR%%/firmware/50-edk2-x86_64-secure.json %%DATADIR%%/firmware/60-edk2-aarch64.json %%DATADIR%%/firmware/60-edk2-arm.json %%DATADIR%%/firmware/60-edk2-i386.json %%DATADIR%%/firmware/60-edk2-x86_64.json %%DATADIR%%/hppa-firmware.img %%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%%/linuxboot.bin %%LINUXBOOT_DMA%%%%DATADIR%%/linuxboot_dma.bin %%DATADIR%%/multiboot.bin +%%DATADIR%%/multiboot_dma.bin %%DATADIR%%/npcm7xx_bootrom.bin %%DATADIR%%/openbios-ppc %%DATADIR%%/openbios-sparc32 %%DATADIR%%/openbios-sparc64 %%DATADIR%%/opensbi-riscv32-generic-fw_dynamic.bin %%DATADIR%%/opensbi-riscv32-generic-fw_dynamic.elf %%DATADIR%%/opensbi-riscv64-generic-fw_dynamic.bin %%DATADIR%%/opensbi-riscv64-generic-fw_dynamic.elf %%DATADIR%%/palcode-clipper %%DATADIR%%/petalogix-ml605.dtb %%DATADIR%%/pxe-e1000.rom %%DATADIR%%/pxe-eepro100.rom %%DATADIR%%/pxe-ne2k_pci.rom %%DATADIR%%/pxe-rtl8139.rom %%DATADIR%%/pxe-pcnet.rom %%DATADIR%%/pxe-virtio.rom %%DATADIR%%/qboot.rom %%DATADIR%%/qemu-nsis.bmp %%DATADIR%%/qemu_vga.ndrv %%DATADIR%%/s390-ccw.img %%DATADIR%%/s390-netboot.img %%DATADIR%%/slof.bin %%DATADIR%%/u-boot-sam460-20100605.bin %%DATADIR%%/vgabios.bin %%DATADIR%%/vgabios-ati.bin %%DATADIR%%/vgabios-cirrus.bin %%DATADIR%%/vgabios-qxl.bin %%DATADIR%%/vgabios-stdvga.bin %%DATADIR%%/vgabios-virtio.bin %%DATADIR%%/vgabios-vmware.bin %%DATADIR%%/sgabios.bin %%DATADIR%%/skiboot.lid %%DATADIR%%/trace-events-all %%DATADIR%%/petalogix-s3adsp1800.dtb %%DATADIR%%/bamboo.dtb %%DATADIR%%/kvmvapic.bin %%DATADIR%%/u-boot.e500 %%DATADIR%%/pvh.bin %%DATADIR%%/vgabios-bochs-display.bin %%DATADIR%%/vgabios-ramfb.bin share/icons/hicolor/128x128/apps/qemu.png share/icons/hicolor/16x16/apps/qemu.png share/icons/hicolor/24x24/apps/qemu.png share/icons/hicolor/256x256/apps/qemu.png share/icons/hicolor/32x32/apps/qemu.bmp share/icons/hicolor/32x32/apps/qemu.png share/icons/hicolor/48x48/apps/qemu.png share/icons/hicolor/512x512/apps/qemu.png share/icons/hicolor/64x64/apps/qemu.png share/icons/hicolor/scalable/apps/qemu.svg share/applications/qemu.desktop %%GTK3%%share/locale/bg/LC_MESSAGES/qemu.mo %%GTK3%%share/locale/de_DE/LC_MESSAGES/qemu.mo %%GTK3%%share/locale/fr_FR/LC_MESSAGES/qemu.mo %%GTK3%%share/locale/hu/LC_MESSAGES/qemu.mo %%GTK3%%share/locale/it/LC_MESSAGES/qemu.mo %%GTK3%%share/locale/sv/LC_MESSAGES/qemu.mo %%GTK3%%share/locale/tr/LC_MESSAGES/qemu.mo %%GTK3%%share/locale/zh_CN/LC_MESSAGES/qemu.mo