Date: Mon, 6 Dec 2021 01:03:20 GMT From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 5ab52ebb4b13 - main - emulators/qemu42: UNBREAK for 13.X and later Message-ID: <202112060103.1B613KRo039034@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=5ab52ebb4b13d1b1fb3b1845211ce29cf75370fc commit 5ab52ebb4b13d1b1fb3b1845211ce29cf75370fc Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2021-12-05 23:55:52 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202112060103.1B613KRo039034>