From owner-dev-commits-ports-all@freebsd.org Fri Oct 1 21:08:53 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 861F36B5D71; Fri, 1 Oct 2021 21:08:53 +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 4HLjQY3C7jz3J47; Fri, 1 Oct 2021 21:08:53 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 4DC7A265F5; Fri, 1 Oct 2021 21:08:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 191L8r1Q038538; Fri, 1 Oct 2021 21:08:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 191L8r87038537; Fri, 1 Oct 2021 21:08:53 GMT (envelope-from git) Date: Fri, 1 Oct 2021 21:08:53 GMT Message-Id: <202110012108.191L8r87038537@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: 1a54adbdb84d - main - emulators/qemu31: UNBREAK for 13.X and later 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: 1a54adbdb84db5f9bac9f561fa0e86b7c2eb6235 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Oct 2021 21:08:53 -0000 The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=1a54adbdb84db5f9bac9f561fa0e86b7c2eb6235 commit 1a54adbdb84db5f9bac9f561fa0e86b7c2eb6235 Author: Muhammad Moinur Rahman AuthorDate: 2021-10-01 21:05:39 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2021-10-01 21:07:50 +0000 emulators/qemu31: UNBREAK for 13.X and later - Mark DEPRECATED as there are more recent versions in the tree - Update pkg-descr as https://oszoo.org no longer hosts qemu images and is totally an irrelevent site - Do some housekeeping to remove stage-qa errors --- emulators/qemu31/Makefile | 29 +++++++++++++++++++---------- emulators/qemu31/pkg-descr | 22 +++++++++------------- emulators/qemu31/pkg-plist | 2 ++ 3 files changed, 30 insertions(+), 23 deletions(-) diff --git a/emulators/qemu31/Makefile b/emulators/qemu31/Makefile index 11a84b824980..ef173179cf8f 100644 --- a/emulators/qemu31/Makefile +++ b/emulators/qemu31/Makefile @@ -14,13 +14,16 @@ COMMENT?= QEMU CPU Emulator - 3.1.X version LICENSE= GPLv2 BROKEN_aarch64= fails to build: accel/tcg/user-exec.c:486:36: error: no member named 'pc' in 'struct __mcontext' +DEPRECATED= Use emulators/qemu or emulators/qemu-devel +EXPIRATION_DATE=2021-11-01 -LIB_DEPENDS?= libnettle.so:security/nettle \ - libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 +LIB_DEPENDS?= libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 \ + libnettle.so:security/nettle USES?= compiler:c11 cpe gmake gnome pkgconfig bison perl5 \ python:build tar:xz +USE_GNOME+= libxml2 USE_PERL5= build PORTSCOUT= limit:^3\.1\. @@ -42,7 +45,7 @@ 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 -OPTIONS_DEFAULT=X11 GTK3 OPENGL GNUTLS SASL JPEG PNG CDROM_DMA CURL PCAP NCURSES VDE +OPTIONS_DEFAULT=X11 OPENGL GNUTLS SASL JPEG PNG CDROM_DMA CURL PCAP NCURSES VDE OPTIONS_SUB= yes CURL_CONFIGURE_OFF= --disable-curl CURL_LIB_DEPENDS= libcurl.so:ftp/curl @@ -52,11 +55,11 @@ DOCS_USES= makeinfo 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 \ - libepoxy.so:graphics/libepoxy \ - libpcre2-8.so:devel/pcre2 +GTK3_LIB_DEPENDS= libepoxy.so:graphics/libepoxy \ + libpcre2-8.so:devel/pcre2 \ + libxkbcommon.so:x11/libxkbcommon GTK3_USE= GNOME=gtk30,vte3,gdkpixbuf2 XORG=x11,xext GL=gbm -GTK3_USES= gettext gl gnome xorg +GTK3_USES= gettext gl xorg JPEG_CONFIGURE_OFF= --disable-vnc-jpeg JPEG_USES= jpeg NCURSES_USES= ncurses:base @@ -84,8 +87,8 @@ X11_CONFIGURE_ENABLE= sdl X11_USE= SDL=sdl2 XORG=x11,xext X11_USES= sdl xorg .if !defined(PKGNAMESUFFIX) || ${PKGNAMESUFFIX} != "-utils" -X86_TARGETS_USE_OFF= GNOME=cairo,gdkpixbuf2 -X86_TARGETS_USES_OFF= gnome +X86_TARGETS_USE_OFF= GNOME=cairo,gdkpixbuf2 XORG=pixman +X86_TARGETS_USES_OFF= gnome xorg .endif PORTDOCS?= docs qemu-doc.html qemu-doc.txt qemu-ga-ref.html qemu-ga-ref.txt \ @@ -123,6 +126,12 @@ MAKE_ARGS+= ARCH=ppc64 CONFIGURE_ARGS+= --sparc_cpu=v9 .endif +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1300000 +PLIST_SUB+= IVSHMEM="" +.else +PLIST_SUB+= IVSHMEM="@comment " +.endif + PLIST_SUB+= LINUXBOOT_DMA="" post-patch-CDROM_DMA-off: diff --git a/emulators/qemu31/pkg-descr b/emulators/qemu31/pkg-descr index 018952f53cf1..c43a6a43c80f 100644 --- a/emulators/qemu31/pkg-descr +++ b/emulators/qemu31/pkg-descr @@ -1,19 +1,15 @@ -QEMU is a FAST! processor emulator using dynamic translation to achieve -good emulation speed. +QEMU is a FAST! processor emulator using dynamic translation to achieve good +emulation speed. QEMU has two operating modes: - * Full system emulation. In this mode, QEMU emulates a full system -(for example a PC), including a processor and various peripherials. -It can be used to launch different Operating Systems without rebooting -the PC or to debug system code. - * User mode emulation (Linux host only). In this mode, QEMU can launch -Linux processes compiled for one CPU on another CPU. It can be used to -launch the Wine Windows API emulator or to ease cross-compilation and -cross-debugging. + * Full system emulation. In this mode, QEMU emulates a full system (for + example a PC), including a processor and various peripherials. It can be + used to launch different Operating Systems without rebooting the PC or to + debug system code. + * User mode emulation (Linux host only). In this mode, QEMU can launch Linux + processes compiled for one CPU on another CPU. It can be used to launch the + Wine Windows API emulator or to ease cross-compilation and cross-debugging. As QEMU requires no host kernel patches to run, it is very safe and easy to use. -See also the preconfigured system images on http://oszoo.org/ -Many live cd isos also work. - WWW: http://wiki.qemu.org/Main_Page diff --git a/emulators/qemu31/pkg-plist b/emulators/qemu31/pkg-plist index 87b2236d079e..4ee1d3075e11 100644 --- a/emulators/qemu31/pkg-plist +++ b/emulators/qemu31/pkg-plist @@ -1,3 +1,5 @@ +%%IVSHMEM%%bin/ivshmem-client +%%IVSHMEM%%bin/ivshmem-server bin/qemu-edid bin/qemu-ga bin/qemu-i386