Skip to contentSkip to conversation

kmscube: Change header file to <GLES3/gl3.h>

PATCH New Fabio Estevam 1 participant 2 messages Jan 9, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 kmscube: Change header file to <GLES3/gl3.h>

From: Fabio Estevam <[email protected]>

Since kmscube commit 96d63eb59e34 ("kmscube: Add gears mode"), kmscube fails to build on platforms without <GL/gl.h>.

Fix it by changing the header file to <GLES3/gl3.h>.

---
 ...rs-Change-header-file-to-GLES3-gl3.h.patch | 33 +++++++++++++++++++
 meta/recipes-graphics/kmscube/kmscube_git.bb  |  4 ++-
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-graphics/kmscube/kmscube/0001-cube-gears-Change-header-file-to-GLES3-gl3.h.patch
meta/recipes-graphics/kmscube/kmscube/0001-cube-gears-Change-header-file-to-GLES3-gl3.h.patch new file +33 -0
new file mode 100644
index 0000000000..6843a662f4
@@ -0,0 +1,33 @@
+From 0651c4edc9909832ff2acbbf170268f34e36616d Mon Sep 17 00:00:00 2001
+From: Fabio Estevam <[email protected]>
+Date: Mon, 8 Jan 2024 15:00:01 -0300
+Subject: [PATCH] cube-gears: Change header file to <GLES3/gl3.h>
+
+Since commit 96d63eb59e34 ("kmscube: Add gears mode"), kmscube fails
+to build on platforms without <GL/gl.h>.
+
+Fix it by changing the header file to <GLES3/gl3.h>.
+
+Reported-by: Martin Jansa <[email protected]>
+Suggested-by: Martin Jansa <[email protected]>
+Signed-off-by: Fabio Estevam <[email protected]>
+Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/kmscube/-/merge_requests/51]
+---
+ cube-gears.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cube-gears.c b/cube-gears.c
+index d5b7a5f9cbef..cb538ecc4aee 100644
+--- a/cube-gears.c
++++ b/cube-gears.c
+@@ -31,7 +31,7 @@
+ #include <sys/time.h>
+ #include <math.h>
+
+-#include <GL/gl.h>
++#include <GLES3/gl3.h>
+
+ #include "common.h"
+ #include "esUtil.h"
+--
+2.34.1
meta/recipes-graphics/kmscube/kmscube_git.bb +3 -1
index aab582281a..63f29fd169 100644
@@ -11,7 +11,9 @@ DEPENDS = "virtual/libgles3 virtual/libgles2 virtual/egl libdrm virtual/libgbm"
 LIC_FILES_CHKSUM = "file://kmscube.c;beginline=1;endline=23;md5=8b309d4ee67b7315ff7381270dd631fb"
 
 SRCREV = "96d63eb59e34c647cda1cbb489265f8c536ae055"
-SRC_URI = "git://gitlab.freedesktop.org/mesa/kmscube;branch=master;protocol=https"
+SRC_URI = "git://gitlab.freedesktop.org/mesa/kmscube;branch=master;protocol=https \
+           file://0001-cube-gears-Change-header-file-to-GLES3-gl3.h.patch \
+           "
 
 UPSTREAM_CHECK_COMMITS = "1"
 
Signature · 1 line
2.37.3
#1 lore raw

PATCH 2/2 kmscube: Add package version

From: Fabio Estevam <[email protected]>

kmscube meson.build passes version : '0.0.1', so add a package version entry to match.

---
 meta/recipes-graphics/kmscube/kmscube_git.bb | 3 +++
 1 file changed, 3 insertions(+)
meta/recipes-graphics/kmscube/kmscube_git.bb +3 -0
index 63f29fd169..505acb024b 100644
@@ -19,6 +19,9 @@ UPSTREAM_CHECK_COMMITS = "1"
 
 S = "${WORKDIR}/git"
 
+BASEPV = "0.0.1"
+PV = "${BASEPV}+git"
+
 inherit meson pkgconfig features_check
 
 REQUIRED_DISTRO_FEATURES = "opengl"
Signature · 1 line
2.37.3