diff mbox series

[1/2] mesa-demos: use latest git version

Message ID 20250422-mesa-demos-git-v1-1-87eac5e3af26@cherry.de
State New
Headers show
Series mesa-demos: bump to latest commit in git, remove use of deprecated option | expand

Commit Message

Quentin Schulz April 22, 2025, 2:26 p.m. UTC 
From: Quentin Schulz <quentin.schulz@cherry.de>

When trying to use vkgears on RK3588 with PanVK, version 9.0.0 (released
two years ago) currently crashes due to a Segfault. Considering there's
been quite a few commits since that version, let's use the latest commit
in the master branch instead of trying to figure out which patch(es)
exactly fix that issue.

License-Update: removed trailing whitespace, c.f. 1303498303c2 ("remove
trailing space")

Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
---
 ...001-meson-fix-glx-detection-without-glvnd.patch | 46 ----------------------
 .../{mesa-demos_9.0.0.bb => mesa-demos_git.bb}     | 12 +++---
 2 files changed, 7 insertions(+), 51 deletions(-)

Comments

Alexander Kanavin April 22, 2025, 3:55 p.m. UTC | #1 
On Tue, 22 Apr 2025 at 16:28, Quentin Schulz via
lists.openembedded.org <foss=0leil.net@lists.openembedded.org> wrote:
> When trying to use vkgears on RK3588 with PanVK, version 9.0.0 (released
> two years ago) currently crashes due to a Segfault. Considering there's
> been quite a few commits since that version, let's use the latest commit
> in the master branch instead of trying to figure out which patch(es)
> exactly fix that issue.

Please no. We do not take random development commits just to fix a
crash on a particular target, and I don't agree to making an exception
here. You can figure out which commit fixes the issue, it just takes
more time to bisect to that.

Alex
Quentin Schulz April 22, 2025, 4:33 p.m. UTC | #2 
Hi Alex,

On 4/22/25 5:55 PM, Alexander Kanavin wrote:
> On Tue, 22 Apr 2025 at 16:28, Quentin Schulz via
> lists.openembedded.org <foss=0leil.net@lists.openembedded.org> wrote:
>> When trying to use vkgears on RK3588 with PanVK, version 9.0.0 (released
>> two years ago) currently crashes due to a Segfault. Considering there's
>> been quite a few commits since that version, let's use the latest commit
>> in the master branch instead of trying to figure out which patch(es)
>> exactly fix that issue.
> 
> Please no. We do not take random development commits just to fix a
> crash on a particular target, and I don't agree to making an exception
> here. You can figure out which commit fixes the issue, it just takes
> more time to bisect to that.
> 

/me shrugs

Still doesn't work for me outside from now being able to run

vkgears -info

instead of having a segfault.

I'm personally not interested in figuring which commit is fixing vkgears 
-info for me. I only sent it because another long time contributor 
suggested I do. I can see arguments for both sides, it's fine if this is 
dropped, I don't care too much about it :)

I still think the second patch would be nice to have, regardless of the 
state of the first patch in this series.

Cheers,
Quentin
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 f16ba4a24c421b713782f7cd8b06f776a7bc0bd7..0000000000000000000000000000000000000000
--- 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_git.bb
similarity index 86%
rename from meta/recipes-graphics/mesa/mesa-demos_9.0.0.bb
rename to meta/recipes-graphics/mesa/mesa-demos_git.bb
index d92f1ddc5baacbbb0301e9defc1a013bb60a4aa8..9dbb19d4696aa3b4812c60850d72a44a48d65d99 100644
--- a/meta/recipes-graphics/mesa/mesa-demos_9.0.0.bb
+++ b/meta/recipes-graphics/mesa/mesa-demos_git.bb
@@ -6,13 +6,15 @@  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=20;md5=a481fbdb2ac800ecb12405c33bcfacae \
                     file://src/xdemos/glxdemo.c;beginline=1;endline=8;md5=b01d5ab1aee94d35b7efaa2ef48e1a06"
 
-SRC_URI = "https://archive.mesa3d.org/demos/${BPN}-${PV}.tar.xz \
-           file://0001-meson-fix-glx-detection-without-glvnd.patch \
-           "
-SRC_URI[sha256sum] = "3046a3d26a7b051af7ebdd257a5f23bfeb160cad6ed952329cdff1e9f1ed496b"
+SRC_URI = "git://gitlab.freedesktop.org/mesa/demos.git;branch=main;protocol=https"
+SRCREV = "11939e1697b894be3c68a89e3ea86fc51a320836"
+
+S = "${WORKDIR}/git"
+
+PV = "9.0.0+git"
 
 inherit meson pkgconfig features_check
 # depends on virtual/egl, virtual/libgl ...