diff options
author | Fabio Estevam <festevam@denx.de> | 2024-11-28 13:12:36 -0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-11-29 18:26:14 +0000 |
commit | ad9d89fde6250c728851908e3032d47f49ff3cd5 (patch) | |
tree | 811711dc126f61ad989e0a8a3b8220035fc92508 /meta | |
parent | 3848a579ce04124279e94d63873a5337d3f022e1 (diff) | |
download | poky-ad9d89fde6250c728851908e3032d47f49ff3cd5.tar.gz |
kmscube: Upgrade to the latest revision
Upgrade to the latest revision and remove the patch because the
original problem has already been fixed upstream by kmscube
commit 311eaaaa473d ("kmscube: gears: use only GLES2").
(From OE-Core rev: 3348b02f72bf7cf62f73cce74caffe2c51d43b1a)
Signed-off-by: Fabio Estevam <festevam@denx.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-graphics/kmscube/kmscube/0001-cube-gears-Change-header-file-to-GLES3-gl3.h.patch | 31 | ||||
-rw-r--r-- | meta/recipes-graphics/kmscube/kmscube_git.bb | 3 |
2 files changed, 1 insertions, 33 deletions
diff --git a/meta/recipes-graphics/kmscube/kmscube/0001-cube-gears-Change-header-file-to-GLES3-gl3.h.patch b/meta/recipes-graphics/kmscube/kmscube/0001-cube-gears-Change-header-file-to-GLES3-gl3.h.patch deleted file mode 100644 index 415515b908..0000000000 --- a/meta/recipes-graphics/kmscube/kmscube/0001-cube-gears-Change-header-file-to-GLES3-gl3.h.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | From 38237aee63d671cc418902951b8945b59a41a4fd Mon Sep 17 00:00:00 2001 | ||
2 | From: Fabio Estevam <festevam@gmail.com> | ||
3 | Date: Mon, 8 Jan 2024 15:00:01 -0300 | ||
4 | Subject: [PATCH] cube-gears: Change header file to <GLES3/gl3.h> | ||
5 | |||
6 | Since commit 96d63eb59e34 ("kmscube: Add gears mode"), kmscube fails | ||
7 | to build on platforms without <GL/gl.h>. | ||
8 | |||
9 | Fix it by changing the header file to <GLES3/gl3.h>. | ||
10 | |||
11 | Reported-by: Martin Jansa <martin.jansa@gmail.com> | ||
12 | Suggested-by: Martin Jansa <martin.jansa@gmail.com> | ||
13 | Signed-off-by: Fabio Estevam <festevam@gmail.com> | ||
14 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/kmscube/-/merge_requests/51] | ||
15 | --- | ||
16 | cube-gears.c | 2 +- | ||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/cube-gears.c b/cube-gears.c | ||
20 | index d5b7a5f..cb538ec 100644 | ||
21 | --- a/cube-gears.c | ||
22 | +++ b/cube-gears.c | ||
23 | @@ -31,7 +31,7 @@ | ||
24 | #include <sys/time.h> | ||
25 | #include <math.h> | ||
26 | |||
27 | -#include <GL/gl.h> | ||
28 | +#include <GLES3/gl3.h> | ||
29 | |||
30 | #include "common.h" | ||
31 | #include "esUtil.h" | ||
diff --git a/meta/recipes-graphics/kmscube/kmscube_git.bb b/meta/recipes-graphics/kmscube/kmscube_git.bb index 01ea80a142..0fcea0702c 100644 --- a/meta/recipes-graphics/kmscube/kmscube_git.bb +++ b/meta/recipes-graphics/kmscube/kmscube_git.bb | |||
@@ -10,9 +10,8 @@ DEPENDS = "virtual/libgles3 virtual/libgles2 virtual/egl libdrm virtual/libgbm" | |||
10 | 10 | ||
11 | LIC_FILES_CHKSUM = "file://kmscube.c;beginline=1;endline=23;md5=8b309d4ee67b7315ff7381270dd631fb" | 11 | LIC_FILES_CHKSUM = "file://kmscube.c;beginline=1;endline=23;md5=8b309d4ee67b7315ff7381270dd631fb" |
12 | 12 | ||
13 | SRCREV = "b2f97f53e01e07a920761e5d3e3ba22898b794a4" | 13 | SRCREV = "311eaaaa473d593c30d118799aa19ac4ad53cd65" |
14 | SRC_URI = "git://gitlab.freedesktop.org/mesa/kmscube;branch=master;protocol=https \ | 14 | SRC_URI = "git://gitlab.freedesktop.org/mesa/kmscube;branch=master;protocol=https \ |
15 | file://0001-cube-gears-Change-header-file-to-GLES3-gl3.h.patch \ | ||
16 | " | 15 | " |
17 | 16 | ||
18 | UPSTREAM_CHECK_COMMITS = "1" | 17 | UPSTREAM_CHECK_COMMITS = "1" |