From 8e15a1ec69b9592b670caaab0fd874cef23558d6 Mon Sep 17 00:00:00 2001 From: Cappy Ishihara Date: Sat, 20 Jul 2024 19:37:07 +0700 Subject: [PATCH 1/3] fix: gamescope package --- anda/games/gamescope/anda.hcl | 3 +++ anda/games/gamescope/terra-gamescope.spec | 6 +++--- anda/lib/terra-mesa/anda.hcl | 8 ++++++++ 3 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 anda/lib/terra-mesa/anda.hcl diff --git a/anda/games/gamescope/anda.hcl b/anda/games/gamescope/anda.hcl index 8986e2c381..cd18050ddc 100644 --- a/anda/games/gamescope/anda.hcl +++ b/anda/games/gamescope/anda.hcl @@ -2,4 +2,7 @@ project pkg { rpm { spec = "terra-gamescope.spec" } + labels { + multilib = 1 + } } diff --git a/anda/games/gamescope/terra-gamescope.spec b/anda/games/gamescope/terra-gamescope.spec index b4fff02195..24ba3a8b0d 100644 --- a/anda/games/gamescope/terra-gamescope.spec +++ b/anda/games/gamescope/terra-gamescope.spec @@ -5,7 +5,7 @@ Name: terra-gamescope Version: 100.%{gamescope_tag} -Release: 1%?dist +Release: 2%?dist Summary: Micro-compositor for video games on Wayland License: BSD @@ -89,8 +89,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: %{name} = %{version}-%{release} +Requires: %{name}(x86-32) = %{version}-%{release} Recommends: mesa-dri-drivers Recommends: mesa-vulkan-drivers diff --git a/anda/lib/terra-mesa/anda.hcl b/anda/lib/terra-mesa/anda.hcl new file mode 100644 index 0000000000..af5014e03b --- /dev/null +++ b/anda/lib/terra-mesa/anda.hcl @@ -0,0 +1,8 @@ +project pkg { + rpm { + spec = "terra-mesa.spec" + } + labels { + multilib = 1 + } +} From 19c71cd0cf46d2052a056bf76114a806b9bf8fd8 Mon Sep 17 00:00:00 2001 From: Cappy Ishihara Date: Sat, 20 Jul 2024 19:41:52 +0700 Subject: [PATCH 2/3] remove mesa from stash --- anda/lib/terra-mesa/anda.hcl | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 anda/lib/terra-mesa/anda.hcl diff --git a/anda/lib/terra-mesa/anda.hcl b/anda/lib/terra-mesa/anda.hcl deleted file mode 100644 index af5014e03b..0000000000 --- a/anda/lib/terra-mesa/anda.hcl +++ /dev/null @@ -1,8 +0,0 @@ -project pkg { - rpm { - spec = "terra-mesa.spec" - } - labels { - multilib = 1 - } -} From 245bada224f37ba6a36f10e9c72495e1e7d89334 Mon Sep 17 00:00:00 2001 From: Cappy Ishihara Date: Sat, 20 Jul 2024 19:51:11 +0700 Subject: [PATCH 3/3] fix spec again --- anda/games/gamescope/terra-gamescope.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/anda/games/gamescope/terra-gamescope.spec b/anda/games/gamescope/terra-gamescope.spec index 24ba3a8b0d..bf92262f3d 100644 --- a/anda/games/gamescope/terra-gamescope.spec +++ b/anda/games/gamescope/terra-gamescope.spec @@ -5,7 +5,7 @@ Name: terra-gamescope Version: 100.%{gamescope_tag} -Release: 2%?dist +Release: 1%?dist Summary: Micro-compositor for video games on Wayland License: BSD @@ -89,8 +89,10 @@ 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: %{name} = %{version}-%{release} -Requires: %{name}(x86-32) = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} +%ifarch %{ix86} +Requires: %{name}-libs(x86-32) = %{version}-%{release} +%endif Recommends: mesa-dri-drivers Recommends: mesa-vulkan-drivers