diff mbox series

kmscube: Upgrade to latest revision

Message ID 20231226123810.495126-1-festevam@gmail.com
State Accepted, archived
Commit 53b85cff9e7d1a7416f905c280aff3ce024fd49f
Headers show
Series kmscube: Upgrade to latest revision | expand

Commit Message

Fabio Estevam Dec. 26, 2023, 12:38 p.m. UTC
From: Fabio Estevam <festevam@denx.de>

Upgrade to the latest kmscube revision.

Signed-off-by: Fabio Estevam <festevam@denx.de>
---
 meta/recipes-graphics/kmscube/kmscube_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Martin Jansa Jan. 8, 2024, 4:21 p.m. UTC | #1
Hi,

can you please set PV to something else than "git"? meson.build
says version : '0.0.1'

The last commit from the new 3 is causing build failure on some setups
without GL/gl.h:

kmscube/git/git $ git log --oneline
ea6c5d1eeefbfb0a1c27ab74a6e4621f1d9adf4c..96d63eb59e34c647cda1cbb489265f8c536ae055
96d63eb kmscube: Add gears mode
d93842d es: Update to prepare for gears mode
b076d85 ci: enable MR pipelines

Until "96d63eb kmscube: Add gears mode" it was using only EGL:

kmscube/git/git $ git grep "gl\.h"
common.h:#include <EGL/egl.h>
cube-gears.c:#include <GL/gl.h>
esUtil.h:#include <EGL/egl.h>

Regards,

On Tue, Dec 26, 2023 at 1:38 PM Fabio Estevam <festevam@gmail.com> wrote:

> From: Fabio Estevam <festevam@denx.de>
>
> Upgrade to the latest kmscube revision.
>
> Signed-off-by: Fabio Estevam <festevam@denx.de>
> ---
>  meta/recipes-graphics/kmscube/kmscube_git.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-graphics/kmscube/kmscube_git.bb
> b/meta/recipes-graphics/kmscube/kmscube_git.bb
> index 4cdc0f06bb8b..aab582281ac3 100644
> --- a/meta/recipes-graphics/kmscube/kmscube_git.bb
> +++ b/meta/recipes-graphics/kmscube/kmscube_git.bb
> @@ -10,7 +10,7 @@ DEPENDS = "virtual/libgles3 virtual/libgles2 virtual/egl
> libdrm virtual/libgbm"
>
>  LIC_FILES_CHKSUM =
> "file://kmscube.c;beginline=1;endline=23;md5=8b309d4ee67b7315ff7381270dd631fb"
>
> -SRCREV = "ea6c5d1eeefbfb0a1c27ab74a6e4621f1d9adf4c"
> +SRCREV = "96d63eb59e34c647cda1cbb489265f8c536ae055"
>  SRC_URI = "git://
> gitlab.freedesktop.org/mesa/kmscube;branch=master;protocol=https"
>
>  UPSTREAM_CHECK_COMMITS = "1"
> --
> 2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#192910):
> https://lists.openembedded.org/g/openembedded-core/message/192910
> Mute This Topic: https://lists.openembedded.org/mt/103368830/3617156
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> martin.jansa@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
Fabio Estevam Jan. 8, 2024, 5:01 p.m. UTC | #2
Hi Martin,

On Mon, Jan 8, 2024 at 1:21 PM Martin Jansa <martin.jansa@gmail.com> wrote:
>
> Hi,
>
> can you please set PV to something else than "git"? meson.build says version : '0.0.1'

Yes, I can do that.

> The last commit from the new 3 is causing build failure on some setups without GL/gl.h:
>
> kmscube/git/git $ git log --oneline ea6c5d1eeefbfb0a1c27ab74a6e4621f1d9adf4c..96d63eb59e34c647cda1cbb489265f8c536ae055
> 96d63eb kmscube: Add gears mode
> d93842d es: Update to prepare for gears mode
> b076d85 ci: enable MR pipelines
>
> Until "96d63eb kmscube: Add gears mode" it was using only EGL:
>
> kmscube/git/git $ git grep "gl\.h"
> common.h:#include <EGL/egl.h>
> cube-gears.c:#include <GL/gl.h>
> esUtil.h:#include <EGL/egl.h>

Does the change below fix (add virtual/libgl to DEPENDS) the problem?

--- a/meta/recipes-graphics/kmscube/kmscube_git.bb
+++ b/meta/recipes-graphics/kmscube/kmscube_git.bb
@@ -6,7 +6,7 @@ OpenGL or OpenGL ES."
 HOMEPAGE = "https://cgit.freedesktop.org/mesa/kmscube/"
 LICENSE = "MIT"
 SECTION = "graphics"
-DEPENDS = "virtual/libgles3 virtual/libgles2 virtual/egl libdrm virtual/libgbm"
+DEPENDS = "virtual/libgles3 virtual/libgles2 virtual/egl libdrm
virtual/libgbm virtual/libgl"

 LIC_FILES_CHKSUM =
"file://kmscube.c;beginline=1;endline=23;md5=8b309d4ee67b7315ff7381270dd631fb"

Thanks
Martin Jansa Jan. 8, 2024, 5:25 p.m. UTC | #3
On Mon, Jan 8, 2024 at 6:02 PM Fabio Estevam <festevam@gmail.com> wrote:

> Hi Martin,
>
> On Mon, Jan 8, 2024 at 1:21 PM Martin Jansa <martin.jansa@gmail.com>
> wrote:
> >
> > Hi,
> >
> > can you please set PV to something else than "git"? meson.build says
> version : '0.0.1'
>
> Yes, I can do that.
>
> > The last commit from the new 3 is causing build failure on some setups
> without GL/gl.h:
> >
> > kmscube/git/git $ git log --oneline
> ea6c5d1eeefbfb0a1c27ab74a6e4621f1d9adf4c..96d63eb59e34c647cda1cbb489265f8c536ae055
> > 96d63eb kmscube: Add gears mode
> > d93842d es: Update to prepare for gears mode
> > b076d85 ci: enable MR pipelines
> >
> > Until "96d63eb kmscube: Add gears mode" it was using only EGL:
> >
> > kmscube/git/git $ git grep "gl\.h"
> > common.h:#include <EGL/egl.h>
> > cube-gears.c:#include <GL/gl.h>
> > esUtil.h:#include <EGL/egl.h>
>
> Does the change below fix (add virtual/libgl to DEPENDS) the problem?
>
> --- a/meta/recipes-graphics/kmscube/kmscube_git.bb
> +++ b/meta/recipes-graphics/kmscube/kmscube_git.bb
> @@ -6,7 +6,7 @@ OpenGL or OpenGL ES."
>  HOMEPAGE = "https://cgit.freedesktop.org/mesa/kmscube/"
>  LICENSE = "MIT"
>  SECTION = "graphics"
> -DEPENDS = "virtual/libgles3 virtual/libgles2 virtual/egl libdrm
> virtual/libgbm"
> +DEPENDS = "virtual/libgles3 virtual/libgles2 virtual/egl libdrm
> virtual/libgbm virtual/libgl"
>
>  LIC_FILES_CHKSUM =
>
> "file://kmscube.c;beginline=1;endline=23;md5=8b309d4ee67b7315ff7381270dd631fb"
>

On this platform it doesn't as GL/gl.h is not available, but it builds fine
after replacing GL/gl.h with GLES3/gl3.h (for GL_DEPTH24_STENCIL8).
Fabio Estevam Jan. 8, 2024, 6:01 p.m. UTC | #4
On Mon, Jan 8, 2024 at 2:26 PM Martin Jansa <martin.jansa@gmail.com> wrote:

> On this platform it doesn't as GL/gl.h is not available, but it builds fine after replacing GL/gl.h with GLES3/gl3.h (for GL_DEPTH24_STENCIL8).

Thanks for the suggestion. I will send a fix upstream.
diff mbox series

Patch

diff --git a/meta/recipes-graphics/kmscube/kmscube_git.bb b/meta/recipes-graphics/kmscube/kmscube_git.bb
index 4cdc0f06bb8b..aab582281ac3 100644
--- a/meta/recipes-graphics/kmscube/kmscube_git.bb
+++ b/meta/recipes-graphics/kmscube/kmscube_git.bb
@@ -10,7 +10,7 @@  DEPENDS = "virtual/libgles3 virtual/libgles2 virtual/egl libdrm virtual/libgbm"
 
 LIC_FILES_CHKSUM = "file://kmscube.c;beginline=1;endline=23;md5=8b309d4ee67b7315ff7381270dd631fb"
 
-SRCREV = "ea6c5d1eeefbfb0a1c27ab74a6e4621f1d9adf4c"
+SRCREV = "96d63eb59e34c647cda1cbb489265f8c536ae055"
 SRC_URI = "git://gitlab.freedesktop.org/mesa/kmscube;branch=master;protocol=https"
 
 UPSTREAM_CHECK_COMMITS = "1"