summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-graphics/kmscube/kmscube/0001-common-fix-cast-type-in-init_egl.patch34
-rw-r--r--meta/recipes-graphics/kmscube/kmscube_git.bb6
2 files changed, 38 insertions, 2 deletions
diff --git a/meta/recipes-graphics/kmscube/kmscube/0001-common-fix-cast-type-in-init_egl.patch b/meta/recipes-graphics/kmscube/kmscube/0001-common-fix-cast-type-in-init_egl.patch
new file mode 100644
index 0000000000..50df211d60
--- /dev/null
+++ b/meta/recipes-graphics/kmscube/kmscube/0001-common-fix-cast-type-in-init_egl.patch
@@ -0,0 +1,34 @@
1From b2f97f53e01e07a920761e5d3e3ba22898b794a4 Mon Sep 17 00:00:00 2001
2From: Eric Engestrom <eric@igalia.com>
3Date: Tue, 24 Sep 2024 17:57:45 +0200
4Subject: [PATCH] common: fix cast type in init_egl()
5
6On some platforms, `EGLNativeDisplayType` is an int instead of
7a pointer, in which case the void pointer will raise
8a `-Wint-conversion`.
9
10Let's cast it to the correct type directly.
11
12Closes: https://gitlab.freedesktop.org/mesa/kmscube/-/issues/16
13 https://gitlab.freedesktop.org/mesa/kmscube/-/merge_requests/57
14
15Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/kmscube/-/commit/b2f97f53e01e07a920761e5d3e3ba22898b794a4]
16
17Signed-off-by: Purushottam Choudhary <Purushottam27.kumar@lge.com>
18---
19 common.c | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
22diff --git a/common.c b/common.c
23index e52d480..e1e2dcf 100644
24--- a/common.c
25+++ b/common.c
26@@ -341,7 +341,7 @@ int init_egl(struct egl *egl, const struct gbm *gbm, int samples)
27 egl->display = egl->eglGetPlatformDisplayEXT(EGL_PLATFORM_GBM_KHR,
28 gbm->dev, NULL);
29 } else {
30- egl->display = eglGetDisplay((void *)gbm->dev);
31+ egl->display = eglGetDisplay((EGLNativeDisplayType)gbm->dev);
32 }
33
34 if (!eglInitialize(egl->display, &major, &minor)) {
diff --git a/meta/recipes-graphics/kmscube/kmscube_git.bb b/meta/recipes-graphics/kmscube/kmscube_git.bb
index 98f110527e..40c5a14492 100644
--- a/meta/recipes-graphics/kmscube/kmscube_git.bb
+++ b/meta/recipes-graphics/kmscube/kmscube_git.bb
@@ -11,8 +11,10 @@ DEPENDS = "virtual/libgles3 virtual/libgles2 virtual/egl libdrm virtual/libgbm"
11LIC_FILES_CHKSUM = "file://kmscube.c;beginline=1;endline=23;md5=8b309d4ee67b7315ff7381270dd631fb" 11LIC_FILES_CHKSUM = "file://kmscube.c;beginline=1;endline=23;md5=8b309d4ee67b7315ff7381270dd631fb"
12 12
13SRCREV = "9f63f359fab1b5d8e862508e4e51c9dfe339ccb0" 13SRCREV = "9f63f359fab1b5d8e862508e4e51c9dfe339ccb0"
14SRC_URI = "git://gitlab.freedesktop.org/mesa/kmscube;branch=master;protocol=https" 14SRC_URI = "git://gitlab.freedesktop.org/mesa/kmscube;branch=master;protocol=https \
15SRC_URI += "file://0001-texturator-Use-correct-GL-extension-header.patch" 15 file://0001-texturator-Use-correct-GL-extension-header.patch \
16 file://0001-common-fix-cast-type-in-init_egl.patch \
17"
16UPSTREAM_CHECK_COMMITS = "1" 18UPSTREAM_CHECK_COMMITS = "1"
17 19
18S = "${WORKDIR}/git" 20S = "${WORKDIR}/git"