From 5a3d586ee859be4bbe8e21d90bb7922eea0d35e4 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Tue, 2 Jul 2024 14:23:28 -0700 Subject: [PATCH] chore: Move to chimeraos.patch --- spec_files/gamescope/chimeraos.patch | 2 +- spec_files/gamescope/external-fix.patch | 22 ---------------------- spec_files/gamescope/gamescope.spec | 1 - 3 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 spec_files/gamescope/external-fix.patch diff --git a/spec_files/gamescope/chimeraos.patch b/spec_files/gamescope/chimeraos.patch index ade6f559..4616ac44 100644 --- a/spec_files/gamescope/chimeraos.patch +++ b/spec_files/gamescope/chimeraos.patch @@ -129,7 +129,7 @@ index 97ef446..85e5126 100644 ( m_Mutable.szMakePNP == "VLV"sv && m_Mutable.szModel == "Jupiter"sv ) || ( m_Mutable.szMakePNP == "VLV"sv && m_Mutable.szModel == "Galileo"sv ); -+ if ( g_customRefreshRates.size() > 0 ) { ++ if ( g_customRefreshRates.size() > 0 && GetScreenType() == GAMESCOPE_SCREEN_TYPE_INTERNAL ) { + m_Mutable.ValidDynamicRefreshRates = std::span(g_customRefreshRates); + return; + } diff --git a/spec_files/gamescope/external-fix.patch b/spec_files/gamescope/external-fix.patch deleted file mode 100644 index 7aacf4ad..00000000 --- a/spec_files/gamescope/external-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 508e697c8038cd947405850aa86d121b51bdeb72 Mon Sep 17 00:00:00 2001 -From: Kyle Gospodnetich -Date: Tue, 2 Jul 2024 14:12:47 -0700 -Subject: [PATCH] Only change refresh rates on internal displays - ---- - src/drm.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/drm.cpp b/src/drm.cpp -index 8309140f5..5defb305e 100644 ---- a/src/drm.cpp -+++ b/src/drm.cpp -@@ -2138,7 +2138,7 @@ namespace gamescope - ( m_Mutable.szMakePNP == "VLV"sv && m_Mutable.szModel == "Jupiter"sv ) || - ( m_Mutable.szMakePNP == "VLV"sv && m_Mutable.szModel == "Galileo"sv ); - -- if ( g_customRefreshRates.size() > 0 ) { -+ if ( g_customRefreshRates.size() > 0 && GetScreenType() == GAMESCOPE_SCREEN_TYPE_INTERNAL ) { - m_Mutable.ValidDynamicRefreshRates = std::span(g_customRefreshRates); - return; - } diff --git a/spec_files/gamescope/gamescope.spec b/spec_files/gamescope/gamescope.spec index 0e2f0306..5dd67c12 100644 --- a/spec_files/gamescope/gamescope.spec +++ b/spec_files/gamescope/gamescope.spec @@ -18,7 +18,6 @@ Source0: stb.pc Patch0: chimeraos.patch Patch1: disable-steam-touch-click-atom.patch Patch2: deckhd.patch -Patch3: external-fix.patch BuildRequires: meson >= 0.54.0 BuildRequires: ninja-build