All of lore.kernel.org
 help / color / mirror / Atom feed
From: Eric Ruei <e-ruei1@ti.com>
To: <meta-arago@arago-project.org>
Subject: [meta-processor-sdk][PATCH 6/9] HACK: qtwebkit: sync up the khrplatform.h under ANGLE/include/KHR with the one provided by mesa-egl
Date: Tue, 10 Sep 2019 14:11:28 -0400	[thread overview]
Message-ID: <20190910181131.8808-7-e-ruei1@ti.com> (raw)
In-Reply-To: <20190910181131.8808-1-e-ruei1@ti.com>

Note: This khrplatform.h should not be used, but it is for some include
path search. Add "#define MESA_EGL_NO_X11_HEADERS" to be consistent with
the one provided by mesa-egl

Signed-off-by: Eric Ruei <e-ruei1@ti.com>
---
 ...atform.h-add-define-MESA_EGL_NO_X11_.patch | 28 +++++++++++++++++++
 recipes-qt/qt5/qtwebkit_%.bbappend            | 10 +++++++
 2 files changed, 38 insertions(+)
 create mode 100644 recipes-qt/qt5/qtwebkit/0001-HACK-ANGLE-khrplatform.h-add-define-MESA_EGL_NO_X11_.patch
 create mode 100644 recipes-qt/qt5/qtwebkit_%.bbappend

diff --git a/recipes-qt/qt5/qtwebkit/0001-HACK-ANGLE-khrplatform.h-add-define-MESA_EGL_NO_X11_.patch b/recipes-qt/qt5/qtwebkit/0001-HACK-ANGLE-khrplatform.h-add-define-MESA_EGL_NO_X11_.patch
new file mode 100644
index 0000000..c6022ef
--- /dev/null
+++ b/recipes-qt/qt5/qtwebkit/0001-HACK-ANGLE-khrplatform.h-add-define-MESA_EGL_NO_X11_.patch
@@ -0,0 +1,28 @@
+From c969fa7eedb3bce04c8f48caf469a46361437aa7 Mon Sep 17 00:00:00 2001
+From: Eric Ruei <e-ruei1@ti.com>
+Date: Fri, 30 Aug 2019 17:41:13 -0400
+Subject: [PATCH] HACK: ANGLE/khrplatform.h: add #define
+ MESA_EGL_NO_X11_HEADERS
+
+Note: Only the KHR/khrplatform.h at sysroot/usr/include should be used.
+      This patch is a tentative workaround to make both files compatible
+
+Signed-off-by: Eric Ruei <e-ruei1@ti.com>
+---
+ Source/ThirdParty/ANGLE/include/KHR/khrplatform.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Source/ThirdParty/ANGLE/include/KHR/khrplatform.h b/Source/ThirdParty/ANGLE/include/KHR/khrplatform.h
+index c9e6f17d3..4e3ff69a8 100644
+--- a/Source/ThirdParty/ANGLE/include/KHR/khrplatform.h
++++ b/Source/ThirdParty/ANGLE/include/KHR/khrplatform.h
+@@ -279,4 +279,6 @@ typedef enum {
+     KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM
+ } khronos_boolean_enum_t;
+ 
++#define MESA_EGL_NO_X11_HEADERS
++
+ #endif /* __khrplatform_h_ */
+-- 
+2.17.1
+
diff --git a/recipes-qt/qt5/qtwebkit_%.bbappend b/recipes-qt/qt5/qtwebkit_%.bbappend
new file mode 100644
index 0000000..d51ab64
--- /dev/null
+++ b/recipes-qt/qt5/qtwebkit_%.bbappend
@@ -0,0 +1,10 @@
+PR_append = ".tisdk0"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+
+SRC_URI += "\
+    file://0001-HACK-ANGLE-khrplatform.h-add-define-MESA_EGL_NO_X11_.patch \
+"
+
+
-- 
2.17.1



  parent reply	other threads:[~2019-09-10 18:15 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-10 18:11 [meta-processor-sdk][PATCH 0/9] Enable build with mesa-based EGL1.5 Eric Ruei
2019-09-10 18:11 ` [meta-processor-sdk][PATCH 1/9] chromium-ozone-wayland: remove virtual/libgl from DEPENDS list Eric Ruei
2019-09-10 18:11 ` [meta-processor-sdk][PATCH 2/9] HACK: matrix-gui-machinevision-demos: remove point-cloud-viewer Eric Ruei
2019-09-10 18:11 ` [meta-processor-sdk][PATCH 3/9] HACK: packagegroup-arago-test-addons: remove omapdrmtest Eric Ruei
2019-09-10 18:11 ` [meta-processor-sdk][PATCH 4/9] packagegroup-arago-tisdk-multimedia: rename chromium-wayland Eric Ruei
2019-09-10 18:11 ` [meta-processor-sdk][PATCH 5/9] HACK: weston: undefine HAVE_GBM_MODIFIERS unconditionally Eric Ruei
2019-09-10 18:11 ` Eric Ruei [this message]
2019-09-10 18:11 ` [meta-processor-sdk][PATCH 7/9] HACK: libepoxy: replace local definitions with khrplatform.h at gen_dispatch Eric Ruei
2019-09-10 18:11 ` [meta-processor-sdk][PATCH 8/9] packagegroup-arago-tisdk-graphics: replace chromium-wayland with chromium-ozone-wayland Eric Ruei
2019-09-10 18:11 ` [meta-processor-sdk][PATCH 9/9] HACK: ti-sgx-ddk-um: take AM5 binaries from mesa-egl based experimental branch Eric Ruei

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190910181131.8808-7-e-ruei1@ti.com \
    --to=e-ruei1@ti.com \
    --cc=meta-arago@arago-project.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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.