[PATCH v2 0/4] Enable GTK+3

[PATCH v2 0/4] Enable GTK+3

[Eric Ruei]

Enable GTK+3

v2 changes:
- make packagegroup-arago-tisdk-gtk conditional on sgx

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

[PATCH v2 1/4] gtk+3: update wayland dependency and add patches

[Eric Ruei]

- 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

[PATCH v2 2/4] packagegroup-arago-gtk: add package group files for GTK

[Eric Ruei]

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

[PATCH v2 3/4] tisdk-roofs-image: add the GTK packagegroup

[Eric Ruei]

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..8486a8e 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)} \
+    ${@bb.utils.contains('MACHINE_FEATURES','sgx','packagegroup-arago-tisdk-gtk','',d)} \
     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

[PATCH v2 4/4] packagegroup-arago-toolchain-tidsk-target: add GTK packagegroup

[Eric Ruei]

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