From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 70690158004 for ; Thu, 17 Aug 2023 20:59:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7DE692BC017; Thu, 17 Aug 2023 20:59:03 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5E62B2BC01C for ; Thu, 17 Aug 2023 20:59:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 29B1E33BE41 for ; Thu, 17 Aug 2023 20:59:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 966C0FCC for ; Thu, 17 Aug 2023 20:59:00 +0000 (UTC) From: "Haelwenn Monnier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Haelwenn Monnier" Message-ID: <1692305931.a4727bcf53bb4d44a4bbe64d127ad6ab6f258f86.lanodan@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/duckstation/ X-VCS-Repository: repo/proj/guru X-VCS-Files: games-emulation/duckstation/duckstation-9999.ebuild games-emulation/duckstation/metadata.xml X-VCS-Directories: games-emulation/duckstation/ X-VCS-Committer: lanodan X-VCS-Committer-Name: Haelwenn Monnier X-VCS-Revision: a4727bcf53bb4d44a4bbe64d127ad6ab6f258f86 X-VCS-Branch: dev Date: Thu, 17 Aug 2023 20:59:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c0697a34-df22-4003-8d5f-7e36f377ee6e X-Archives-Hash: c722495161c84a125a68e7c29655cb73 commit: a4727bcf53bb4d44a4bbe64d127ad6ab6f258f86 Author: Haelwenn (lanodan) Monnier hacktivis me> AuthorDate: Thu Aug 17 20:37:53 2023 +0000 Commit: Haelwenn Monnier hacktivis me> CommitDate: Thu Aug 17 20:58:51 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a4727bcf games-emulation/duckstation: qt5 to qt6 migration, dbus flag, cubeb dep Closes: https://bugs.gentoo.org/883721 Signed-off-by: Haelwenn (lanodan) Monnier hacktivis.me> .../duckstation/duckstation-9999.ebuild | 23 ++++++++++++---------- games-emulation/duckstation/metadata.xml | 2 +- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/games-emulation/duckstation/duckstation-9999.ebuild b/games-emulation/duckstation/duckstation-9999.ebuild index 355e99caa9..21c10a0bdb 100644 --- a/games-emulation/duckstation/duckstation-9999.ebuild +++ b/games-emulation/duckstation/duckstation-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ EGIT_SUBMODULES=() LICENSE="GPL-3" SLOT="0" -IUSE="discord +egl +evdev fbdev +gamepad gbm +nogui qt5 retroachievements wayland X" +IUSE="+dbus discord +egl +evdev fbdev +gamepad gbm +nogui qt6 retroachievements wayland X" # Either or both frontends must be built REQUIRED_USE=" @@ -27,13 +27,14 @@ BDEPEND=" wayland? ( kde-frameworks/extra-cmake-modules ) " DEPEND=" + media-libs/cubeb evdev? ( dev-libs/libevdev ) + dbus? ( sys-apps/dbus ) gamepad? ( media-libs/libsdl2 ) gbm? ( x11-libs/libdrm ) - qt5? ( - dev-qt/qtcore - dev-qt/qtgui - dev-qt/qtnetwork + qt6? ( + dev-qt/qtbase:6[gui,network,widgets] + dev-qt/qttools:6[linguist] ) retroachievements? ( net-misc/curl[curl_ssl_gnutls] ) X? ( @@ -47,10 +48,12 @@ S="${WORKDIR}/${PN}" src_configure() { local mycmakeargs=( + -DENABLE_CUBEB=ON -DBUILD_NOGUI_FRONTEND=$(usex nogui) - -DBUILD_QT_FRONTEND=$(usex qt5) + -DBUILD_QT_FRONTEND=$(usex qt6) -DENABLE_CHEEVOS=$(usex retroachievements) -DENABLE_DISCORD_PRESENCE=$(usex discord) + -DUSE_DBUS=$(usex dbus) -DUSE_DRMKMS=$(usex gbm) -DUSE_EGL=$(usex egl) -DUSE_EVDEV=$(usex evdev) @@ -68,8 +71,7 @@ src_install() { # Binary and resources files must be in same directory – installing in /opt insinto /opt/${PN} - doins -r "${BUILD_DIR}"/bin/resources - doins -r "${BUILD_DIR}"/bin/translations + doins -r "${BUILD_DIR}"/bin/resources/ if use nogui; then newicon "${BUILD_DIR}"/bin/resources/images/duck.png duckstation-nogui.png @@ -80,10 +82,11 @@ src_install() { fperms +x /opt/${PN}/duckstation-nogui fi - if use qt5; then + if use qt6; then newicon "${BUILD_DIR}"/bin/resources/images/duck.png duckstation-qt.png make_desktop_entry "${PN}-qt %f" "DuckStation Qt" "${PN}-qt" "Game" + doins -r "${BUILD_DIR}"/bin/translations/ doins "${BUILD_DIR}"/bin/duckstation-qt dosym ../../opt/${PN}/duckstation-qt usr/bin/duckstation-qt fperms +x /opt/${PN}/duckstation-qt diff --git a/games-emulation/duckstation/metadata.xml b/games-emulation/duckstation/metadata.xml index c036224ef1..fbfcacde18 100644 --- a/games-emulation/duckstation/metadata.xml +++ b/games-emulation/duckstation/metadata.xml @@ -20,7 +20,7 @@ Link with SDL2 for controller support Support DRM/KMS OpenGL contexts Build the NoGUI frontend - Build the QT frontend + Build the QT frontend Build with RetroAchievements supports