Skip to contentSkip to conversation

xserver-xorg: exclude development snapshots from upstream version checks

PATCH New Alexander Kanavin 1 participant 2 messages Jul 7, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 xserver-xorg: exclude development snapshots from upstream version checks

Standalone X is still winding down; there's no commitment or plan for a proper release.
https://lists.freedesktop.org/archives/xorg/2021-July/060726.html

---
 meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +2 -0
index da025171db..e2fefd9db8 100644
@@ -17,6 +17,8 @@ PE = "2"
 XORG_PN = "xorg-server"
 SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2"
 
+UPSTREAM_CHECK_REGEX = "xorg-server-(?P<pver>\d+(\.(?!99)\d+)+)\.tar"
+
 CVE_PRODUCT = "xorg-server"
 
 S = "${WORKDIR}/${XORG_PN}-${PV}"
Signature · 1 line
2.31.1
#1 lore raw

PATCH 2/2 xwayland: exclude development snapshots from upstream version checks

---
 meta/recipes-graphics/xwayland/xwayland_21.1.1.bb | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-graphics/xwayland/xwayland_21.1.1.bb +2 -0
index faf166f788..f5db7cc5db 100644
@@ -12,6 +12,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880"
 SRC_URI = "https://www.x.org/archive/individual/xserver/xwayland-${PV}.tar.xz"
 SRC_URI[sha256sum] = "31f261ce51bbee76a6ca3ec02aa367ffa2b5efa2b98412df57ccefd7a19003ce"
 
+UPSTREAM_CHECK_REGEX = "xwayland-(?P<pver>\d+(\.(?!90\d)\d+)+)\.tar"
+
 inherit meson features_check
 REQUIRED_DISTRO_FEATURES = "x11 opengl"
 
Signature · 1 line
2.31.1