mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 05:09:24 +00:00
Code Issues Projects Releases Wiki Activity

kmscube: upgrade to latest revision

Browse Source 
0001-drm-common.c-do-not-use-invalid-modifier.patch
0001-texturator-Use-correct-GL-extension-header.patch
removed since they're included in new version.

(From OE-Core rev: fa48b8e76eca15f005fd1ac2f8432eb61c070610)

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
wangmy
2022-09-05 17:03:18 +08:00
committed by Richard Purdie
parent e36f9a9722
commit 550b0f1766
3 changed files with 2 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-graphics/kmscube/kmscube/0001-drm-common.c-do-not-use-invalid-modifier.patch
-27
View File
@@ -1,27 +0,0 @@
From bdde833c254092a47df6c7109a9751653c82aaae Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex@linutronix.de>
Date: Mon, 8 Aug 2022 20:22:39 +0200
Subject: [PATCH] drm-common.c: do not use invalid modifier
Prior to kernel 5.19 this was a soft failure, but 5.19
adds checks that result in a hard syscall fail.
Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/kmscube/-/merge_requests/33]
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
drm-common.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drm-common.c b/drm-common.c
index 5c9cca2..964e1c3 100644
--- a/drm-common.c
+++ b/drm-common.c
@@ -92,7 +92,7 @@ struct drm_fb * drm_fb_get_from_bo(struct gbm_bo *bo)
modifiers[i] = modifiers[0];
}
- if (modifiers[0]) {
+ if (modifiers[0] && modifiers[0] != DRM_FORMAT_MOD_INVALID) {
flags = DRM_MODE_FB_MODIFIERS;
printf("Using modifier %" PRIx64 "\n", modifiers[0]);
}
meta/recipes-graphics/kmscube/kmscube/0001-texturator-Use-correct-GL-extension-header.patch
-33
View File
@@ -1,33 +0,0 @@
From 2b74e0e32235f6ab2e3e42d53dea985a7ba6227f Mon Sep 17 00:00:00 2001
From: Damian Hobson-Garcia <dhobsong@igel.co.jp>
Date: Wed, 16 Dec 2020 11:08:25 +0900
Subject: [PATCH] texturator: Use correct GL extension header
gl2ext.h is the extenstion header for OpenGL ES 2.0 and all later
versions according to the Khronos documentation [1]. gl3ext.h is either
an empty stub, or may not even exist on some platforms.
[1]: https://www.khronos.org/registry/OpenGL/index_es.php#headers
Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/kmscube/-/merge_requests/26]
Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
---
texturator.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/texturator.c b/texturator.c
index d9335d7..6d97856 100644
--- a/texturator.c
+++ b/texturator.c
@@ -30,7 +30,7 @@
#include <math.h>
#include <GLES3/gl3.h>
-#include <GLES3/gl3ext.h>
+#include <GLES2/gl2ext.h>
#ifdef HAVE_LIBPNG
#include <png.h>
--
2.33.1
meta/recipes-graphics/kmscube/kmscube_git.bb
+2 -5
View File
@@ -10,11 +10,8 @@ DEPENDS = "virtual/libgles3 virtual/libgles2 virtual/egl libdrm"
LIC_FILES_CHKSUM = "file://kmscube.c;beginline=1;endline=23;md5=8b309d4ee67b7315ff7381270dd631fb"
SRCREV = "9f63f359fab1b5d8e862508e4e51c9dfe339ccb0"
SRC_URI = "git://gitlab.freedesktop.org/mesa/kmscube;branch=master;protocol=https \
file://0001-texturator-Use-correct-GL-extension-header.patch \
file://0001-drm-common.c-do-not-use-invalid-modifier.patch \
"
SRCREV = "3bf6ee1a02334386d87cfe356c3bfb0b24e1fed8"
SRC_URI = "git://gitlab.freedesktop.org/mesa/kmscube;branch=master;protocol=https"
UPSTREAM_CHECK_COMMITS = "1"
S = "${WORKDIR}/git"