From nobody Sat Jan 22 00:59:51 2022 X-Original-To: dev-commits-ports-branches@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 45750197D216; Sat, 22 Jan 2022 00:59: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 4JgdFN3Ftdz3tpy; Sat, 22 Jan 2022 00:59:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642813192; 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=Pryimvnaji+7hJX+DQ+J07zS7dcm1hcbsm2QRegSy8Y=; b=UmBIatMg3TYs1vulBBooYuUGwaVmQ//d4q6XgC+hdjG9gs0hRYpybTyVUNZ0WBH+GoQm0F 9Z62CfVYMF/zNY3cT6hXLB4QM6JA4C1BLewFmk/hyKVQQg0FbT95f2I/V0Ke3gi3ciEi0o 6+m3ab5Tz+n3GiuKboPKpi3yRsYUk/NSQoh9Ysx5ZJ3TlnMBhNLuU4kd1EIIPLKqUhZtCD c4rHFCRpIVrU/LrWPLeFIIhwrU+48ZNJeeNK6gUrIr6UxU3cNam5M8jK5m3ZPIJ4zirWQt ckme3d2s0YON6zK0Wl5J/fOxeKa2Pt3ZTnrMp1oMl7JXNLPKu/Jj1zYgdcS0vw== 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 E51EC25B41; Sat, 22 Jan 2022 00:59:51 +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 20M0xp0m004956; Sat, 22 Jan 2022 00:59:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20M0xpUV004955; Sat, 22 Jan 2022 00:59:51 GMT (envelope-from git) Date: Sat, 22 Jan 2022 00:59:51 GMT Message-Id: <202201220059.20M0xpUV004955@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: e5276b41afc0 - 2022Q1 - emulators/yuzu: split qt5-webengine from QT5 option List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q1 X-Git-Reftype: branch X-Git-Commit: e5276b41afc0e83679a8376dc3fbbca61c346968 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642813192; 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=Pryimvnaji+7hJX+DQ+J07zS7dcm1hcbsm2QRegSy8Y=; b=F6qFTNNFwMb7sf5EG0PAH7GC7b4P2y4ydENxlrOk9E16RcsloGzKBn3NGsd2Xe/Uap+hB/ gcJe6Wek8lVY9Dmec+NagV/6sxrC+37ib9BoCAeEiXCa6c45WbUSg9Ylf10/k1rkfVs/mc FpgMu+ZT9L5Z1PSssb8pbrsoYC8eMa2bS52na+5qQGWhZ9/8k/2Ub4Q7XCmcYupF/ftXns mRbTjMwcJzce9FPrEgZEKcFlCIV4lTD6YDy8D1G9jalrYyx6AYJ6Hvc8Oc4oDn9kx0b8CE 86BU5RvXXABWLLyx7LEbd4FL/YnRZW55TyXIOn0EpAaKvQNgW5wq87fJjLlp5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642813192; a=rsa-sha256; cv=none; b=DJA84aKqZh8gWI4a30oy7ev/snH4qjLEuYzli/iVzf4fcZ78gZgdsH59/lXf33q19iZBG6 FWJsYSsTLQzBZMEKPSyTvXPtKeXCR+JYRWGXCRhUgYiWAkFblTJowzyJJu+JKOHBK0TFIx RZ77YWIkHyvL6KJJO57/qFpHve21MLNaO9VpWOrfz/j49bQh0ooNrG+z3NTc6H1DTL3kGR fKvWhJpiCylHyvJm/OM7H/t8wm/EF7fRFKO68ImYDLR7MtMf8u5fokFNqiDhj4veVhgHHx DNmVyMuFdTQHPXYf4nenpHJKKOpE90jxhyN9ExlzUwX8C2sT9nPHXJy/4AGA+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=e5276b41afc0e83679a8376dc3fbbca61c346968 commit e5276b41afc0e83679a8376dc3fbbca61c346968 Author: Jan Beich AuthorDate: 2022-01-20 09:30:25 +0000 Commit: Jan Beich CommitDate: 2022-01-22 00:59:42 +0000 emulators/yuzu: split qt5-webengine from QT5 option (cherry picked from commit 94aaffddb5919a1705eea21f3bc825b111f931ca) --- emulators/yuzu/Makefile | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/emulators/yuzu/Makefile b/emulators/yuzu/Makefile index fbadc6782e93..38c777655347 100644 --- a/emulators/yuzu/Makefile +++ b/emulators/yuzu/Makefile @@ -69,8 +69,8 @@ LDFLAGS+= -static-libstdc++ # avoid libc++ conflict, requires files/patch-fmt LDFLAGS+= -Wl,--as-needed # Qt5Network PLIST_FILES= bin/${PORTNAME}-cmd -OPTIONS_DEFINE= ALSA PULSEAUDIO JACK QT5 SNDIO VAAPI VULKAN -OPTIONS_DEFAULT=PULSEAUDIO JACK QT5 SNDIO VAAPI VULKAN +OPTIONS_DEFINE= ALSA PULSEAUDIO JACK QT5 SNDIO VAAPI VULKAN WEBENGINE +OPTIONS_DEFAULT=PULSEAUDIO JACK QT5 SNDIO VAAPI VULKAN WEBENGINE ALSA_BUILD_DEPENDS= alsa-lib>0:audio/alsa-lib ALSA_CMAKE_BOOL= USE_ALSA @@ -82,8 +82,8 @@ PULSEAUDIO_BUILD_DEPENDS=pulseaudio>0:audio/pulseaudio PULSEAUDIO_CMAKE_BOOL= USE_PULSE QT5_USES= desktop-file-utils qt:5 shared-mime-info -QT5_USE= QT=qmake_build,buildtools_build,linguisttools_build,concurrent_build,core,gui,webengine,widgets -QT5_CMAKE_BOOL= ENABLE_QT ENABLE_QT_TRANSLATION YUZU_USE_QT_WEB_ENGINE +QT5_USE= QT=qmake_build,buildtools_build,linguisttools_build,concurrent_build,core,gui,widgets +QT5_CMAKE_BOOL= ENABLE_QT ENABLE_QT_TRANSLATION QT5_PLIST_FILES= bin/${PORTNAME} \ share/applications/${PORTNAME}.desktop \ share/icons/hicolor/scalable/apps/${PORTNAME}.svg \ @@ -97,11 +97,10 @@ VAAPI_LIB_DEPENDS= libva.so:multimedia/libva VULKAN_DESC= Vulkan renderer VULKAN_RUN_DEPENDS= ${LOCALBASE}/lib/libvulkan.so:graphics/vulkan-loader -.if !exists(${.CURDIR:H:H}/www/qt5-webengine) -# Temporarily disable web applet if qt5-webengine is missing -QT5_USE:= ${QT5_USE:S/,webengine//} -QT5_CMAKE_BOOL:= ${QT5_CMAKE_BOOL:N*WEB_ENGINE} -.endif +WEBENGINE_DESC= Web applet support (implies QT5) +WEBENGINE_USE= QT=webengine +WEBENGINE_CMAKE_BOOL= YUZU_USE_QT_WEB_ENGINE +WEBENGINE_IMPLIES= QT5 post-patch: @${REINPLACE_CMD} -e '/check_submodules_present()/d' \