diff options
3 files changed, 2 insertions, 65 deletions
diff --git a/meta/recipes-graphics/kmscube/kmscube/0001-drm-common.c-do-not-use-invalid-modifier.patch b/meta/recipes-graphics/kmscube/kmscube/0001-drm-common.c-do-not-use-invalid-modifier.patch deleted file mode 100644 index 58ff3ba561..0000000000 --- a/meta/recipes-graphics/kmscube/kmscube/0001-drm-common.c-do-not-use-invalid-modifier.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | From bdde833c254092a47df6c7109a9751653c82aaae Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Mon, 8 Aug 2022 20:22:39 +0200 | ||
4 | Subject: [PATCH] drm-common.c: do not use invalid modifier | ||
5 | |||
6 | Prior to kernel 5.19 this was a soft failure, but 5.19 | ||
7 | adds checks that result in a hard syscall fail. | ||
8 | |||
9 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/kmscube/-/merge_requests/33] | ||
10 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
11 | --- | ||
12 | drm-common.c | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/drm-common.c b/drm-common.c | ||
16 | index 5c9cca2..964e1c3 100644 | ||
17 | --- a/drm-common.c | ||
18 | +++ b/drm-common.c | ||
19 | @@ -92,7 +92,7 @@ struct drm_fb * drm_fb_get_from_bo(struct gbm_bo *bo) | ||
20 | modifiers[i] = modifiers[0]; | ||
21 | } | ||
22 | |||
23 | - if (modifiers[0]) { | ||
24 | + if (modifiers[0] && modifiers[0] != DRM_FORMAT_MOD_INVALID) { | ||
25 | flags = DRM_MODE_FB_MODIFIERS; | ||
26 | printf("Using modifier %" PRIx64 "\n", modifiers[0]); | ||
27 | } | ||
diff --git a/meta/recipes-graphics/kmscube/kmscube/0001-texturator-Use-correct-GL-extension-header.patch b/meta/recipes-graphics/kmscube/kmscube/0001-texturator-Use-correct-GL-extension-header.patch deleted file mode 100644 index 5965782de7..0000000000 --- a/meta/recipes-graphics/kmscube/kmscube/0001-texturator-Use-correct-GL-extension-header.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | From 2b74e0e32235f6ab2e3e42d53dea985a7ba6227f Mon Sep 17 00:00:00 2001 | ||
2 | From: Damian Hobson-Garcia <dhobsong@igel.co.jp> | ||
3 | Date: Wed, 16 Dec 2020 11:08:25 +0900 | ||
4 | Subject: [PATCH] texturator: Use correct GL extension header | ||
5 | |||
6 | gl2ext.h is the extenstion header for OpenGL ES 2.0 and all later | ||
7 | versions according to the Khronos documentation [1]. gl3ext.h is either | ||
8 | an empty stub, or may not even exist on some platforms. | ||
9 | |||
10 | [1]: https://www.khronos.org/registry/OpenGL/index_es.php#headers | ||
11 | |||
12 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/kmscube/-/merge_requests/26] | ||
13 | Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com> | ||
14 | --- | ||
15 | texturator.c | 2 +- | ||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/texturator.c b/texturator.c | ||
19 | index d9335d7..6d97856 100644 | ||
20 | --- a/texturator.c | ||
21 | +++ b/texturator.c | ||
22 | @@ -30,7 +30,7 @@ | ||
23 | #include <math.h> | ||
24 | |||
25 | #include <GLES3/gl3.h> | ||
26 | -#include <GLES3/gl3ext.h> | ||
27 | +#include <GLES2/gl2ext.h> | ||
28 | |||
29 | #ifdef HAVE_LIBPNG | ||
30 | #include <png.h> | ||
31 | -- | ||
32 | 2.33.1 | ||
33 | |||
diff --git a/meta/recipes-graphics/kmscube/kmscube_git.bb b/meta/recipes-graphics/kmscube/kmscube_git.bb index f7ee6e4e10..6ed97dfafe 100644 --- a/meta/recipes-graphics/kmscube/kmscube_git.bb +++ b/meta/recipes-graphics/kmscube/kmscube_git.bb | |||
@@ -10,11 +10,8 @@ DEPENDS = "virtual/libgles3 virtual/libgles2 virtual/egl libdrm" | |||
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 = "9f63f359fab1b5d8e862508e4e51c9dfe339ccb0" | 13 | SRCREV = "3bf6ee1a02334386d87cfe356c3bfb0b24e1fed8" |
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-texturator-Use-correct-GL-extension-header.patch \ | ||
16 | file://0001-drm-common.c-do-not-use-invalid-modifier.patch \ | ||
17 | " | ||
18 | UPSTREAM_CHECK_COMMITS = "1" | 15 | UPSTREAM_CHECK_COMMITS = "1" |
19 | 16 | ||
20 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |