From 8de42ef0fd109ed5ad6f4d452409d3a6ad7318e1 Mon Sep 17 00:00:00 2001 From: Gilver Date: Thu, 13 Feb 2025 11:57:49 -0600 Subject: [PATCH] Fix: Update script for Mesa, bump Mesa back down (#3301) * Fix update script? Signed-off-by: Gilver * Bump Mesa back down Signed-off-by: Gilver * ...Rel Signed-off-by: Gilver * Switch to normal versioning scheme Signed-off-by: Gilver * Was worth a shot Signed-off-by: Gilver * Update update.rhai Signed-off-by: Gilver * Actually... Signed-off-by: Gilver * Update update.rhai Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/lib/mesa/mesa.spec | 9 ++++----- anda/lib/mesa/update.rhai | 4 +++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/anda/lib/mesa/mesa.spec b/anda/lib/mesa/mesa.spec index 726a8b6c4d..915925667f 100644 --- a/anda/lib/mesa/mesa.spec +++ b/anda/lib/mesa/mesa.spec @@ -75,15 +75,14 @@ Summary: Mesa graphics libraries # 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 25.0.0-rc3 -Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 3%?dist +Version: 24.3.4 +Release: 4%?dist License: MIT AND BSD-3-Clause AND SGI-B-2.0 URL: http://www.mesa3d.org -Source0: https://archive.mesa3d.org/%{srcname}-%{ver}.tar.xz +Source0: https://archive.mesa3d.org/%{srcname}-%{version}.tar.xz # src/gallium/auxiliary/postprocess/pp_mlaa* have an ... interestingly worded license. # Source1 contains email correspondence clarifying the license terms. # Fedora opts to ignore the optional part of clause 2 and treat that code as 2 clause BSD. @@ -396,7 +395,7 @@ Obsoletes: mesa-vulkan-devel < %{?epoch:%{epoch}:}%{version}-%{release} The drivers with support for the Vulkan API. %prep -%autosetup -n %{srcname}-%{ver} -p1 +%autosetup -n %{srcname}-%{version} -p1 cp %{SOURCE1} docs/ %build diff --git a/anda/lib/mesa/update.rhai b/anda/lib/mesa/update.rhai index 5bfae0c21c..0008281bb0 100644 --- a/anda/lib/mesa/update.rhai +++ b/anda/lib/mesa/update.rhai @@ -1,3 +1,5 @@ let v = gitlab_tag("gitlab.freedesktop.org", "176"); v.crop(5); -rpm.global("ver", v); +if `[\d.]+-rc\d+`.find_all(v).len == 0 { + rpm.version(v); +}