[dunfell/master][PATCH v2] kmscube: enable gles3 targets conditionally

[dunfell/master][PATCH v2] kmscube: enable gles3 targets conditionally

[Gowtham Tammana]

Patch kmscube to enable gles3 targets conditionally, as not all glesv2
targets support glesv3.

Signed-off-by: Gowtham Tammana <g-tammana@ti.com>
---
v2
  - %s/APPEND/apend

 .../0001-meson-check-for-gles3-support.patch  | 50 +++++++++++++++++++
 .../kmscube/kmscube_%.bbappend                |  7 +++
 2 files changed, 57 insertions(+)
 create mode 100644 meta-arago-distro/recipes-graphics/kmscube/kmscube/0001-meson-check-for-gles3-support.patch
 create mode 100644 meta-arago-distro/recipes-graphics/kmscube/kmscube_%.bbappend

diff --git a/meta-arago-distro/recipes-graphics/kmscube/kmscube/0001-meson-check-for-gles3-support.patch b/meta-arago-distro/recipes-graphics/kmscube/kmscube/0001-meson-check-for-gles3-support.patch
new file mode 100644
index 00000000..1ebeee07
--- /dev/null
+++ b/meta-arago-distro/recipes-graphics/kmscube/kmscube/0001-meson-check-for-gles3-support.patch
@@ -0,0 +1,50 @@
+From 9f7efd751a3cdceaeefa6c215a81aa6368857e40 Mon Sep 17 00:00:00 2001
+From: Gowtham Tammana <g-tammana@ti.com>
+Date: Mon, 28 Sep 2020 21:15:52 -0500
+Subject: [PATCH] meson: check for gles3 support
+
+Some cores don't support gles3, so compile gles3 targets
+conditionally.
+
+Upstream-Status: Pending
+
+Signed-off-by: Gowtham Tammana <g-tammana@ti.com>
+---
+ meson.build | 22 +++++++++++++++-------
+ 1 file changed, 15 insertions(+), 7 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index df9c315..8bba902 100644
+--- a/meson.build
++++ b/meson.build
+@@ -91,12 +91,20 @@ else
+   message('Building without gstreamer support')
+ endif
+ 
+-executable('kmscube', sources, dependencies : dep_common, install : true)
++# GLES3 check
++gles3_h = false
++if dep_gles2.found()
++  gles3_h = cc.has_header('GLES3/gl3.h', dependencies: dep_gles2)
++endif
+ 
++executable('kmscube', sources, dependencies : dep_common, install : true)
+ 
+-executable('texturator', files(
+-	'common.c',
+-	'drm-legacy.c',
+-	'drm-common.c',
+-	'texturator.c',
+-), dependencies : dep_common, install : true)
++if gles3_h
++  message('Building with GLES3 support')
++  executable('texturator', files(
++    'common.c',
++    'drm-legacy.c',
++    'drm-common.c',
++    'texturator.c',
++  ), dependencies : dep_common, install : true)
++endif
+-- 
+2.17.1
+
diff --git a/meta-arago-distro/recipes-graphics/kmscube/kmscube_%.bbappend b/meta-arago-distro/recipes-graphics/kmscube/kmscube_%.bbappend
new file mode 100644
index 00000000..d11012a8
--- /dev/null
+++ b/meta-arago-distro/recipes-graphics/kmscube/kmscube_%.bbappend
@@ -0,0 +1,7 @@
+FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
+
+SRC_URI += " \
+file://0001-meson-check-for-gles3-support.patch \
+"
+
+PR_append = ".arago1"
-- 
2.28.0

Re: [dunfell/master][PATCH v2] kmscube: enable gles3 targets conditionally

[Denys Dmytriyenko]

On Tue, Sep 29, 2020 at 01:47:00PM -0500, Gowtham Tammana wrote:
> Patch kmscube to enable gles3 targets conditionally, as not all glesv2
> targets support glesv3.
> 
> Signed-off-by: Gowtham Tammana <g-tammana@ti.com>

Reviewed-by: Denys Dmytriyenko <denys@ti.com>


> ---
> v2
>   - %s/APPEND/apend
> 
>  .../0001-meson-check-for-gles3-support.patch  | 50 +++++++++++++++++++
>  .../kmscube/kmscube_%.bbappend                |  7 +++
>  2 files changed, 57 insertions(+)
>  create mode 100644 meta-arago-distro/recipes-graphics/kmscube/kmscube/0001-meson-check-for-gles3-support.patch
>  create mode 100644 meta-arago-distro/recipes-graphics/kmscube/kmscube_%.bbappend
> 
> diff --git a/meta-arago-distro/recipes-graphics/kmscube/kmscube/0001-meson-check-for-gles3-support.patch b/meta-arago-distro/recipes-graphics/kmscube/kmscube/0001-meson-check-for-gles3-support.patch
> new file mode 100644
> index 00000000..1ebeee07
> --- /dev/null
> +++ b/meta-arago-distro/recipes-graphics/kmscube/kmscube/0001-meson-check-for-gles3-support.patch
> @@ -0,0 +1,50 @@
> +From 9f7efd751a3cdceaeefa6c215a81aa6368857e40 Mon Sep 17 00:00:00 2001
> +From: Gowtham Tammana <g-tammana@ti.com>
> +Date: Mon, 28 Sep 2020 21:15:52 -0500
> +Subject: [PATCH] meson: check for gles3 support
> +
> +Some cores don't support gles3, so compile gles3 targets
> +conditionally.
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Gowtham Tammana <g-tammana@ti.com>
> +---
> + meson.build | 22 +++++++++++++++-------
> + 1 file changed, 15 insertions(+), 7 deletions(-)
> +
> +diff --git a/meson.build b/meson.build
> +index df9c315..8bba902 100644
> +--- a/meson.build
> ++++ b/meson.build
> +@@ -91,12 +91,20 @@ else
> +   message('Building without gstreamer support')
> + endif
> + 
> +-executable('kmscube', sources, dependencies : dep_common, install : true)
> ++# GLES3 check
> ++gles3_h = false
> ++if dep_gles2.found()
> ++  gles3_h = cc.has_header('GLES3/gl3.h', dependencies: dep_gles2)
> ++endif
> + 
> ++executable('kmscube', sources, dependencies : dep_common, install : true)
> + 
> +-executable('texturator', files(
> +-	'common.c',
> +-	'drm-legacy.c',
> +-	'drm-common.c',
> +-	'texturator.c',
> +-), dependencies : dep_common, install : true)
> ++if gles3_h
> ++  message('Building with GLES3 support')
> ++  executable('texturator', files(
> ++    'common.c',
> ++    'drm-legacy.c',
> ++    'drm-common.c',
> ++    'texturator.c',
> ++  ), dependencies : dep_common, install : true)
> ++endif
> +-- 
> +2.17.1
> +
> diff --git a/meta-arago-distro/recipes-graphics/kmscube/kmscube_%.bbappend b/meta-arago-distro/recipes-graphics/kmscube/kmscube_%.bbappend
> new file mode 100644
> index 00000000..d11012a8
> --- /dev/null
> +++ b/meta-arago-distro/recipes-graphics/kmscube/kmscube_%.bbappend
> @@ -0,0 +1,7 @@
> +FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
> +
> +SRC_URI += " \
> +file://0001-meson-check-for-gles3-support.patch \
> +"
> +
> +PR_append = ".arago1"
> -- 
> 2.28.0
>