diff mbox series

mesa: Allow using semantic version suffix

Message ID 20250506110344.2129531-1-zboszor@gmail.com
State New
Headers show
Series mesa: Allow using semantic version suffix | expand

Commit Message

Zoltán Böszörményi May 6, 2025, 11:03 a.m. UTC 
This should allow testing release candidate versions easier.
For example:

  PV = "25.1.0"
  SEMVERSFX = "-rc3"

Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
---
 meta/recipes-graphics/mesa/mesa-gl.bb | 2 --
 meta/recipes-graphics/mesa/mesa.inc   | 5 ++++-
 2 files changed, 4 insertions(+), 3 deletions(-)

Comments

Alexander Kanavin May 6, 2025, 2:27 p.m. UTC | #1 
On Tue, 6 May 2025 at 13:04, Zoltan Boszormenyi via
lists.openembedded.org <zboszor=gmail.com@lists.openembedded.org>
wrote:
>   PV = "25.1.0"
>   SEMVERSFX = "-rc3"

Why not simply set PV to "25.1.0-rc3"? Nothing in the patch indicates
that would be a problem.

Alex
diff mbox series

Patch

diff --git a/meta/recipes-graphics/mesa/mesa-gl.bb b/meta/recipes-graphics/mesa/mesa-gl.bb
index ca160f1bfc..c9aca52f8f 100644
--- a/meta/recipes-graphics/mesa/mesa-gl.bb
+++ b/meta/recipes-graphics/mesa/mesa-gl.bb
@@ -4,8 +4,6 @@  SUMMARY += " (OpenGL only, no EGL/GLES)"
 
 PROVIDES = "virtual/libgl virtual/mesa"
 
-S = "${WORKDIR}/mesa-${PV}"
-
 TARGET_CFLAGS = "-I${STAGING_INCDIR}/drm"
 
 # At least one DRI rendering engine is required to build mesa.
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 66fb896676..a0c8f328fc 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -14,7 +14,7 @@  LIC_FILES_CHKSUM = "file://docs/license.rst;md5=ffe678546d4337b732cfd12262e6af11
 
 PE = "2"
 
-SRC_URI = "https://archive.mesa3d.org/mesa-${PV}.tar.xz \
+SRC_URI = "https://archive.mesa3d.org/mesa-${PV}${SEMVERSFX}.tar.xz \
            file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
            file://0001-freedreno-don-t-encode-build-path-into-binaries.patch \
            file://0001-mesa-clc-add-an-option-to-force-inclusion-of-OpenCL-.patch \
@@ -24,6 +24,9 @@  SRC_URI = "https://archive.mesa3d.org/mesa-${PV}.tar.xz \
 
 SRC_URI[sha256sum] = "c0d245dea0aa4b49f74b3d474b16542e4a8799791cd33d676c69f650ad4378d0"
 PV = "25.0.5"
+SEMVERSFX = ""
+
+S = "${WORKDIR}/mesa-${PV}${SEMVERSFX}"
 
 UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"