From aafb3880c448a93e939c5b2d6cf81be46c6f8e55 Mon Sep 17 00:00:00 2001
From: lea <lleyton@fyralabs.com>
Date: Tue, 11 Feb 2025 20:42:06 -0800
Subject: [PATCH] fix: give terra extras gamescope unique name (#3225)

* fix: give terra extras gamescope

* fix: rename
---
 .../0001-cstdint.patch                              |  0
 anda/games/{gamescope => terra-gamescope}/anda.hcl  |  2 +-
 .../{gamescope => terra-gamescope}/handheld.patch   |  0
 anda/games/{gamescope => terra-gamescope}/stb.pc    |  0
 .../terra-gamescope.spec}                           | 13 ++++++++-----
 5 files changed, 9 insertions(+), 6 deletions(-)
 rename anda/games/{gamescope => terra-gamescope}/0001-cstdint.patch (100%)
 rename anda/games/{gamescope => terra-gamescope}/anda.hcl (78%)
 rename anda/games/{gamescope => terra-gamescope}/handheld.patch (100%)
 rename anda/games/{gamescope => terra-gamescope}/stb.pc (100%)
 rename anda/games/{gamescope/gamescope.spec => terra-gamescope/terra-gamescope.spec} (93%)

diff --git a/anda/games/gamescope/0001-cstdint.patch b/anda/games/terra-gamescope/0001-cstdint.patch
similarity index 100%
rename from anda/games/gamescope/0001-cstdint.patch
rename to anda/games/terra-gamescope/0001-cstdint.patch
diff --git a/anda/games/gamescope/anda.hcl b/anda/games/terra-gamescope/anda.hcl
similarity index 78%
rename from anda/games/gamescope/anda.hcl
rename to anda/games/terra-gamescope/anda.hcl
index 151e9188d5..e66956b621 100755
--- a/anda/games/gamescope/anda.hcl
+++ b/anda/games/terra-gamescope/anda.hcl
@@ -1,7 +1,7 @@
 project pkg {
     arches = ["x86_64", "aarch64", "i386"]
 	rpm {
-		spec = "gamescope.spec"
+		spec = "terra-gamescope.spec"
 	}
 	labels {
 		mock = 1
diff --git a/anda/games/gamescope/handheld.patch b/anda/games/terra-gamescope/handheld.patch
similarity index 100%
rename from anda/games/gamescope/handheld.patch
rename to anda/games/terra-gamescope/handheld.patch
diff --git a/anda/games/gamescope/stb.pc b/anda/games/terra-gamescope/stb.pc
similarity index 100%
rename from anda/games/gamescope/stb.pc
rename to anda/games/terra-gamescope/stb.pc
diff --git a/anda/games/gamescope/gamescope.spec b/anda/games/terra-gamescope/terra-gamescope.spec
similarity index 93%
rename from anda/games/gamescope/gamescope.spec
rename to anda/games/terra-gamescope/terra-gamescope.spec
index 91dc951745..6bdb023131 100755
--- a/anda/games/gamescope/gamescope.spec
+++ b/anda/games/terra-gamescope/terra-gamescope.spec
@@ -3,10 +3,10 @@
 %global _default_patch_fuzz 2
 %global build_timestamp %(date +"%Y%m%d")
 #global gamescope_tag 3.15.11
-%global gamescope_commit d3174928d47f7e353e7daca63cf882d65660cc7c 
+%global gamescope_commit d3174928d47f7e353e7daca63cf882d65660cc7c
 %define short_commit %(echo %{gamescope_commit} | cut -c1-8)
 
-Name:           gamescope
+Name:           terra-gamescope
 #Version:        100.%{gamescope_tag}
 Version:        104.%{short_commit}
 Release:        1%?dist
@@ -15,6 +15,9 @@ Summary:        Micro-compositor for video games on Wayland
 License:        BSD
 URL:            https://github.com/ValveSoftware/gamescope
 
+Provides:       gamescope = %{version}-%{release}
+Conflicts:      gamescope
+
 # Create stb.pc to satisfy dependency('stb')
 Source0:        stb.pc
 
@@ -82,8 +85,8 @@ BuildRequires:  git
 # libliftoff hasn't bumped soname, but API/ABI has changed for 0.2.0 release
 Requires:       libliftoff%{?_isa} >= %{libliftoff_minver}
 Requires:       xorg-x11-server-Xwayland
-Requires:       gamescope-libs = %{version}-%{release}
-Requires:       gamescope-libs(x86-32) = %{version}-%{release}
+Requires:       terra-gamescope-libs = %{version}-%{release}
+Requires:       terra-gamescope-libs(x86-32) = %{version}-%{release}
 Recommends:     mesa-dri-drivers
 Recommends:     mesa-vulkan-drivers
 
@@ -99,7 +102,7 @@ Summary:	libs for %{name}
 # git clone --depth 1 --branch %%{gamescope_tag} %%{url}.git
 git clone %{url}.git
 cd gamescope
-git checkout %{gamescope_commit} 
+git checkout %{gamescope_commit}
 git submodule update --init --recursive
 mkdir -p pkgconfig
 cp %{SOURCE0} pkgconfig/stb.pc