From nobody Thu Jan 20 10:31:22 2022 X-Original-To: dev-commits-ports-all@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 A860619717FE; Thu, 20 Jan 2022 10:31:23 +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 4Jff1l0gmpz4ggM; Thu, 20 Jan 2022 10:31:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642674683; 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=wiwSwdImcCo/+ij6ylKsl9VfzAqBbz7MQBqPDAPvRJc=; b=VzJEuEEPKn8oKcFrME5i7PTqxRIRMjmZSVR8m/9Y0vschv628Fh4eAph2eOWU5PoBSjzpN TK1sCl94PLVwz0mBel4jCIMwSBOvRcZzb7lpr+bItrauxB42pdg1Wq7sLs2LpFzIUM7SDV h2SjuvLR1vw6ZFLaNpJgMn6C0bM74iNRua5we084pTpYfiE8Tuwb+DPAbQ34qoIqFL7GLH 3dhaTZl4EmfjgfkCOKbpuHzjTgqiEFjAqDOIVwecCAZw6ccVvE8OqAkyGWcYSwa4NNqZt9 LMTIJPhuoWclImUWhHpIhFDUMzhHYpK/6R51CDefSKYYJUa9MI/rTnFYNSGFnA== 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 CD30526C05; Thu, 20 Jan 2022 10:31:22 +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 20KAVMuL031218; Thu, 20 Jan 2022 10:31:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20KAVMEQ031217; Thu, 20 Jan 2022 10:31:22 GMT (envelope-from git) Date: Thu, 20 Jan 2022 10:31:22 GMT Message-Id: <202201201031.20KAVMEQ031217@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 94aaffddb591 - main - emulators/yuzu: split qt5-webengine from QT5 option List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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/main X-Git-Reftype: branch X-Git-Commit: 94aaffddb5919a1705eea21f3bc825b111f931ca Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642674683; 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=wiwSwdImcCo/+ij6ylKsl9VfzAqBbz7MQBqPDAPvRJc=; b=WZMuXH8olN5E64W7Ajjw8WAqn4dsQOhE+Nx/zotgN5JDEr6aCKYLDCT0Z49hg/Db/QLFMF gdSwRl6MT1wHTp4boLbVIkwtMkYdCVCjFkx/EBJ8y26m2JO3Bn9mOaJ6BOQFaxs+fjHz+t Yup3UC9vBTFMGF4Gna+ojf/8GZ3JhVEVjoOuukR3ooPCJdHigW0EdDpc2HrbHOImfk6TYN GkqQwY8AOf7dbkzgQ0u1XrCftNLEbdJU4K9nSn+Gq3d034ZhpLlbDlpn6e4Hz0DMSJo6wV e1ZpRw31E44PsBFfQfklGRt3w/f1oavx1L1jiEF4S//mIXYs9snhZ9YLE1uq4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642674683; a=rsa-sha256; cv=none; b=cYImIf5CiAnAq71i1gAASGWqNMHlRfQIx5KePfLdcD1xV+KUJK7M4e6JDZGeGKIT2GJ66w 43Ei/qBJrTTTv0v+9wbjwvaq4y16xlQvyeVtOlwQUAl+plpCbJhJEqLaDz3wwvYEBGyqUU ysat1tX1um5mOfCFSLHe36hZusGl63YlMenemBySF0AUxnogs79nyQAPin0IL0iFJ7E+WL AnO9Y8NWj+9uP8wmeU/rKmA5N+vYnQ+3dyq7WKqpYlldGJMWsKHn4UKk74r0z9ojgb5FkV w0l36/zARIIJopNis7MMh7jVo1TtkqhZ0yd1sB+iLnQbFcx53kHcvlFzIVygWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=94aaffddb5919a1705eea21f3bc825b111f931ca commit 94aaffddb5919a1705eea21f3bc825b111f931ca Author: Jan Beich AuthorDate: 2022-01-20 09:30:25 +0000 Commit: Jan Beich CommitDate: 2022-01-20 10:26:34 +0000 emulators/yuzu: split qt5-webengine from QT5 option --- 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' \