From nobody Mon Dec 06 01:03:20 2021 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 1A40E18C8E79; Mon, 6 Dec 2021 01:03:24 +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 4J6lY53hPPz4jKK; Mon, 6 Dec 2021 01:03:21 +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 AB5CA221EC; Mon, 6 Dec 2021 01:03:20 +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 1B613KEs039035; Mon, 6 Dec 2021 01:03:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B613KRo039034; Mon, 6 Dec 2021 01:03:20 GMT (envelope-from git) Date: Mon, 6 Dec 2021 01:03:20 GMT Message-Id: <202112060103.1B613KRo039034@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: 5ab52ebb4b13 - main - emulators/qemu42: UNBREAK for 13.X and later 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: 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: 5ab52ebb4b13d1b1fb3b1845211ce29cf75370fc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638752601; 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=03CteOgttM+oChOs2g5gY9ECiJg7t/jy3LsKh6eE17M=; b=PDo0kAywy1RqWw0xkDFFTvfLyQWRBMfxWn0kBaj26AdC+ix+aM/Q6N0OscWRRaBgJZ66NZ CFWPkUS97Zfcm1aFfqpdz3HXF/dOdqgN+/GAYsPaay0zIxPh7lhoKyHboE6bZN7aLxaHIF YfPfC52XHbV2RhOEsgWt+/JYWCMXkzx6pEfm2u8x6F4rBy1BlCW9BzsHd6CVMV02qu2ijO nuuVJT1JUROMRAbqmihvhosBDhJd7ckkL5l3aWd2jRxUXsrCJKtX+zLabgZ/7kjpNRCIR6 BHENQdSWzat2IEEABsYeNAoRF//xIsW7DexGyYuJvyMxs61iNkEp/JsW2U6QDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638752601; a=rsa-sha256; cv=none; b=T3Zvrfc894dXStliggzINvobPrnr6JCrDx7CjSISoa6I0LvVX++s/BnPzQwo6QkxHEf06/ 3/YLiCxZZ8rLuOF53Q+12P9bF362nMEyU+pGWHjLRQTnRbzg36mEZaG4klgkb5zD4Fcgoe LLDj7vyxbw9A2iEmCRwdk5mqBoYIq8uPoVH6kXYzwV3qCx5np5jwhBipSvZupoqvWozdVc wEEgkNstUE1FXJIFcbK+79ZTE6OFLg0xkGhQhg2FhYmE7J0ygbYoOE6H9Po1ZIvd01pYVG 2jC9eoDFHBsN6URDRkJHOQsO5ThiEL6YxGrHreTszDO8S4cqpDdB8yM049sg5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=5ab52ebb4b13d1b1fb3b1845211ce29cf75370fc commit 5ab52ebb4b13d1b1fb3b1845211ce29cf75370fc Author: Muhammad Moinur Rahman AuthorDate: 2021-12-05 23:55:52 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2021-12-06 01:02:48 +0000 emulators/qemu42: 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/qemu42/Makefile | 20 +++++++++++++++----- emulators/qemu42/pkg-descr | 15 ++++++--------- emulators/qemu42/pkg-plist | 2 ++ 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/emulators/qemu42/Makefile b/emulators/qemu42/Makefile index 1025807cb91f..115a7f874528 100644 --- a/emulators/qemu42/Makefile +++ b/emulators/qemu42/Makefile @@ -13,13 +13,16 @@ COMMENT?= QEMU CPU Emulator - 4.2.X branch LICENSE= GPLv2 +DEPRECATED= Use emulators/qemu or emulators/qemu-devel +EXPIRATION_DATE=2022-01-10 + BUILD_DEPENDS= sphinx-build:textproc/py-sphinx@${PY_FLAVOR} -LIB_DEPENDS?= libnettle.so:security/nettle \ +LIB_DEPENDS?= libepoxy.so:graphics/libepoxy \ + libfdt.so:sysutils/dtc \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ - libepoxy.so:graphics/libepoxy \ - libpcre2-8.so:devel/pcre2 \ - libfdt.so:sysutils/dtc + libnettle.so:security/nettle \ + libpcre2-8.so:devel/pcre2 .if !defined(PKGNAMESUFFIX) || (${PKGNAMESUFFIX} != "-utils" && ${PKGNAMESUFFIX} != "-guest-agent") ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64 powerpc64le @@ -106,7 +109,8 @@ X11_CONFIGURE_ENABLE= sdl X11_USE= SDL=sdl2 XORG=x11,xext GNOME=gdkpixbuf2 X11_USES= sdl .if !defined(PKGNAMESUFFIX) || (${PKGNAMESUFFIX} != "-utils" && ${PKGNAMESUFFIX} != "-guest-agent") -X86_TARGETS_USE_OFF= XORG=pixman,x11 +X86_TARGETS_LIB_DEPENDS_OFF= libharfbuzz.so:print/harfbuzz +X86_TARGETS_USE_OFF= GL=gbm XORG=pixman,x11 X86_TARGETS_USES_OFF= xorg .endif @@ -145,6 +149,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/qemu42/pkg-descr b/emulators/qemu42/pkg-descr index 018952f53cf1..481ae9c87617 100644 --- a/emulators/qemu42/pkg-descr +++ b/emulators/qemu42/pkg-descr @@ -3,17 +3,14 @@ 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. + (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. + 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/qemu42/pkg-plist b/emulators/qemu42/pkg-plist index a49ffde6a5c3..0e11034d6c6e 100644 --- a/emulators/qemu42/pkg-plist +++ b/emulators/qemu42/pkg-plist @@ -1,4 +1,6 @@ bin/elf2dmp +%%IVSHMEM%%bin/ivshmem-client +%%IVSHMEM%%bin/ivshmem-server bin/qemu-edid bin/qemu-ga bin/qemu-i386