Skip to contentSkip to conversation

kmscube: Upgrade to latest revision

PATCH In review Fabio Estevam 2 participants 5 messages Dec 26, 2023 – Jan 8, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kmscube: Upgrade to latest revision

From: Fabio Estevam <[email protected]>

Upgrade to the latest kmscube revision.

---
 meta/recipes-graphics/kmscube/kmscube_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/kmscube/kmscube_git.bb +1 -1
index 4cdc0f06bb8b..aab582281ac3 100644
@@ -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"
Signature · 1 line
2.34.1
#1 lore raw

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,

Quoted 41 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

Upgrade to the latest kmscube revision.

---
 meta/recipes-graphics/kmscube/kmscube_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/kmscube/kmscube_git.bb +0 -0
index 4cdc0f06bb8b..aab582281ac3 100644
@@ -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"

meta/recipes-graphics/kmscube/kmscube_git.bb +1 -1
-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: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#2 lore raw

Hi Martin,

Quoted 4 lines · Martin Jansa

Hi,

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

Yes, I can do that.

Quoted 7 lines

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

Quoted 6 lines

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?

meta/recipes-graphics/kmscube/kmscube_git.bb +1 -1
@@ -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

#3 lore raw
Quoted 41 lines · Fabio Estevam

Hi Martin,

Quoted 4 lines · Martin Jansa

Hi,

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

version : '0.0.1'

Yes, I can do that.

Quoted 1 line

The last commit from the new 3 is causing build failure on some setups

without GL/gl.h:

Quoted 2 lines

kmscube/git/git $ git log --oneline

ea6c5d1eeefbfb0a1c27ab74a6e4621f1d9adf4c..96d63eb59e34c647cda1cbb489265f8c536ae055

Quoted 10 lines

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?

meta/recipes-graphics/kmscube/kmscube_git.bb +0 -1
@@ -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"

Quoted 4 lines

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).

#4 lore raw
Quoted 1 line · Martin Jansa

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.