From: Wang Mingyu <wangmy@fujitsu.com>
To: <openembedded-core@lists.openembedded.org>
Cc: Wang Mingyu <wangmy@fujitsu.com>
Subject: [OE-core] [PATCH] kmscube: upgrade to latest revision
Date: Mon, 5 Sep 2022 17:03:18 +0800 [thread overview]
Message-ID: <1662368601-32265-2-git-send-email-wangmy@fujitsu.com> (raw)
In-Reply-To: <1662368601-32265-1-git-send-email-wangmy@fujitsu.com>
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.
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
...common.c-do-not-use-invalid-modifier.patch | 27 ---------------
| 33 -------------------
meta/recipes-graphics/kmscube/kmscube_git.bb | 7 ++--
3 files changed, 2 insertions(+), 65 deletions(-)
delete mode 100644 meta/recipes-graphics/kmscube/kmscube/0001-drm-common.c-do-not-use-invalid-modifier.patch
delete mode 100644 meta/recipes-graphics/kmscube/kmscube/0001-texturator-Use-correct-GL-extension-header.patch
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 @@
-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]);
- }
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 @@
-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
-
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"
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"
--
2.25.1
next prev parent reply other threads:[~2022-09-05 9:03 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-05 9:03 [OE-core] [PATCH] cracklib: upgrade 2.9.7 -> 2.9.8 Wang Mingyu
2022-09-05 9:03 ` Wang Mingyu [this message]
2022-09-05 9:03 ` [OE-core] [PATCH] mesa: upgrade 22.1.6 -> 22.1.7 Wang Mingyu
2022-09-05 9:03 ` [OE-core] [PATCH] piglit: upgrade to latest revision Wang Mingyu
2022-09-05 9:03 ` [OE-core] [PATCH] python3-dtschema: upgrade 2022.8.1 -> 2022.8.3 Wang Mingyu
-- strict thread matches above, loose matches on Subject: below --
2023-12-26 12:38 [PATCH] kmscube: Upgrade to latest revision Fabio Estevam
2024-01-08 16:21 ` [OE-core] " Martin Jansa
2024-01-08 17:01 ` Fabio Estevam
2024-01-08 17:25 ` Martin Jansa
2024-01-08 18:01 ` Fabio Estevam
2024-09-27 10:30 [oe-core][PATCH] " Purushottam Choudhary
2024-09-27 10:53 Purushottam Choudhary
2024-09-27 11:18 ` Quentin Schulz
2024-09-27 14:17 ` Purushottam Kumar
2024-09-27 14:25 ` Quentin Schulz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1662368601-32265-2-git-send-email-wangmy@fujitsu.com \
--to=wangmy@fujitsu.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.