* [PATCH 0/4] Enable GTK+3
@ 2018-08-21 19:29 Eric Ruei
2018-08-21 19:29 ` [PATCH 1/4] gtk+3: update wayland dependency and add patches Eric Ruei
` (3 more replies)
0 siblings, 4 replies; 13+ messages in thread
From: Eric Ruei @ 2018-08-21 19:29 UTC (permalink / raw)
To: meta-arago
Enable GTK+3
Eric Ruei (4):
gtk+3: update wayland dependency and add patches
packagegroup-arago-gtk: add package group files for GTK
tisdk-roofs-image: add the GTK packagegroup
packagegroup-arago-toolchain-tidsk-target: add GTK packagegroup
.../recipes-core/images/tisdk-rootfs-image.bb | 1 +
.../packagegroup-arago-gtk-sdk-target.bb | 11 ++++
.../packagegroups/packagegroup-arago-tisdk-gtk.bb | 20 +++++++
.../packagegroup-arago-toolchain-tisdk-target.bb | 9 +++-
...t-wayland.c-cleanup-the-parameters-of-egl.patch | 61 ++++++++++++++++++++++
.../recipes-gnome/gtk+/gtk+3_%.bbappend | 10 ++++
6 files changed, 111 insertions(+), 1 deletion(-)
create mode 100644 meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gtk-sdk-target.bb
create mode 100644 meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-gtk.bb
create mode 100644 meta-arago-distro/recipes-gnome/gtk+/gtk+3/0001-gdkglcontext-wayland.c-cleanup-the-parameters-of-egl.patch
create mode 100644 meta-arago-distro/recipes-gnome/gtk+/gtk+3_%.bbappend
--
1.9.1
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 1/4] gtk+3: update wayland dependency and add patches
2018-08-21 19:29 [PATCH 0/4] Enable GTK+3 Eric Ruei
@ 2018-08-21 19:29 ` Eric Ruei
2018-08-21 19:48 ` Denys Dmytriyenko
2018-08-21 19:29 ` [PATCH 2/4] packagegroup-arago-gtk: add package group files for GTK Eric Ruei
` (2 subsequent siblings)
3 siblings, 1 reply; 13+ messages in thread
From: Eric Ruei @ 2018-08-21 19:29 UTC (permalink / raw)
To: meta-arago
- replace wayland dependency mesa with virtual/egl
- patch to fix egl API calls for GLES2
Signed-off-by: Eric Ruei <e-ruei1@ti.com>
---
...t-wayland.c-cleanup-the-parameters-of-egl.patch | 61 ++++++++++++++++++++++
.../recipes-gnome/gtk+/gtk+3_%.bbappend | 10 ++++
2 files changed, 71 insertions(+)
create mode 100644 meta-arago-distro/recipes-gnome/gtk+/gtk+3/0001-gdkglcontext-wayland.c-cleanup-the-parameters-of-egl.patch
create mode 100644 meta-arago-distro/recipes-gnome/gtk+/gtk+3_%.bbappend
diff --git a/meta-arago-distro/recipes-gnome/gtk+/gtk+3/0001-gdkglcontext-wayland.c-cleanup-the-parameters-of-egl.patch b/meta-arago-distro/recipes-gnome/gtk+/gtk+3/0001-gdkglcontext-wayland.c-cleanup-the-parameters-of-egl.patch
new file mode 100644
index 0000000..174dbdd
--- /dev/null
+++ b/meta-arago-distro/recipes-gnome/gtk+/gtk+3/0001-gdkglcontext-wayland.c-cleanup-the-parameters-of-egl.patch
@@ -0,0 +1,61 @@
+From d4c8511b845de02271b6dcf57a6edbf01f3f1905 Mon Sep 17 00:00:00 2001
+From: Eric Ruei <e-ruei1@ti.com>
+Date: Tue, 21 Aug 2018 11:07:13 -0400
+Subject: [PATCH] gdkglcontext-wayland.c: cleanup the parameters of egl API
+ calls when GLES is used
+
+eglBindAPI: use EGL_OPENGL_ES_API instead of EGL_OPENGL_API
+eglChooseConfig: need to specify EGL_OPENGL_ES2_BIT as EGL_RENDERABLE_TYPE
+
+Upstream-Status: Pending
+
+Signed-off-by: Eric Ruei <e-ruei1@ti.com>
+---
+ gdk/wayland/gdkglcontext-wayland.c | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/gdk/wayland/gdkglcontext-wayland.c b/gdk/wayland/gdkglcontext-wayland.c
+index 254900d..3361eb3 100644
+--- a/gdk/wayland/gdkglcontext-wayland.c
++++ b/gdk/wayland/gdkglcontext-wayland.c
+@@ -314,6 +314,7 @@ gdk_wayland_display_init_gl (GdkDisplay *display)
+ GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (display);
+ EGLint major, minor;
+ EGLDisplay dpy;
++ gboolean use_es = (_gdk_gl_flags & GDK_GL_GLES) != 0 ;
+
+ if (display_wayland->have_egl)
+ return TRUE;
+@@ -326,7 +327,7 @@ gdk_wayland_display_init_gl (GdkDisplay *display)
+ if (!eglInitialize (dpy, &major, &minor))
+ return FALSE;
+
+- if (!eglBindAPI (EGL_OPENGL_API))
++ if (!eglBindAPI (use_es?EGL_OPENGL_ES_API:EGL_OPENGL_API))
+ return FALSE;
+
+ display_wayland->egl_display = dpy;
+@@ -379,6 +380,7 @@ find_eglconfig_for_window (GdkWindow *window,
+ EGLint count;
+ EGLConfig *configs, chosen_config;
+ gboolean use_rgba;
++ gboolean use_es = (_gdk_gl_flags & GDK_GL_GLES) != 0 ;
+
+ int i = 0;
+
+@@ -395,6 +397,12 @@ find_eglconfig_for_window (GdkWindow *window,
+ attrs[i++] = EGL_BLUE_SIZE;
+ attrs[i++] = 1;
+
++ if (use_es)
++ {
++ attrs[i++] = EGL_RENDERABLE_TYPE;
++ attrs[i++] = EGL_OPENGL_ES2_BIT;
++ }
++
+ use_rgba = (visual == gdk_screen_get_rgba_visual (gdk_display_get_default_screen (display)));
+
+ if (use_rgba)
+--
+1.9.1
+
diff --git a/meta-arago-distro/recipes-gnome/gtk+/gtk+3_%.bbappend b/meta-arago-distro/recipes-gnome/gtk+/gtk+3_%.bbappend
new file mode 100644
index 0000000..d3fe505
--- /dev/null
+++ b/meta-arago-distro/recipes-gnome/gtk+/gtk+3_%.bbappend
@@ -0,0 +1,10 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,wayland wayland-protocols libxkbcommon virtual/egl wayland-native"
+GTKGLIBC_RRECOMMENDS = "${GTKBASE_RRECOMMENDS}"
+
+PR_append = ".arago0"
+
+SRC_URI += "\
+ file://0001-gdkglcontext-wayland.c-cleanup-the-parameters-of-egl.patch \
+"
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 2/4] packagegroup-arago-gtk: add package group files for GTK
2018-08-21 19:29 [PATCH 0/4] Enable GTK+3 Eric Ruei
2018-08-21 19:29 ` [PATCH 1/4] gtk+3: update wayland dependency and add patches Eric Ruei
@ 2018-08-21 19:29 ` Eric Ruei
2018-08-21 19:29 ` [PATCH 3/4] tisdk-roofs-image: add the GTK packagegroup Eric Ruei
2018-08-21 19:29 ` [PATCH 4/4] packagegroup-arago-toolchain-tidsk-target: add " Eric Ruei
3 siblings, 0 replies; 13+ messages in thread
From: Eric Ruei @ 2018-08-21 19:29 UTC (permalink / raw)
To: meta-arago
Signed-off-by: Eric Ruei <e-ruei1@ti.com>
---
.../packagegroup-arago-gtk-sdk-target.bb | 11 +++++++++++
.../packagegroups/packagegroup-arago-tisdk-gtk.bb | 20 ++++++++++++++++++++
2 files changed, 31 insertions(+)
create mode 100644 meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gtk-sdk-target.bb
create mode 100644 meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-gtk.bb
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gtk-sdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gtk-sdk-target.bb
new file mode 100644
index 0000000..a72e425
--- /dev/null
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gtk-sdk-target.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Task to install Gtk dev packages in SDK"
+LICENSE = "MIT"
+PR = "r0"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+inherit packagegroup
+
+RDEPENDS_${PN} = "\
+ gtk+3-dev \
+"
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-gtk.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-gtk.bb
new file mode 100644
index 0000000..f2f76bf
--- /dev/null
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-gtk.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "Task to add Gtk embedded related packages"
+LICENSE = "MIT"
+PR = "r0"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+inherit packagegroup
+
+GTK = "\
+ gtk+3 \
+"
+
+GTK_DEMOS = "\
+ gtk+3-demo \
+"
+
+RDEPENDS_${PN} = "\
+ ${GTK} \
+ ${GTK_DEMOS} \
+"
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 3/4] tisdk-roofs-image: add the GTK packagegroup
2018-08-21 19:29 [PATCH 0/4] Enable GTK+3 Eric Ruei
2018-08-21 19:29 ` [PATCH 1/4] gtk+3: update wayland dependency and add patches Eric Ruei
2018-08-21 19:29 ` [PATCH 2/4] packagegroup-arago-gtk: add package group files for GTK Eric Ruei
@ 2018-08-21 19:29 ` Eric Ruei
2018-08-21 19:49 ` Denys Dmytriyenko
2018-08-21 19:29 ` [PATCH 4/4] packagegroup-arago-toolchain-tidsk-target: add " Eric Ruei
3 siblings, 1 reply; 13+ messages in thread
From: Eric Ruei @ 2018-08-21 19:29 UTC (permalink / raw)
To: meta-arago
Signed-off-by: Eric Ruei <e-ruei1@ti.com>
---
meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb b/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
index e40dc1f..a86691d 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
+++ b/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
@@ -9,6 +9,7 @@ IMAGE_INSTALL += "\
packagegroup-arago-test \
packagegroup-arago-test-addons \
${@bb.utils.contains('MACHINE_FEATURES','sgx','packagegroup-arago-tisdk-graphics','',d)} \
+ packagegroup-arago-tisdk-gtk \
packagegroup-arago-tisdk-qte \
${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl','',d)} \
${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl-extra','',d)} \
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 4/4] packagegroup-arago-toolchain-tidsk-target: add GTK packagegroup
2018-08-21 19:29 [PATCH 0/4] Enable GTK+3 Eric Ruei
` (2 preceding siblings ...)
2018-08-21 19:29 ` [PATCH 3/4] tisdk-roofs-image: add the GTK packagegroup Eric Ruei
@ 2018-08-21 19:29 ` Eric Ruei
3 siblings, 0 replies; 13+ messages in thread
From: Eric Ruei @ 2018-08-21 19:29 UTC (permalink / raw)
To: meta-arago
Signed-off-by: Eric Ruei <e-ruei1@ti.com>
---
.../packagegroups/packagegroup-arago-toolchain-tisdk-target.bb | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-toolchain-tisdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-toolchain-tisdk-target.bb
index 52e3456..75c190d 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-toolchain-tisdk-target.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-toolchain-tisdk-target.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Task to build and install header and libs into the sdk"
LICENSE = "MIT"
-PR = "r12"
+PR = "r13"
PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -12,6 +12,12 @@ QT_TOOLCHAIN_TARGET = "\
QT_TOOLCHAIN_TARGET_keystone = ""
QT_TOOLCHAIN_TARGET_omapl138 = ""
+GTK_TOOLCHAIN_TARGET = "\
+ packagegroup-arago-gtk-sdk-target \
+"
+GTK_TOOLCHAIN_TARGET_keystone = ""
+GTK_TOOLCHAIN_TARGET_omapl138 = ""
+
TISDK_TOOLCHAIN_BASE_TARGET = "\
packagegroup-arago-standalone-sdk-target \
packagegroup-arago-tisdk-multimedia-sdk-target \
@@ -26,6 +32,7 @@ TISDK_TOOLCHAIN_EXTRA_TARGET_omapl138 = ""
RDEPENDS_${PN} = "\
${QT_TOOLCHAIN_TARGET} \
+ ${GTK_TOOLCHAIN_TARGET} \
${TISDK_TOOLCHAIN_BASE_TARGET} \
${TISDK_TOOLCHAIN_EXTRA_TARGET} \
${@bb.utils.contains('MACHINE_FEATURES','sgx','packagegroup-arago-tisdk-graphics-sdk-target','',d)} \
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH 1/4] gtk+3: update wayland dependency and add patches
2018-08-21 19:29 ` [PATCH 1/4] gtk+3: update wayland dependency and add patches Eric Ruei
@ 2018-08-21 19:48 ` Denys Dmytriyenko
2018-08-21 20:38 ` Ruei, Eric
0 siblings, 1 reply; 13+ messages in thread
From: Denys Dmytriyenko @ 2018-08-21 19:48 UTC (permalink / raw)
To: Eric Ruei; +Cc: meta-arago
On Tue, Aug 21, 2018 at 03:29:25PM -0400, Eric Ruei wrote:
> - replace wayland dependency mesa with virtual/egl
In the past we were using libgbm instead of virtual/egl
http://arago-project.org/git/?p=meta-arago.git;a=blob;f=meta-arago-distro/recipes-graphics/wayland/weston_4.0.0.bbappend;hb=HEAD
http://arago-project.org/git/?p=meta-arago.git;a=blob;f=meta-arago-distro/recipes-gnome/gtk%2B/gtk%2B3_%25.bbappend;hb=HEAD
> - patch to fix egl API calls for GLES2
>
> Signed-off-by: Eric Ruei <e-ruei1@ti.com>
> ---
> ...t-wayland.c-cleanup-the-parameters-of-egl.patch | 61 ++++++++++++++++++++++
> .../recipes-gnome/gtk+/gtk+3_%.bbappend | 10 ++++
> 2 files changed, 71 insertions(+)
> create mode 100644 meta-arago-distro/recipes-gnome/gtk+/gtk+3/0001-gdkglcontext-wayland.c-cleanup-the-parameters-of-egl.patch
> create mode 100644 meta-arago-distro/recipes-gnome/gtk+/gtk+3_%.bbappend
>
> diff --git a/meta-arago-distro/recipes-gnome/gtk+/gtk+3/0001-gdkglcontext-wayland.c-cleanup-the-parameters-of-egl.patch b/meta-arago-distro/recipes-gnome/gtk+/gtk+3/0001-gdkglcontext-wayland.c-cleanup-the-parameters-of-egl.patch
> new file mode 100644
> index 0000000..174dbdd
> --- /dev/null
> +++ b/meta-arago-distro/recipes-gnome/gtk+/gtk+3/0001-gdkglcontext-wayland.c-cleanup-the-parameters-of-egl.patch
> @@ -0,0 +1,61 @@
> +From d4c8511b845de02271b6dcf57a6edbf01f3f1905 Mon Sep 17 00:00:00 2001
> +From: Eric Ruei <e-ruei1@ti.com>
> +Date: Tue, 21 Aug 2018 11:07:13 -0400
> +Subject: [PATCH] gdkglcontext-wayland.c: cleanup the parameters of egl API
> + calls when GLES is used
> +
> +eglBindAPI: use EGL_OPENGL_ES_API instead of EGL_OPENGL_API
> +eglChooseConfig: need to specify EGL_OPENGL_ES2_BIT as EGL_RENDERABLE_TYPE
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Eric Ruei <e-ruei1@ti.com>
> +---
> + gdk/wayland/gdkglcontext-wayland.c | 10 +++++++++-
> + 1 file changed, 9 insertions(+), 1 deletion(-)
> +
> +diff --git a/gdk/wayland/gdkglcontext-wayland.c b/gdk/wayland/gdkglcontext-wayland.c
> +index 254900d..3361eb3 100644
> +--- a/gdk/wayland/gdkglcontext-wayland.c
> ++++ b/gdk/wayland/gdkglcontext-wayland.c
> +@@ -314,6 +314,7 @@ gdk_wayland_display_init_gl (GdkDisplay *display)
> + GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (display);
> + EGLint major, minor;
> + EGLDisplay dpy;
> ++ gboolean use_es = (_gdk_gl_flags & GDK_GL_GLES) != 0 ;
> +
> + if (display_wayland->have_egl)
> + return TRUE;
> +@@ -326,7 +327,7 @@ gdk_wayland_display_init_gl (GdkDisplay *display)
> + if (!eglInitialize (dpy, &major, &minor))
> + return FALSE;
> +
> +- if (!eglBindAPI (EGL_OPENGL_API))
> ++ if (!eglBindAPI (use_es?EGL_OPENGL_ES_API:EGL_OPENGL_API))
> + return FALSE;
> +
> + display_wayland->egl_display = dpy;
> +@@ -379,6 +380,7 @@ find_eglconfig_for_window (GdkWindow *window,
> + EGLint count;
> + EGLConfig *configs, chosen_config;
> + gboolean use_rgba;
> ++ gboolean use_es = (_gdk_gl_flags & GDK_GL_GLES) != 0 ;
> +
> + int i = 0;
> +
> +@@ -395,6 +397,12 @@ find_eglconfig_for_window (GdkWindow *window,
> + attrs[i++] = EGL_BLUE_SIZE;
> + attrs[i++] = 1;
> +
> ++ if (use_es)
> ++ {
> ++ attrs[i++] = EGL_RENDERABLE_TYPE;
> ++ attrs[i++] = EGL_OPENGL_ES2_BIT;
> ++ }
> ++
> + use_rgba = (visual == gdk_screen_get_rgba_visual (gdk_display_get_default_screen (display)));
> +
> + if (use_rgba)
> +--
> +1.9.1
> +
> diff --git a/meta-arago-distro/recipes-gnome/gtk+/gtk+3_%.bbappend b/meta-arago-distro/recipes-gnome/gtk+/gtk+3_%.bbappend
> new file mode 100644
> index 0000000..d3fe505
> --- /dev/null
> +++ b/meta-arago-distro/recipes-gnome/gtk+/gtk+3_%.bbappend
> @@ -0,0 +1,10 @@
> +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> +
> +PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,wayland wayland-protocols libxkbcommon virtual/egl wayland-native"
> +GTKGLIBC_RRECOMMENDS = "${GTKBASE_RRECOMMENDS}"
> +
> +PR_append = ".arago0"
> +
> +SRC_URI += "\
> + file://0001-gdkglcontext-wayland.c-cleanup-the-parameters-of-egl.patch \
> +"
> --
> 1.9.1
>
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 3/4] tisdk-roofs-image: add the GTK packagegroup
2018-08-21 19:29 ` [PATCH 3/4] tisdk-roofs-image: add the GTK packagegroup Eric Ruei
@ 2018-08-21 19:49 ` Denys Dmytriyenko
2018-08-21 20:39 ` Ruei, Eric
0 siblings, 1 reply; 13+ messages in thread
From: Denys Dmytriyenko @ 2018-08-21 19:49 UTC (permalink / raw)
To: Eric Ruei; +Cc: meta-arago
On Tue, Aug 21, 2018 at 03:29:27PM -0400, Eric Ruei wrote:
> Signed-off-by: Eric Ruei <e-ruei1@ti.com>
> ---
> meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb b/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
> index e40dc1f..a86691d 100644
> --- a/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
> +++ b/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
> @@ -9,6 +9,7 @@ IMAGE_INSTALL += "\
> packagegroup-arago-test \
> packagegroup-arago-test-addons \
> ${@bb.utils.contains('MACHINE_FEATURES','sgx','packagegroup-arago-tisdk-graphics','',d)} \
> + packagegroup-arago-tisdk-gtk \
Since you made gtk+ dependent on egl, you probably also need to check sgx flag?
> packagegroup-arago-tisdk-qte \
> ${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl','',d)} \
> ${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl-extra','',d)} \
> --
> 1.9.1
>
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 1/4] gtk+3: update wayland dependency and add patches
2018-08-21 19:48 ` Denys Dmytriyenko
@ 2018-08-21 20:38 ` Ruei, Eric
2018-08-21 21:00 ` Denys Dmytriyenko
0 siblings, 1 reply; 13+ messages in thread
From: Ruei, Eric @ 2018-08-21 20:38 UTC (permalink / raw)
To: Denys Dmytriyenko, Eric Ruei; +Cc: meta-arago
On 8/21/2018 3:48 PM, Denys Dmytriyenko wrote:
> On Tue, Aug 21, 2018 at 03:29:25PM -0400, Eric Ruei wrote:
>> - replace wayland dependency mesa with virtual/egl
>
> In the past we were using libgbm instead of virtual/egl
> http://arago-project.org/git/?p=meta-arago.git;a=blob;f=meta-arago-distro/recipes-graphics/wayland/weston_4.0.0.bbappend;hb=HEAD
> http://arago-project.org/git/?p=meta-arago.git;a=blob;f=meta-arago-distro/recipes-gnome/gtk%2B/gtk%2B3_%25.bbappend;hb=HEAD
>
>
Denys: It does not make sense, virtual/egl replaces virtual/mesa, GTK
will be a wayland-client and uses wayland-egl which does not depends on
libgbm. The drm-backend of Weston compositor does depend on libgbm.
>> - patch to fix egl API calls for GLES2
>>
>> Signed-off-by: Eric Ruei <e-ruei1@ti.com>
>> ---
>> ...t-wayland.c-cleanup-the-parameters-of-egl.patch | 61 ++++++++++++++++++++++
>> .../recipes-gnome/gtk+/gtk+3_%.bbappend | 10 ++++
>> 2 files changed, 71 insertions(+)
>> create mode 100644 meta-arago-distro/recipes-gnome/gtk+/gtk+3/0001-gdkglcontext-wayland.c-cleanup-the-parameters-of-egl.patch
>> create mode 100644 meta-arago-distro/recipes-gnome/gtk+/gtk+3_%.bbappend
>>
>> diff --git a/meta-arago-distro/recipes-gnome/gtk+/gtk+3/0001-gdkglcontext-wayland.c-cleanup-the-parameters-of-egl.patch b/meta-arago-distro/recipes-gnome/gtk+/gtk+3/0001-gdkglcontext-wayland.c-cleanup-the-parameters-of-egl.patch
>> new file mode 100644
>> index 0000000..174dbdd
>> --- /dev/null
>> +++ b/meta-arago-distro/recipes-gnome/gtk+/gtk+3/0001-gdkglcontext-wayland.c-cleanup-the-parameters-of-egl.patch
>> @@ -0,0 +1,61 @@
>> +From d4c8511b845de02271b6dcf57a6edbf01f3f1905 Mon Sep 17 00:00:00 2001
>> +From: Eric Ruei <e-ruei1@ti.com>
>> +Date: Tue, 21 Aug 2018 11:07:13 -0400
>> +Subject: [PATCH] gdkglcontext-wayland.c: cleanup the parameters of egl API
>> + calls when GLES is used
>> +
>> +eglBindAPI: use EGL_OPENGL_ES_API instead of EGL_OPENGL_API
>> +eglChooseConfig: need to specify EGL_OPENGL_ES2_BIT as EGL_RENDERABLE_TYPE
>> +
>> +Upstream-Status: Pending
>> +
>> +Signed-off-by: Eric Ruei <e-ruei1@ti.com>
>> +---
>> + gdk/wayland/gdkglcontext-wayland.c | 10 +++++++++-
>> + 1 file changed, 9 insertions(+), 1 deletion(-)
>> +
>> +diff --git a/gdk/wayland/gdkglcontext-wayland.c b/gdk/wayland/gdkglcontext-wayland.c
>> +index 254900d..3361eb3 100644
>> +--- a/gdk/wayland/gdkglcontext-wayland.c
>> ++++ b/gdk/wayland/gdkglcontext-wayland.c
>> +@@ -314,6 +314,7 @@ gdk_wayland_display_init_gl (GdkDisplay *display)
>> + GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (display);
>> + EGLint major, minor;
>> + EGLDisplay dpy;
>> ++ gboolean use_es = (_gdk_gl_flags & GDK_GL_GLES) != 0 ;
>> +
>> + if (display_wayland->have_egl)
>> + return TRUE;
>> +@@ -326,7 +327,7 @@ gdk_wayland_display_init_gl (GdkDisplay *display)
>> + if (!eglInitialize (dpy, &major, &minor))
>> + return FALSE;
>> +
>> +- if (!eglBindAPI (EGL_OPENGL_API))
>> ++ if (!eglBindAPI (use_es?EGL_OPENGL_ES_API:EGL_OPENGL_API))
>> + return FALSE;
>> +
>> + display_wayland->egl_display = dpy;
>> +@@ -379,6 +380,7 @@ find_eglconfig_for_window (GdkWindow *window,
>> + EGLint count;
>> + EGLConfig *configs, chosen_config;
>> + gboolean use_rgba;
>> ++ gboolean use_es = (_gdk_gl_flags & GDK_GL_GLES) != 0 ;
>> +
>> + int i = 0;
>> +
>> +@@ -395,6 +397,12 @@ find_eglconfig_for_window (GdkWindow *window,
>> + attrs[i++] = EGL_BLUE_SIZE;
>> + attrs[i++] = 1;
>> +
>> ++ if (use_es)
>> ++ {
>> ++ attrs[i++] = EGL_RENDERABLE_TYPE;
>> ++ attrs[i++] = EGL_OPENGL_ES2_BIT;
>> ++ }
>> ++
>> + use_rgba = (visual == gdk_screen_get_rgba_visual (gdk_display_get_default_screen (display)));
>> +
>> + if (use_rgba)
>> +--
>> +1.9.1
>> +
>> diff --git a/meta-arago-distro/recipes-gnome/gtk+/gtk+3_%.bbappend b/meta-arago-distro/recipes-gnome/gtk+/gtk+3_%.bbappend
>> new file mode 100644
>> index 0000000..d3fe505
>> --- /dev/null
>> +++ b/meta-arago-distro/recipes-gnome/gtk+/gtk+3_%.bbappend
>> @@ -0,0 +1,10 @@
>> +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
>> +
>> +PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,wayland wayland-protocols libxkbcommon virtual/egl wayland-native"
>> +GTKGLIBC_RRECOMMENDS = "${GTKBASE_RRECOMMENDS}"
>> +
>> +PR_append = ".arago0"
>> +
>> +SRC_URI += "\
>> + file://0001-gdkglcontext-wayland.c-cleanup-the-parameters-of-egl.patch \
>> +"
>> --
>> 1.9.1
>>
>> _______________________________________________
>> meta-arago mailing list
>> meta-arago@arago-project.org
>> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 3/4] tisdk-roofs-image: add the GTK packagegroup
2018-08-21 19:49 ` Denys Dmytriyenko
@ 2018-08-21 20:39 ` Ruei, Eric
0 siblings, 0 replies; 13+ messages in thread
From: Ruei, Eric @ 2018-08-21 20:39 UTC (permalink / raw)
To: Denys Dmytriyenko, Eric Ruei; +Cc: meta-arago
On 8/21/2018 3:49 PM, Denys Dmytriyenko wrote:
> On Tue, Aug 21, 2018 at 03:29:27PM -0400, Eric Ruei wrote:
>> Signed-off-by: Eric Ruei <e-ruei1@ti.com>
>> ---
>> meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb b/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
>> index e40dc1f..a86691d 100644
>> --- a/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
>> +++ b/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
>> @@ -9,6 +9,7 @@ IMAGE_INSTALL += "\
>> packagegroup-arago-test \
>> packagegroup-arago-test-addons \
>> ${@bb.utils.contains('MACHINE_FEATURES','sgx','packagegroup-arago-tisdk-graphics','',d)} \
>> + packagegroup-arago-tisdk-gtk \
>
> Since you made gtk+ dependent on egl, you probably also need to check sgx flag?
>
Yes, you are right. I shall add the condition at V2.
>
>> packagegroup-arago-tisdk-qte \
>> ${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl','',d)} \
>> ${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl-extra','',d)} \
>> --
>> 1.9.1
>>
>> _______________________________________________
>> meta-arago mailing list
>> meta-arago@arago-project.org
>> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 1/4] gtk+3: update wayland dependency and add patches
2018-08-21 20:38 ` Ruei, Eric
@ 2018-08-21 21:00 ` Denys Dmytriyenko
2018-08-21 21:27 ` Ruei, Eric
0 siblings, 1 reply; 13+ messages in thread
From: Denys Dmytriyenko @ 2018-08-21 21:00 UTC (permalink / raw)
To: Ruei, Eric; +Cc: meta-arago
On Tue, Aug 21, 2018 at 04:38:08PM -0400, Ruei, Eric wrote:
> On 8/21/2018 3:48 PM, Denys Dmytriyenko wrote:
> >On Tue, Aug 21, 2018 at 03:29:25PM -0400, Eric Ruei wrote:
> >>- replace wayland dependency mesa with virtual/egl
> >
> >In the past we were using libgbm instead of virtual/egl
> >http://arago-project.org/git/?p=meta-arago.git;a=blob;f=meta-arago-distro/recipes-graphics/wayland/weston_4.0.0.bbappend;hb=HEAD
> >http://arago-project.org/git/?p=meta-arago.git;a=blob;f=meta-arago-distro/recipes-gnome/gtk%2B/gtk%2B3_%25.bbappend;hb=HEAD
> >
> >
> Denys: It does not make sense, virtual/egl replaces virtual/mesa, GTK will
> be a wayland-client and uses wayland-egl which does not depends on libgbm.
> The drm-backend of Weston compositor does depend on libgbm.
Well, drm-backend of Weston also originally depended on virtual/mesa:
http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-graphics/wayland/weston_2.0.0.bb?h=rocko
And we replace it with libgbm, not virtual/egl.
But if you say gtk+ really needs entire virtual/egl dependency to work with
wayland-egl, then I'm fine.
> >>- patch to fix egl API calls for GLES2
> >>
> >>Signed-off-by: Eric Ruei <e-ruei1@ti.com>
> >>---
> >> ...t-wayland.c-cleanup-the-parameters-of-egl.patch | 61 ++++++++++++++++++++++
> >> .../recipes-gnome/gtk+/gtk+3_%.bbappend | 10 ++++
> >> 2 files changed, 71 insertions(+)
> >> create mode 100644 meta-arago-distro/recipes-gnome/gtk+/gtk+3/0001-gdkglcontext-wayland.c-cleanup-the-parameters-of-egl.patch
> >> create mode 100644 meta-arago-distro/recipes-gnome/gtk+/gtk+3_%.bbappend
> >>
> >>diff --git a/meta-arago-distro/recipes-gnome/gtk+/gtk+3/0001-gdkglcontext-wayland.c-cleanup-the-parameters-of-egl.patch b/meta-arago-distro/recipes-gnome/gtk+/gtk+3/0001-gdkglcontext-wayland.c-cleanup-the-parameters-of-egl.patch
> >>new file mode 100644
> >>index 0000000..174dbdd
> >>--- /dev/null
> >>+++ b/meta-arago-distro/recipes-gnome/gtk+/gtk+3/0001-gdkglcontext-wayland.c-cleanup-the-parameters-of-egl.patch
> >>@@ -0,0 +1,61 @@
> >>+From d4c8511b845de02271b6dcf57a6edbf01f3f1905 Mon Sep 17 00:00:00 2001
> >>+From: Eric Ruei <e-ruei1@ti.com>
> >>+Date: Tue, 21 Aug 2018 11:07:13 -0400
> >>+Subject: [PATCH] gdkglcontext-wayland.c: cleanup the parameters of egl API
> >>+ calls when GLES is used
> >>+
> >>+eglBindAPI: use EGL_OPENGL_ES_API instead of EGL_OPENGL_API
> >>+eglChooseConfig: need to specify EGL_OPENGL_ES2_BIT as EGL_RENDERABLE_TYPE
> >>+
> >>+Upstream-Status: Pending
> >>+
> >>+Signed-off-by: Eric Ruei <e-ruei1@ti.com>
> >>+---
> >>+ gdk/wayland/gdkglcontext-wayland.c | 10 +++++++++-
> >>+ 1 file changed, 9 insertions(+), 1 deletion(-)
> >>+
> >>+diff --git a/gdk/wayland/gdkglcontext-wayland.c b/gdk/wayland/gdkglcontext-wayland.c
> >>+index 254900d..3361eb3 100644
> >>+--- a/gdk/wayland/gdkglcontext-wayland.c
> >>++++ b/gdk/wayland/gdkglcontext-wayland.c
> >>+@@ -314,6 +314,7 @@ gdk_wayland_display_init_gl (GdkDisplay *display)
> >>+ GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (display);
> >>+ EGLint major, minor;
> >>+ EGLDisplay dpy;
> >>++ gboolean use_es = (_gdk_gl_flags & GDK_GL_GLES) != 0 ;
> >>+
> >>+ if (display_wayland->have_egl)
> >>+ return TRUE;
> >>+@@ -326,7 +327,7 @@ gdk_wayland_display_init_gl (GdkDisplay *display)
> >>+ if (!eglInitialize (dpy, &major, &minor))
> >>+ return FALSE;
> >>+
> >>+- if (!eglBindAPI (EGL_OPENGL_API))
> >>++ if (!eglBindAPI (use_es?EGL_OPENGL_ES_API:EGL_OPENGL_API))
> >>+ return FALSE;
> >>+
> >>+ display_wayland->egl_display = dpy;
> >>+@@ -379,6 +380,7 @@ find_eglconfig_for_window (GdkWindow *window,
> >>+ EGLint count;
> >>+ EGLConfig *configs, chosen_config;
> >>+ gboolean use_rgba;
> >>++ gboolean use_es = (_gdk_gl_flags & GDK_GL_GLES) != 0 ;
> >>+
> >>+ int i = 0;
> >>+
> >>+@@ -395,6 +397,12 @@ find_eglconfig_for_window (GdkWindow *window,
> >>+ attrs[i++] = EGL_BLUE_SIZE;
> >>+ attrs[i++] = 1;
> >>+
> >>++ if (use_es)
> >>++ {
> >>++ attrs[i++] = EGL_RENDERABLE_TYPE;
> >>++ attrs[i++] = EGL_OPENGL_ES2_BIT;
> >>++ }
> >>++
> >>+ use_rgba = (visual == gdk_screen_get_rgba_visual (gdk_display_get_default_screen (display)));
> >>+
> >>+ if (use_rgba)
> >>+--
> >>+1.9.1
> >>+
> >>diff --git a/meta-arago-distro/recipes-gnome/gtk+/gtk+3_%.bbappend b/meta-arago-distro/recipes-gnome/gtk+/gtk+3_%.bbappend
> >>new file mode 100644
> >>index 0000000..d3fe505
> >>--- /dev/null
> >>+++ b/meta-arago-distro/recipes-gnome/gtk+/gtk+3_%.bbappend
> >>@@ -0,0 +1,10 @@
> >>+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> >>+
> >>+PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,wayland wayland-protocols libxkbcommon virtual/egl wayland-native"
> >>+GTKGLIBC_RRECOMMENDS = "${GTKBASE_RRECOMMENDS}"
> >>+
> >>+PR_append = ".arago0"
> >>+
> >>+SRC_URI += "\
> >>+ file://0001-gdkglcontext-wayland.c-cleanup-the-parameters-of-egl.patch \
> >>+"
> >>--
> >>1.9.1
> >>
> >>_______________________________________________
> >>meta-arago mailing list
> >>meta-arago@arago-project.org
> >>http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 1/4] gtk+3: update wayland dependency and add patches
2018-08-21 21:00 ` Denys Dmytriyenko
@ 2018-08-21 21:27 ` Ruei, Eric
2018-08-21 21:29 ` Denys Dmytriyenko
0 siblings, 1 reply; 13+ messages in thread
From: Ruei, Eric @ 2018-08-21 21:27 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: meta-arago
On 8/21/2018 5:00 PM, Denys Dmytriyenko wrote:
> On Tue, Aug 21, 2018 at 04:38:08PM -0400, Ruei, Eric wrote:
>> On 8/21/2018 3:48 PM, Denys Dmytriyenko wrote:
>>> On Tue, Aug 21, 2018 at 03:29:25PM -0400, Eric Ruei wrote:
>>>> - replace wayland dependency mesa with virtual/egl
>>>
>>> In the past we were using libgbm instead of virtual/egl
>>> http://arago-project.org/git/?p=meta-arago.git;a=blob;f=meta-arago-distro/recipes-graphics/wayland/weston_4.0.0.bbappend;hb=HEAD
>>> http://arago-project.org/git/?p=meta-arago.git;a=blob;f=meta-arago-distro/recipes-gnome/gtk%2B/gtk%2B3_%25.bbappend;hb=HEAD
>>>
>>>
>> Denys: It does not make sense, virtual/egl replaces virtual/mesa, GTK will
>> be a wayland-client and uses wayland-egl which does not depends on libgbm.
>> The drm-backend of Weston compositor does depend on libgbm.
>
> Well, drm-backend of Weston also originally depended on virtual/mesa:
> http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-graphics/wayland/weston_2.0.0.bb?h=rocko
>
> And we replace it with libgbm, not virtual/egl.
>
> But if you say gtk+ really needs entire virtual/egl dependency to work with
> wayland-egl, then I'm fine.
>
>
virtual/mesa covers everything. drm-backend actually depends on both
virtual/egl and libgbm.
Gtk+, as a wayland-client, depends on virtual/egl only.
>>>> - patch to fix egl API calls for GLES2
>>>>
>>>> Signed-off-by: Eric Ruei <e-ruei1@ti.com>
>>>> ---
>>>> ...t-wayland.c-cleanup-the-parameters-of-egl.patch | 61 ++++++++++++++++++++++
>>>> .../recipes-gnome/gtk+/gtk+3_%.bbappend | 10 ++++
>>>> 2 files changed, 71 insertions(+)
>>>> create mode 100644 meta-arago-distro/recipes-gnome/gtk+/gtk+3/0001-gdkglcontext-wayland.c-cleanup-the-parameters-of-egl.patch
>>>> create mode 100644 meta-arago-distro/recipes-gnome/gtk+/gtk+3_%.bbappend
>>>>
>>>> diff --git a/meta-arago-distro/recipes-gnome/gtk+/gtk+3/0001-gdkglcontext-wayland.c-cleanup-the-parameters-of-egl.patch b/meta-arago-distro/recipes-gnome/gtk+/gtk+3/0001-gdkglcontext-wayland.c-cleanup-the-parameters-of-egl.patch
>>>> new file mode 100644
>>>> index 0000000..174dbdd
>>>> --- /dev/null
>>>> +++ b/meta-arago-distro/recipes-gnome/gtk+/gtk+3/0001-gdkglcontext-wayland.c-cleanup-the-parameters-of-egl.patch
>>>> @@ -0,0 +1,61 @@
>>>> +From d4c8511b845de02271b6dcf57a6edbf01f3f1905 Mon Sep 17 00:00:00 2001
>>>> +From: Eric Ruei <e-ruei1@ti.com>
>>>> +Date: Tue, 21 Aug 2018 11:07:13 -0400
>>>> +Subject: [PATCH] gdkglcontext-wayland.c: cleanup the parameters of egl API
>>>> + calls when GLES is used
>>>> +
>>>> +eglBindAPI: use EGL_OPENGL_ES_API instead of EGL_OPENGL_API
>>>> +eglChooseConfig: need to specify EGL_OPENGL_ES2_BIT as EGL_RENDERABLE_TYPE
>>>> +
>>>> +Upstream-Status: Pending
>>>> +
>>>> +Signed-off-by: Eric Ruei <e-ruei1@ti.com>
>>>> +---
>>>> + gdk/wayland/gdkglcontext-wayland.c | 10 +++++++++-
>>>> + 1 file changed, 9 insertions(+), 1 deletion(-)
>>>> +
>>>> +diff --git a/gdk/wayland/gdkglcontext-wayland.c b/gdk/wayland/gdkglcontext-wayland.c
>>>> +index 254900d..3361eb3 100644
>>>> +--- a/gdk/wayland/gdkglcontext-wayland.c
>>>> ++++ b/gdk/wayland/gdkglcontext-wayland.c
>>>> +@@ -314,6 +314,7 @@ gdk_wayland_display_init_gl (GdkDisplay *display)
>>>> + GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (display);
>>>> + EGLint major, minor;
>>>> + EGLDisplay dpy;
>>>> ++ gboolean use_es = (_gdk_gl_flags & GDK_GL_GLES) != 0 ;
>>>> +
>>>> + if (display_wayland->have_egl)
>>>> + return TRUE;
>>>> +@@ -326,7 +327,7 @@ gdk_wayland_display_init_gl (GdkDisplay *display)
>>>> + if (!eglInitialize (dpy, &major, &minor))
>>>> + return FALSE;
>>>> +
>>>> +- if (!eglBindAPI (EGL_OPENGL_API))
>>>> ++ if (!eglBindAPI (use_es?EGL_OPENGL_ES_API:EGL_OPENGL_API))
>>>> + return FALSE;
>>>> +
>>>> + display_wayland->egl_display = dpy;
>>>> +@@ -379,6 +380,7 @@ find_eglconfig_for_window (GdkWindow *window,
>>>> + EGLint count;
>>>> + EGLConfig *configs, chosen_config;
>>>> + gboolean use_rgba;
>>>> ++ gboolean use_es = (_gdk_gl_flags & GDK_GL_GLES) != 0 ;
>>>> +
>>>> + int i = 0;
>>>> +
>>>> +@@ -395,6 +397,12 @@ find_eglconfig_for_window (GdkWindow *window,
>>>> + attrs[i++] = EGL_BLUE_SIZE;
>>>> + attrs[i++] = 1;
>>>> +
>>>> ++ if (use_es)
>>>> ++ {
>>>> ++ attrs[i++] = EGL_RENDERABLE_TYPE;
>>>> ++ attrs[i++] = EGL_OPENGL_ES2_BIT;
>>>> ++ }
>>>> ++
>>>> + use_rgba = (visual == gdk_screen_get_rgba_visual (gdk_display_get_default_screen (display)));
>>>> +
>>>> + if (use_rgba)
>>>> +--
>>>> +1.9.1
>>>> +
>>>> diff --git a/meta-arago-distro/recipes-gnome/gtk+/gtk+3_%.bbappend b/meta-arago-distro/recipes-gnome/gtk+/gtk+3_%.bbappend
>>>> new file mode 100644
>>>> index 0000000..d3fe505
>>>> --- /dev/null
>>>> +++ b/meta-arago-distro/recipes-gnome/gtk+/gtk+3_%.bbappend
>>>> @@ -0,0 +1,10 @@
>>>> +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
>>>> +
>>>> +PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,wayland wayland-protocols libxkbcommon virtual/egl wayland-native"
>>>> +GTKGLIBC_RRECOMMENDS = "${GTKBASE_RRECOMMENDS}"
>>>> +
>>>> +PR_append = ".arago0"
>>>> +
>>>> +SRC_URI += "\
>>>> + file://0001-gdkglcontext-wayland.c-cleanup-the-parameters-of-egl.patch \
>>>> +"
>>>> --
>>>> 1.9.1
>>>>
>>>> _______________________________________________
>>>> meta-arago mailing list
>>>> meta-arago@arago-project.org
>>>> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
>>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 1/4] gtk+3: update wayland dependency and add patches
2018-08-21 21:27 ` Ruei, Eric
@ 2018-08-21 21:29 ` Denys Dmytriyenko
2018-08-21 21:34 ` Denys Dmytriyenko
0 siblings, 1 reply; 13+ messages in thread
From: Denys Dmytriyenko @ 2018-08-21 21:29 UTC (permalink / raw)
To: Ruei, Eric; +Cc: meta-arago
On Tue, Aug 21, 2018 at 05:27:35PM -0400, Ruei, Eric wrote:
> On 8/21/2018 5:00 PM, Denys Dmytriyenko wrote:
> >On Tue, Aug 21, 2018 at 04:38:08PM -0400, Ruei, Eric wrote:
> >>On 8/21/2018 3:48 PM, Denys Dmytriyenko wrote:
> >>>On Tue, Aug 21, 2018 at 03:29:25PM -0400, Eric Ruei wrote:
> >>>>- replace wayland dependency mesa with virtual/egl
> >>>
> >>>In the past we were using libgbm instead of virtual/egl
> >>>http://arago-project.org/git/?p=meta-arago.git;a=blob;f=meta-arago-distro/recipes-graphics/wayland/weston_4.0.0.bbappend;hb=HEAD
> >>>http://arago-project.org/git/?p=meta-arago.git;a=blob;f=meta-arago-distro/recipes-gnome/gtk%2B/gtk%2B3_%25.bbappend;hb=HEAD
> >>>
> >>>
> >>Denys: It does not make sense, virtual/egl replaces virtual/mesa, GTK will
> >>be a wayland-client and uses wayland-egl which does not depends on libgbm.
> >>The drm-backend of Weston compositor does depend on libgbm.
> >
> >Well, drm-backend of Weston also originally depended on virtual/mesa:
> >http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-graphics/wayland/weston_2.0.0.bb?h=rocko
> >
> >And we replace it with libgbm, not virtual/egl.
> >
> >But if you say gtk+ really needs entire virtual/egl dependency to work with
> >wayland-egl, then I'm fine.
> >
> >
> virtual/mesa covers everything. drm-backend actually depends on both
> virtual/egl and libgbm.
http://arago-project.org/git/?p=meta-arago.git;a=blob;f=meta-arago-distro/recipes-graphics/wayland/weston_4.0.0.bbappend;hb=HEAD
"drm udev libgbm mtdev"
> Gtk+, as a wayland-client, depends on virtual/egl only.
>
>
> >>>>- patch to fix egl API calls for GLES2
> >>>>
> >>>>Signed-off-by: Eric Ruei <e-ruei1@ti.com>
> >>>>---
> >>>> ...t-wayland.c-cleanup-the-parameters-of-egl.patch | 61 ++++++++++++++++++++++
> >>>> .../recipes-gnome/gtk+/gtk+3_%.bbappend | 10 ++++
> >>>> 2 files changed, 71 insertions(+)
> >>>> create mode 100644 meta-arago-distro/recipes-gnome/gtk+/gtk+3/0001-gdkglcontext-wayland.c-cleanup-the-parameters-of-egl.patch
> >>>> create mode 100644 meta-arago-distro/recipes-gnome/gtk+/gtk+3_%.bbappend
> >>>>
> >>>>diff --git a/meta-arago-distro/recipes-gnome/gtk+/gtk+3/0001-gdkglcontext-wayland.c-cleanup-the-parameters-of-egl.patch b/meta-arago-distro/recipes-gnome/gtk+/gtk+3/0001-gdkglcontext-wayland.c-cleanup-the-parameters-of-egl.patch
> >>>>new file mode 100644
> >>>>index 0000000..174dbdd
> >>>>--- /dev/null
> >>>>+++ b/meta-arago-distro/recipes-gnome/gtk+/gtk+3/0001-gdkglcontext-wayland.c-cleanup-the-parameters-of-egl.patch
> >>>>@@ -0,0 +1,61 @@
> >>>>+From d4c8511b845de02271b6dcf57a6edbf01f3f1905 Mon Sep 17 00:00:00 2001
> >>>>+From: Eric Ruei <e-ruei1@ti.com>
> >>>>+Date: Tue, 21 Aug 2018 11:07:13 -0400
> >>>>+Subject: [PATCH] gdkglcontext-wayland.c: cleanup the parameters of egl API
> >>>>+ calls when GLES is used
> >>>>+
> >>>>+eglBindAPI: use EGL_OPENGL_ES_API instead of EGL_OPENGL_API
> >>>>+eglChooseConfig: need to specify EGL_OPENGL_ES2_BIT as EGL_RENDERABLE_TYPE
> >>>>+
> >>>>+Upstream-Status: Pending
> >>>>+
> >>>>+Signed-off-by: Eric Ruei <e-ruei1@ti.com>
> >>>>+---
> >>>>+ gdk/wayland/gdkglcontext-wayland.c | 10 +++++++++-
> >>>>+ 1 file changed, 9 insertions(+), 1 deletion(-)
> >>>>+
> >>>>+diff --git a/gdk/wayland/gdkglcontext-wayland.c b/gdk/wayland/gdkglcontext-wayland.c
> >>>>+index 254900d..3361eb3 100644
> >>>>+--- a/gdk/wayland/gdkglcontext-wayland.c
> >>>>++++ b/gdk/wayland/gdkglcontext-wayland.c
> >>>>+@@ -314,6 +314,7 @@ gdk_wayland_display_init_gl (GdkDisplay *display)
> >>>>+ GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (display);
> >>>>+ EGLint major, minor;
> >>>>+ EGLDisplay dpy;
> >>>>++ gboolean use_es = (_gdk_gl_flags & GDK_GL_GLES) != 0 ;
> >>>>+
> >>>>+ if (display_wayland->have_egl)
> >>>>+ return TRUE;
> >>>>+@@ -326,7 +327,7 @@ gdk_wayland_display_init_gl (GdkDisplay *display)
> >>>>+ if (!eglInitialize (dpy, &major, &minor))
> >>>>+ return FALSE;
> >>>>+
> >>>>+- if (!eglBindAPI (EGL_OPENGL_API))
> >>>>++ if (!eglBindAPI (use_es?EGL_OPENGL_ES_API:EGL_OPENGL_API))
> >>>>+ return FALSE;
> >>>>+
> >>>>+ display_wayland->egl_display = dpy;
> >>>>+@@ -379,6 +380,7 @@ find_eglconfig_for_window (GdkWindow *window,
> >>>>+ EGLint count;
> >>>>+ EGLConfig *configs, chosen_config;
> >>>>+ gboolean use_rgba;
> >>>>++ gboolean use_es = (_gdk_gl_flags & GDK_GL_GLES) != 0 ;
> >>>>+
> >>>>+ int i = 0;
> >>>>+
> >>>>+@@ -395,6 +397,12 @@ find_eglconfig_for_window (GdkWindow *window,
> >>>>+ attrs[i++] = EGL_BLUE_SIZE;
> >>>>+ attrs[i++] = 1;
> >>>>+
> >>>>++ if (use_es)
> >>>>++ {
> >>>>++ attrs[i++] = EGL_RENDERABLE_TYPE;
> >>>>++ attrs[i++] = EGL_OPENGL_ES2_BIT;
> >>>>++ }
> >>>>++
> >>>>+ use_rgba = (visual == gdk_screen_get_rgba_visual (gdk_display_get_default_screen (display)));
> >>>>+
> >>>>+ if (use_rgba)
> >>>>+--
> >>>>+1.9.1
> >>>>+
> >>>>diff --git a/meta-arago-distro/recipes-gnome/gtk+/gtk+3_%.bbappend b/meta-arago-distro/recipes-gnome/gtk+/gtk+3_%.bbappend
> >>>>new file mode 100644
> >>>>index 0000000..d3fe505
> >>>>--- /dev/null
> >>>>+++ b/meta-arago-distro/recipes-gnome/gtk+/gtk+3_%.bbappend
> >>>>@@ -0,0 +1,10 @@
> >>>>+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> >>>>+
> >>>>+PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,wayland wayland-protocols libxkbcommon virtual/egl wayland-native"
> >>>>+GTKGLIBC_RRECOMMENDS = "${GTKBASE_RRECOMMENDS}"
> >>>>+
> >>>>+PR_append = ".arago0"
> >>>>+
> >>>>+SRC_URI += "\
> >>>>+ file://0001-gdkglcontext-wayland.c-cleanup-the-parameters-of-egl.patch \
> >>>>+"
> >>>>--
> >>>>1.9.1
> >>>>
> >>>>_______________________________________________
> >>>>meta-arago mailing list
> >>>>meta-arago@arago-project.org
> >>>>http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> >>
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 1/4] gtk+3: update wayland dependency and add patches
2018-08-21 21:29 ` Denys Dmytriyenko
@ 2018-08-21 21:34 ` Denys Dmytriyenko
0 siblings, 0 replies; 13+ messages in thread
From: Denys Dmytriyenko @ 2018-08-21 21:34 UTC (permalink / raw)
To: Ruei, Eric; +Cc: meta-arago
On Tue, Aug 21, 2018 at 05:29:27PM -0400, Denys Dmytriyenko wrote:
> On Tue, Aug 21, 2018 at 05:27:35PM -0400, Ruei, Eric wrote:
> > On 8/21/2018 5:00 PM, Denys Dmytriyenko wrote:
> > >On Tue, Aug 21, 2018 at 04:38:08PM -0400, Ruei, Eric wrote:
> > >>On 8/21/2018 3:48 PM, Denys Dmytriyenko wrote:
> > >>>On Tue, Aug 21, 2018 at 03:29:25PM -0400, Eric Ruei wrote:
> > >>>>- replace wayland dependency mesa with virtual/egl
> > >>>
> > >>>In the past we were using libgbm instead of virtual/egl
> > >>>http://arago-project.org/git/?p=meta-arago.git;a=blob;f=meta-arago-distro/recipes-graphics/wayland/weston_4.0.0.bbappend;hb=HEAD
> > >>>http://arago-project.org/git/?p=meta-arago.git;a=blob;f=meta-arago-distro/recipes-gnome/gtk%2B/gtk%2B3_%25.bbappend;hb=HEAD
> > >>>
> > >>>
> > >>Denys: It does not make sense, virtual/egl replaces virtual/mesa, GTK will
> > >>be a wayland-client and uses wayland-egl which does not depends on libgbm.
> > >>The drm-backend of Weston compositor does depend on libgbm.
> > >
> > >Well, drm-backend of Weston also originally depended on virtual/mesa:
> > >http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-graphics/wayland/weston_2.0.0.bb?h=rocko
> > >
> > >And we replace it with libgbm, not virtual/egl.
> > >
> > >But if you say gtk+ really needs entire virtual/egl dependency to work with
> > >wayland-egl, then I'm fine.
> > >
> > >
> > virtual/mesa covers everything. drm-backend actually depends on both
> > virtual/egl and libgbm.
>
> http://arago-project.org/git/?p=meta-arago.git;a=blob;f=meta-arago-distro/recipes-graphics/wayland/weston_4.0.0.bbappend;hb=HEAD
>
> "drm udev libgbm mtdev"
Ok, nevermind, looks like it depends on egl unconditionally...
> > Gtk+, as a wayland-client, depends on virtual/egl only.
I have no more questions, I'll merge it. Please fix the other patch.
> > >>>>- patch to fix egl API calls for GLES2
> > >>>>
> > >>>>Signed-off-by: Eric Ruei <e-ruei1@ti.com>
> > >>>>---
> > >>>> ...t-wayland.c-cleanup-the-parameters-of-egl.patch | 61 ++++++++++++++++++++++
> > >>>> .../recipes-gnome/gtk+/gtk+3_%.bbappend | 10 ++++
> > >>>> 2 files changed, 71 insertions(+)
> > >>>> create mode 100644 meta-arago-distro/recipes-gnome/gtk+/gtk+3/0001-gdkglcontext-wayland.c-cleanup-the-parameters-of-egl.patch
> > >>>> create mode 100644 meta-arago-distro/recipes-gnome/gtk+/gtk+3_%.bbappend
> > >>>>
> > >>>>diff --git a/meta-arago-distro/recipes-gnome/gtk+/gtk+3/0001-gdkglcontext-wayland.c-cleanup-the-parameters-of-egl.patch b/meta-arago-distro/recipes-gnome/gtk+/gtk+3/0001-gdkglcontext-wayland.c-cleanup-the-parameters-of-egl.patch
> > >>>>new file mode 100644
> > >>>>index 0000000..174dbdd
> > >>>>--- /dev/null
> > >>>>+++ b/meta-arago-distro/recipes-gnome/gtk+/gtk+3/0001-gdkglcontext-wayland.c-cleanup-the-parameters-of-egl.patch
> > >>>>@@ -0,0 +1,61 @@
> > >>>>+From d4c8511b845de02271b6dcf57a6edbf01f3f1905 Mon Sep 17 00:00:00 2001
> > >>>>+From: Eric Ruei <e-ruei1@ti.com>
> > >>>>+Date: Tue, 21 Aug 2018 11:07:13 -0400
> > >>>>+Subject: [PATCH] gdkglcontext-wayland.c: cleanup the parameters of egl API
> > >>>>+ calls when GLES is used
> > >>>>+
> > >>>>+eglBindAPI: use EGL_OPENGL_ES_API instead of EGL_OPENGL_API
> > >>>>+eglChooseConfig: need to specify EGL_OPENGL_ES2_BIT as EGL_RENDERABLE_TYPE
> > >>>>+
> > >>>>+Upstream-Status: Pending
> > >>>>+
> > >>>>+Signed-off-by: Eric Ruei <e-ruei1@ti.com>
> > >>>>+---
> > >>>>+ gdk/wayland/gdkglcontext-wayland.c | 10 +++++++++-
> > >>>>+ 1 file changed, 9 insertions(+), 1 deletion(-)
> > >>>>+
> > >>>>+diff --git a/gdk/wayland/gdkglcontext-wayland.c b/gdk/wayland/gdkglcontext-wayland.c
> > >>>>+index 254900d..3361eb3 100644
> > >>>>+--- a/gdk/wayland/gdkglcontext-wayland.c
> > >>>>++++ b/gdk/wayland/gdkglcontext-wayland.c
> > >>>>+@@ -314,6 +314,7 @@ gdk_wayland_display_init_gl (GdkDisplay *display)
> > >>>>+ GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (display);
> > >>>>+ EGLint major, minor;
> > >>>>+ EGLDisplay dpy;
> > >>>>++ gboolean use_es = (_gdk_gl_flags & GDK_GL_GLES) != 0 ;
> > >>>>+
> > >>>>+ if (display_wayland->have_egl)
> > >>>>+ return TRUE;
> > >>>>+@@ -326,7 +327,7 @@ gdk_wayland_display_init_gl (GdkDisplay *display)
> > >>>>+ if (!eglInitialize (dpy, &major, &minor))
> > >>>>+ return FALSE;
> > >>>>+
> > >>>>+- if (!eglBindAPI (EGL_OPENGL_API))
> > >>>>++ if (!eglBindAPI (use_es?EGL_OPENGL_ES_API:EGL_OPENGL_API))
> > >>>>+ return FALSE;
> > >>>>+
> > >>>>+ display_wayland->egl_display = dpy;
> > >>>>+@@ -379,6 +380,7 @@ find_eglconfig_for_window (GdkWindow *window,
> > >>>>+ EGLint count;
> > >>>>+ EGLConfig *configs, chosen_config;
> > >>>>+ gboolean use_rgba;
> > >>>>++ gboolean use_es = (_gdk_gl_flags & GDK_GL_GLES) != 0 ;
> > >>>>+
> > >>>>+ int i = 0;
> > >>>>+
> > >>>>+@@ -395,6 +397,12 @@ find_eglconfig_for_window (GdkWindow *window,
> > >>>>+ attrs[i++] = EGL_BLUE_SIZE;
> > >>>>+ attrs[i++] = 1;
> > >>>>+
> > >>>>++ if (use_es)
> > >>>>++ {
> > >>>>++ attrs[i++] = EGL_RENDERABLE_TYPE;
> > >>>>++ attrs[i++] = EGL_OPENGL_ES2_BIT;
> > >>>>++ }
> > >>>>++
> > >>>>+ use_rgba = (visual == gdk_screen_get_rgba_visual (gdk_display_get_default_screen (display)));
> > >>>>+
> > >>>>+ if (use_rgba)
> > >>>>+--
> > >>>>+1.9.1
> > >>>>+
> > >>>>diff --git a/meta-arago-distro/recipes-gnome/gtk+/gtk+3_%.bbappend b/meta-arago-distro/recipes-gnome/gtk+/gtk+3_%.bbappend
> > >>>>new file mode 100644
> > >>>>index 0000000..d3fe505
> > >>>>--- /dev/null
> > >>>>+++ b/meta-arago-distro/recipes-gnome/gtk+/gtk+3_%.bbappend
> > >>>>@@ -0,0 +1,10 @@
> > >>>>+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> > >>>>+
> > >>>>+PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,wayland wayland-protocols libxkbcommon virtual/egl wayland-native"
> > >>>>+GTKGLIBC_RRECOMMENDS = "${GTKBASE_RRECOMMENDS}"
> > >>>>+
> > >>>>+PR_append = ".arago0"
> > >>>>+
> > >>>>+SRC_URI += "\
> > >>>>+ file://0001-gdkglcontext-wayland.c-cleanup-the-parameters-of-egl.patch \
> > >>>>+"
> > >>>>--
> > >>>>1.9.1
> > >>>>
> > >>>>_______________________________________________
> > >>>>meta-arago mailing list
> > >>>>meta-arago@arago-project.org
> > >>>>http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> > >>
> >
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2018-08-21 21:35 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-21 19:29 [PATCH 0/4] Enable GTK+3 Eric Ruei
2018-08-21 19:29 ` [PATCH 1/4] gtk+3: update wayland dependency and add patches Eric Ruei
2018-08-21 19:48 ` Denys Dmytriyenko
2018-08-21 20:38 ` Ruei, Eric
2018-08-21 21:00 ` Denys Dmytriyenko
2018-08-21 21:27 ` Ruei, Eric
2018-08-21 21:29 ` Denys Dmytriyenko
2018-08-21 21:34 ` Denys Dmytriyenko
2018-08-21 19:29 ` [PATCH 2/4] packagegroup-arago-gtk: add package group files for GTK Eric Ruei
2018-08-21 19:29 ` [PATCH 3/4] tisdk-roofs-image: add the GTK packagegroup Eric Ruei
2018-08-21 19:49 ` Denys Dmytriyenko
2018-08-21 20:39 ` Ruei, Eric
2018-08-21 19:29 ` [PATCH 4/4] packagegroup-arago-toolchain-tidsk-target: add " Eric Ruei
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.