From nobody Sat Dec 17 20:43:54 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 4NZHxk3HNNz1G5Mf; Sat, 17 Dec 2022 20:43:54 +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 4NZHxk2rSlz4MFJ; Sat, 17 Dec 2022 20:43:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671309834; 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=SrgarNdjtqF/xjJZIJkfVPfmVBGOyKZzlr0SY7wiwmw=; b=WWjbBDNDEcKG9beBhSf/b3P8jEViEONjUuIbIBEwfOMJfWFalw3h5gR1UajSN57QDYSJCU 3afkQGNpXDrvmG0wshi1aBJ54sM1uFPA6lMS6UR/zzEfGRBqFRznzyd2Tzu+LxoWVlr+w6 N3NT77Y+LIBZ1UU95Tm94g+/fY6HcwBu7nzUZLjDZz4ATkZfxTo6RUcfqkJmM6ktJdmD2b V5lW/VOV+e5AXrEgWlNzQjR4IZ05QZsy8KqhKql9bYHZoQUntVSqsiKHn+cpD9jgThE9IH vjh5XJghCO1NzkUo1p+ZCbqEnfyIE54JY670QrHwcrYE6HY91BuN1AfIZswQeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671309834; 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=SrgarNdjtqF/xjJZIJkfVPfmVBGOyKZzlr0SY7wiwmw=; b=oUPlZ7GNDMBUlB4K1jVt2ft3T3LmWG1P9u8QpCB0wSR4ptGnaz2KwZlkkSF0hAR+Fe7i/c fRn/TGpc1Zc4AFgIAnApOHyLNHoYH1P8d1STDC7Sco+JTuK3+tRy9FPd55XxTaig3vuNEX NzGQihyxNzl3co946F8wdG2sT1ht1b/kOctlHrgZxlQIJFOyu7/b/mXgxWKel/WB7IXv+9 mMycpMq7rh3UqqnP5rS0AkLLMqkJmxOoSiu6oOHpgA62KqeHqE9TzO5zdtXG4kCSC1whUc 2jYSi1BpAkw1uK1my5lakjt+5QjP19rsScw8uT3vTE/EGFLcf2ng/qy+FPs96g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671309834; a=rsa-sha256; cv=none; b=fqVlTZrNdgg2GoAwaYuHvTCqSqGjwbvc274O6KnIF3M+m1nR/qRBKok1bUOO3ia6/IKkmp jf97l4EcEINj8OqrE1i7rjRIhMRy1bQFfnnNNNuhT808ajMHeh6VMWHd5JChPTRBjaF8FS GDMtmSE6rvwF0rsOMZ5wYbvGUc2jyO1mrcRtPG+86vJcgf9uliiWaZvUqUdoM5B4m9Mr9w iqzhdymM+nbuNW9lhGYycm9UO3EpgNWcoxrYUHy4dwQJm5IF2g8wOOAL7gG4ywubtNmsJ7 PC1xtEP/E0Xl8qZFObVdizSoOOFmmYpB0KArj+fEZhL9HviFxygxgDtp4gxEwg== 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 4NZHxk1xhDz15TB; Sat, 17 Dec 2022 20:43:54 +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 2BHKhsoQ000456; Sat, 17 Dec 2022 20:43:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BHKhsJK000455; Sat, 17 Dec 2022 20:43:54 GMT (envelope-from git) Date: Sat, 17 Dec 2022 20:43:54 GMT Message-Id: <202212172043.2BHKhsJK000455@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: 03a2c8684d38 - main - emulators/yuzu: expose Qt6 via option + flavor after aad90e4cbb77 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: 03a2c8684d388547205c47254cefd9ed9daa5152 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=03a2c8684d388547205c47254cefd9ed9daa5152 commit 03a2c8684d388547205c47254cefd9ed9daa5152 Author: Jan Beich AuthorDate: 2022-12-05 10:54:40 +0000 Commit: Jan Beich CommitDate: 2022-12-17 20:42:06 +0000 emulators/yuzu: expose Qt6 via option + flavor after aad90e4cbb77 https://github.com/yuzu-emu/yuzu/commit/a75542ad2dd0 --- emulators/yuzu/Makefile | 51 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 38 insertions(+), 13 deletions(-) diff --git a/emulators/yuzu/Makefile b/emulators/yuzu/Makefile index 9e4f9f5ea9cb..69630887c369 100644 --- a/emulators/yuzu/Makefile +++ b/emulators/yuzu/Makefile @@ -42,6 +42,13 @@ LIB_DEPENDS= liblz4.so:archivers/liblz4 \ libenet.so:net/enet TEST_DEPENDS= catch>0:devel/catch +FLAVORS= qt5 qt6 +qt5_CONFLICTS_INSTALL= ${PORTNAME}-qt6 +qt6_PKGNAMESUFFIX= -qt6 +qt6_CONFLICTS_INSTALL= ${PORTNAME} +qt6_OPTIONS_SLAVE= QT6 +qt6_OPTIONS_EXCLUDE= QT5 + USE_GITHUB= yes GH_ACCOUNT= yuzu-emu GH_TAGNAME= bbb202cee @@ -68,31 +75,49 @@ ELF_FEATURES= ${PLIST_FILES:Mbin/*:S/^/+wxneeded:/} PLIST_FILES= bin/${PORTNAME}-cmd \ bin/${PORTNAME}-room -OPTIONS_DEFINE= ALSA PULSEAUDIO JACK NLS QT5 SNDIO VAAPI VULKAN WEBENGINE +OPTIONS_DEFINE= ALSA GUI PULSEAUDIO JACK NLS SNDIO VAAPI VULKAN WEBENGINE OPTIONS_DEFAULT=PULSEAUDIO JACK QT5 SNDIO VAAPI VULKAN WEBENGINE +OPTIONS_SINGLE= GUI +OPTIONS_SINGLE_GUI= QT5 QT6 +OPTIONS_SLAVE= ${${FLAVOR}_OPTIONS_SLAVE} +OPTIONS_EXCLUDE= ${${FLAVOR}_OPTIONS_EXCLUDE} ALSA_BUILD_DEPENDS= alsa-lib>0:audio/alsa-lib ALSA_CMAKE_BOOL= USE_ALSA +GUI_USES= desktop-file-utils shared-mime-info +GUI_CMAKE_BOOL= ENABLE_QT +GUI_PLIST_FILES= bin/${PORTNAME} \ + share/applications/org.yuzu_emu.yuzu.desktop \ + share/icons/hicolor/scalable/apps/org.yuzu_emu.yuzu.svg \ + share/metainfo/org.yuzu_emu.yuzu.metainfo.xml \ + share/mime/packages/org.yuzu_emu.yuzu.xml + JACK_BUILD_DEPENDS= jackit>0:audio/jack JACK_CMAKE_BOOL= USE_JACK -NLS_DESC= UI translations (implies QT5) -NLS_USE= QT=linguisttools:build +NLS_DESC= UI translations (implies ${NLS_IMPLIES}) +NLS_USE= QT=${"${PORT_OPTIONS:MQT5}":?linguist:}tools:build NLS_CMAKE_BOOL= ENABLE_QT_TRANSLATION -NLS_IMPLIES= QT5 +NLS_IMPLIES= GUI PULSEAUDIO_BUILD_DEPENDS=pulseaudio>0:audio/pulseaudio PULSEAUDIO_CMAKE_BOOL= USE_PULSE -QT5_USES= desktop-file-utils qt:5 shared-mime-info +QT5_USES= qt:5 QT5_USE= QT=qmake:build,buildtools:build,concurrent:build,core,dbus,gui,multimedia,widgets -QT5_CMAKE_BOOL= ENABLE_QT -QT5_PLIST_FILES= bin/${PORTNAME} \ - share/applications/org.yuzu_emu.yuzu.desktop \ - share/icons/hicolor/scalable/apps/org.yuzu_emu.yuzu.svg \ - share/metainfo/org.yuzu_emu.yuzu.metainfo.xml \ - share/mime/packages/org.yuzu_emu.yuzu.xml +QT5_IMPLIES= GUI + +QT6_USES= qt:6 +QT6_USE= QT=base +QT6_CMAKE_BOOL= ENABLE_QT6 +QT6_IMPLIES= GUI +.if !exists(${.CURDIR:H:H}/www/qt6-webengine) +qt6_OPTIONS_EXCLUDE+= WEBENGINE +QT6_PREVENTS= WEBENGINE +QT6_PREVENTS_MSG= www/qt6-webengine is missing +QT6_VARS+= WEBENGINE_USE= # Silence "unknown USE_QT component" +.endif SNDIO_BUILD_DEPENDS= sndio>0:audio/sndio SNDIO_CMAKE_BOOL= USE_SNDIO @@ -102,10 +127,10 @@ VAAPI_LIB_DEPENDS= libva.so:multimedia/libva VULKAN_DESC= Vulkan renderer VULKAN_RUN_DEPENDS= ${LOCALBASE}/lib/libvulkan.so:graphics/vulkan-loader -WEBENGINE_DESC= Web applet support (implies QT5) +WEBENGINE_DESC= Web applet support (implies ${NLS_IMPLIES}) WEBENGINE_USE= QT=webengine WEBENGINE_CMAKE_BOOL= YUZU_USE_QT_WEB_ENGINE -WEBENGINE_IMPLIES= QT5 +WEBENGINE_IMPLIES= GUI post-extract: @${CP} ${DISTFILES:M*\:gamedb:C/\:.*//:S,^,${_DISTDIR},} \