From 944a133ae7304eeecd78ecc7f186d75b255b4729 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Tue, 29 Apr 2025 15:12:07 -0400 Subject: [PATCH] Remove Feral Gamemode support I don't use this anymore, and I doubt anyone does either. If we want it back, we should probably use the Portal API for it instead. --- .github/workflows/main.yml | 1 - BUILDING.md | 4 +--- CMakeLists.txt | 10 ---------- launcher/CMakeLists.txt | 5 ----- launcher/profileconfig.kcfg | 3 --- launcher/src/gamerunner.cpp | 10 ---------- launcher/ui/Settings/ProfileSettings.qml | 11 ----------- zone.xiv.astra.yml | 1 - 8 files changed, 1 insertion(+), 44 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6ffd74d..f35bb67 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -69,7 +69,6 @@ jobs: sudo apt-get update sudo apt-get install \ gettext \ - gamemode-dev \ libunshield-dev \ libsecret-1-dev diff --git a/BUILDING.md b/BUILDING.md index b468b9c..70d8eea 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -42,8 +42,6 @@ These are optional dependencies, that will be used if found on your system. * Steamworks SDK * You must specify `STEAMWORKS_INCLUDE_DIRS` and `STEAMWORKS_LIBRARIES` yourself. -* Gamemode - * Turn on `ENABLE_GAMEMODE` to enable integration. ### Getting source code @@ -71,7 +69,7 @@ $ cmake -S . -B build This command will create a new build directory and configure the source directory (`.`). If you want to enable more options, pass them now: ```bash -$ cmake -S . -B build -DENABLE_GAMEMODE=ON +$ cmake -S . -B build ``` ## Building diff --git a/CMakeLists.txt b/CMakeLists.txt index af1b5ce..cfd98c9 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,11 +11,6 @@ option(BUILD_WEBVIEW "Build support for the integrated web browser. Only used on # TODO: phase out once all supported builds can turn on this option option(BUILD_SYNC "Build Matrix sync support." OFF) -# options for features you may want or need -if (NOT WIN32 AND NOT APPLE) - option(ENABLE_GAMEMODE "Build with Feral GameMode support, requires the daemon to be installed." ON) -endif() - set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) @@ -66,11 +61,6 @@ endif() qt_policy(SET QTP0001 NEW) qt_policy(SET QTP0004 NEW) -if (ENABLE_GAMEMODE) - find_package(PkgConfig REQUIRED) - pkg_search_module(GAMEMODE REQUIRED gamemode) -endif () - find_package(Qt6Keychain REQUIRED) add_subdirectory(external) diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt index 7226594..a83c722 100644 --- a/launcher/CMakeLists.txt +++ b/launcher/CMakeLists.txt @@ -101,11 +101,6 @@ if (BUILD_FLATPAK) target_compile_definitions(astra_static PUBLIC FLATPAK) endif () -if (ENABLE_GAMEMODE) - target_link_libraries(astra_static PUBLIC ${GAMEMODE_LIBRARIES}) - target_compile_definitions(astra_static PUBLIC ENABLE_GAMEMODE) -endif () - if (BUILD_SYNC) target_sources(astra_static PRIVATE include/charactersync.h diff --git a/launcher/profileconfig.kcfg b/launcher/profileconfig.kcfg index 38f41d4..45d8d48 100644 --- a/launcher/profileconfig.kcfg +++ b/launcher/profileconfig.kcfg @@ -37,9 +37,6 @@ SPDX-License-Identifier: CC0-1.0 false - - false - false diff --git a/launcher/src/gamerunner.cpp b/launcher/src/gamerunner.cpp index a06b5c3..ea7d99f 100644 --- a/launcher/src/gamerunner.cpp +++ b/launcher/src/gamerunner.cpp @@ -3,10 +3,6 @@ #include "gamerunner.h" -#ifdef ENABLE_GAMEMODE -#include -#endif - #include "accountconfig.h" #include "astra_log.h" #include "encryptedarg.h" @@ -313,12 +309,6 @@ void GameRunner::launchExecutable(const Profile &profile, QProcess *process, con arguments.push_back(QStringLiteral("--")); } -#ifdef ENABLE_GAMEMODE - if (isGame && profile.config()->useGamemode()) { - gamemode_request_start(); - } -#endif - if (m_launcher.config()->enableRenderDocCapture()) { env.insert(QStringLiteral("VK_LAYER_RENDERDOC_Capture"), QStringLiteral("VK_LAYER_RENDERDOC_Capture")); env.insert(QStringLiteral("ENABLE_VULKAN_RENDERDOC_CAPTURE"), QString::number(1)); diff --git a/launcher/ui/Settings/ProfileSettings.qml b/launcher/ui/Settings/ProfileSettings.qml index d33e489..b50b958 100644 --- a/launcher/ui/Settings/ProfileSettings.qml +++ b/launcher/ui/Settings/ProfileSettings.qml @@ -235,17 +235,6 @@ FormCard.FormCardPage { onClicked: gamescopeSettingsDialog.open() } - - FormCard.FormDelegateSeparator {} - - FormCard.FormCheckDelegate { - id: gamemodeDelegate - - text: i18n("Enable Gamemode") - description: i18n("A special game performance tool, that tunes your CPU scheduler among other things.") - checked: page.profile.config.useGamemode - onCheckedChanged: page.profile.config.useGamemode = checked - } } FormCard.FormCard { diff --git a/zone.xiv.astra.yml b/zone.xiv.astra.yml index d6773c4..c4c30d5 100644 --- a/zone.xiv.astra.yml +++ b/zone.xiv.astra.yml @@ -125,7 +125,6 @@ modules: buildsystem: cmake-ninja config-opts: - -DRust_COMPILER=/usr/lib/sdk/rust-stable/bin/rustc - - -DENABLE_GAMEMODE=OFF - -DBUILD_FLATPAK=ON - -DCMAKE_INSTALL_LIBDIR=/app/lib - -DLIB_INSTALL_DIR=/app/lib