diff mbox series

[3/4] mesa-demos: move to latest commit

Message ID 20260708111108.3577325-3-ross.burton@arm.com
State New
Headers show
Series [1/4] xmlto: update SRC_URI | expand

Commit Message

Ross Burton July 8, 2026, 11:11 a.m. UTC 
Upgrade mesa-demos to the latest commit.  Too many changes to list as
there have been ~230 commits since the 9.0.0 release in 2023.

Drop a backported patch, and update the GLUT option.

License-Update: license strings rewritten

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 ...eson-fix-glx-detection-without-glvnd.patch | 46 -------------------
 .../recipes-graphics/mesa/mesa-demos_9.0.0.bb | 14 +++---
 2 files changed, 8 insertions(+), 52 deletions(-)
 delete mode 100644 meta/recipes-graphics/mesa/mesa-demos/0001-meson-fix-glx-detection-without-glvnd.patch
diff mbox series

Patch

diff --git a/meta/recipes-graphics/mesa/mesa-demos/0001-meson-fix-glx-detection-without-glvnd.patch b/meta/recipes-graphics/mesa/mesa-demos/0001-meson-fix-glx-detection-without-glvnd.patch
deleted file mode 100644
index f16ba4a24c..0000000000
--- a/meta/recipes-graphics/mesa/mesa-demos/0001-meson-fix-glx-detection-without-glvnd.patch
+++ /dev/null
@@ -1,46 +0,0 @@ 
-From e16117fc92688d76a042ad2c590c77d5a987a4ac Mon Sep 17 00:00:00 2001
-From: Erik Faye-Lund <erik.faye-lund@collabora.com>
-Date: Fri, 24 Mar 2023 13:31:58 +0100
-Subject: [PATCH] meson: fix glx-detection without glvnd
-
-When build without GLVND, Mesa provides GLX as a part of libGL, just
-like XQuartz does on MacOS. There's nothing really macOS specific about
-this fallback, so let's drop the condition.
-
-And just for good measure, let's add in dep_gl as a dependency for
-the header-check here, in case some one decides to install libGL outside
-of the default include directory.
-
-Fixes: 34300551 ("meson: explicitly check for glx dependency")
-Closes: https://gitlab.freedesktop.org/mesa/demos/-/issues/36
-Reviewed-by: Hoe Hao Cheng <haochengho12907@gmail.com>
-
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <ross.burton@arm.com>
----
- meson.build | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index c1853f94..bc3278e1 100644
---- a/meson.build
-+++ b/meson.build
-@@ -99,10 +99,11 @@ if not dep_glu.found() and host_machine.system() != 'darwin'
- endif
- 
- dep_glx = dependency('glx', required: false, disabler : true)
--if not dep_glx.found() and host_machine.system() == 'darwin'
--  # xquartz doesn't have a glx.pc, but it does have the header. And all the
--  # symbols reside in libGL, so let's just use that.
--  if cc.check_header('GL/glx.h', dependencies: dep_x11)
-+if not dep_glx.found()
-+  # Both Mesa build without GLVND and XQuartz lacks a glx.pc, but does
-+  # provide the header. And all the symbols reside in libGL, so let's
-+  # just use that.
-+  if cc.check_header('GL/glx.h', dependencies: [dep_x11, dep_gl])
-     dep_glx = dep_gl
-   endif
- endif
--- 
-2.43.0
-
diff --git a/meta/recipes-graphics/mesa/mesa-demos_9.0.0.bb b/meta/recipes-graphics/mesa/mesa-demos_9.0.0.bb
index 593bc0147e..6c0c3d1b56 100644
--- a/meta/recipes-graphics/mesa/mesa-demos_9.0.0.bb
+++ b/meta/recipes-graphics/mesa/mesa-demos_9.0.0.bb
@@ -6,14 +6,16 @@  BUGTRACKER = "https://bugs.freedesktop.org"
 SECTION = "x11"
 
 LICENSE = "MIT & PD"
-LIC_FILES_CHKSUM = "file://src/xdemos/glxgears.c;beginline=1;endline=20;md5=914225785450eff644a86c871d3ae00e \
+LIC_FILES_CHKSUM = "file://src/xdemos/glxgears.c;beginline=1;endline=5;md5=2c456e2fe0a0a05d31a72e076d404528 \
                     file://src/xdemos/glxdemo.c;beginline=1;endline=8;md5=b01d5ab1aee94d35b7efaa2ef48e1a06"
 
-SRC_URI = "git://gitlab.freedesktop.org/mesa/demos.git;protocol=https;branch=main;tag=${BP} \
-           file://0001-meson-fix-glx-detection-without-glvnd.patch \
-           "
+SRC_URI = "git://gitlab.freedesktop.org/mesa/demos.git;protocol=https;branch=main"
 
-SRCREV = "661681767bfb4e8f136aac1fd7934e6b0fa46d29"
+SRCREV = "188fc2354de5a9cbfd73852183a35f4982ca43d5"
+
+# This recipe doesn't plan to make more releases, so track upstream git commits
+PV .= "+git"
+UPSTREAM_CHECK_COMMITS = "1"
 
 inherit meson pkgconfig features_check
 # depends on virtual/egl, virtual/libgl ...
@@ -34,7 +36,7 @@  PACKAGECONFIG[drm] = "-Dlibdrm=enabled,-Dlibdrm=disabled,libdrm"
 PACKAGECONFIG[egl] = "-Degl=enabled,-Degl=disabled,virtual/egl"
 PACKAGECONFIG[gles1] = "-Dgles1=enabled,-Dgles1=disabled,virtual/libgles1"
 PACKAGECONFIG[gles2] = "-Dgles2=enabled,-Dgles2=disabled,virtual/libgles2"
-PACKAGECONFIG[glut] = "-Dwith-glut=${STAGING_EXECPREFIXDIR},,freeglut"
+PACKAGECONFIG[glut] = "-Dglut=enabled,-Dglut=disabled,freeglut"
 PACKAGECONFIG[vulkan] = "-Dvulkan=enabled,-Dvulkan=disabled,vulkan-loader glslang-native"
 PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,virtual/libgl wayland wayland-native wayland-protocols libxkbcommon libdecor"
 PACKAGECONFIG[x11] = "-Dx11=enabled,-Dx11=disabled,virtual/libx11 libglu libxkbcommon libxcb"