From 65f08bda7ba98f025aecdca51bda01ee62ed246c Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Wed, 29 Jan 2025 22:06:53 -0800 Subject: [PATCH] feat!: add an epoch to the mesa package (#3093) (#3164) While we don't usually use epochs, Some may prefer to always use our Mesa packages over Fedora's even if they're newer due to our patches. This PR adds an epoch to the RPM package to ensure the depsolver always prefers our package over theirs. While this might seem heavy-handed, the thing is the Mesa packages are only included in the terra-mesa update stream which is disabled by default. So this change will ***only*** affect users who ***explicitly*** enabled the terra-mesa repo. (cherry picked from commit 79649c1285d584cc98a0a0f8fc9c811d9e672c35) Co-authored-by: Cappy Ishihara --- anda/lib/mesa/mesa.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/anda/lib/mesa/mesa.spec b/anda/lib/mesa/mesa.spec index 9ec0b3f43d..02b34dee4e 100644 --- a/anda/lib/mesa/mesa.spec +++ b/anda/lib/mesa/mesa.spec @@ -71,6 +71,10 @@ %global vulkan_drivers swrast%{?base_vulkan}%{?intel_platform_vulkan}%{?extra_platform_vulkan}%{?with_nvk:,nouveau} Name: %{srcname} Summary: Mesa graphics libraries +# Make the dep solver always prefer our Mesa over the distro's +# This should not break anything by default as the Mesa stream is ***EXPLICITLY*** +# disabled by default, and has to be enabled manually. See `terra/release/terra-mesa.repo` for details. +Epoch: 1 %global ver 24.3.4 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Release: 3%?dist