All of lore.kernel.org
 help / color / mirror / Atom feed
From: Denys Dmytriyenko <denys@ti.com>
To: Eric Ruei <e-ruei1@ti.com>
Cc: meta-arago@arago-project.org
Subject: Re: [PATCH 4/7] HACK: qtwebkit: define MESA_EGL_NO_X11_HEADERS at ANGLE/khrplatform.h
Date: Tue, 29 Oct 2019 17:13:01 -0400	[thread overview]
Message-ID: <20191029211300.GI7518@beryl> (raw)
In-Reply-To: <20191029135349.31792-5-e-ruei1@ti.com>

On Tue, Oct 29, 2019 at 09:53:46AM -0400, Eric Ruei wrote:
> This is a tentative workaround due to unclean qtwebkit build procedure
> where khrplatform.h under both sysroot/usr/include and 3rdparty/ANGLE
> is used.
> 
> Signed-off-by: Eric Ruei <e-ruei1@ti.com>
> ---
>  ...atform.h-add-define-MESA_EGL_NO_X11_.patch | 28 +++++++++++++++++++
>  .../recipes-qt/qt5/qtwebkit_%.bbappend        |  3 +-
>  2 files changed, 30 insertions(+), 1 deletion(-)
>  create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-HACK-ANGLE-khrplatform.h-add-define-MESA_EGL_NO_X11_.patch
> 
> diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-HACK-ANGLE-khrplatform.h-add-define-MESA_EGL_NO_X11_.patch b/meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-HACK-ANGLE-khrplatform.h-add-define-MESA_EGL_NO_X11_.patch
> new file mode 100644
> index 00000000..c6022ef6
> --- /dev/null
> +++ b/meta-arago-distro/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

Upstream-Status: Inappropriate [reason]


> +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/meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend b/meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend
> index 75213487..1dbe40d1 100644
> --- a/meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend
> +++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend
> @@ -6,9 +6,10 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
>  
>  SRC_URI += " \
>  	file://GraphicsSurfaceGL_NoX.cpp.patch \
> +	file://0001-HACK-ANGLE-khrplatform.h-add-define-MESA_EGL_NO_X11_.patch \
>  "
>  
> -PR_append = ".arago7"
> +PR_append = ".arago8"
>  
>  EXTRA_OECMAKE_append = " -DCMAKE_BUILD_TYPE=Release"
>  
> -- 
> 2.17.1
> 
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago


  reply	other threads:[~2019-10-29 21:14 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-29 13:53 [PATCH 0/7] Mesa-based EGL/GLES Eric Ruei
2019-10-29 13:53 ` [PATCH 1/7] packagegroup-arago-xxx-qte-xxx: re-enable qtwebengine per EGL 1.5 for AM3/4/5 Eric Ruei
2019-10-29 13:53 ` [PATCH 2/7] qtbase-conf: set the default EGLFS mode to kms Eric Ruei
2019-10-29 13:53 ` [PATCH 3/7] HACK: weston: undefine HAVE_GBM_MODIFIERS explicitly Eric Ruei
2019-10-29 21:13   ` Denys Dmytriyenko
2019-10-30 14:41     ` Ruei, Eric
2019-10-30 15:01       ` Andrew F. Davis
2019-10-30 15:09         ` Ruei, Eric
2019-10-30 15:24           ` Andrew F. Davis
2019-10-30 15:30             ` Denys Dmytriyenko
2019-10-30 15:34               ` Andrew F. Davis
2019-10-30 15:57                 ` Ruei, Eric
2019-10-29 13:53 ` [PATCH 4/7] HACK: qtwebkit: define MESA_EGL_NO_X11_HEADERS at ANGLE/khrplatform.h Eric Ruei
2019-10-29 21:13   ` Denys Dmytriyenko [this message]
2019-10-30 15:01     ` Ruei, Eric
2019-10-29 13:53 ` [PATCH 5/7] img-pvr-sdk: Add DRM(GBM)-based GPU demos Eric Ruei
2019-10-29 13:53 ` [PATCH 6/7] omapdrmtest: Update LDFLAGS at util/Makefile.am per Mesa-based EGL Eric Ruei
2019-10-30 15:04   ` Andrew F. Davis
2019-10-30 15:09     ` Denys Dmytriyenko
2019-10-30 15:10     ` Ruei, Eric
2019-10-29 13:53 ` [PATCH 7/7] HACK: matrix-gui-machinevision-demos: disable point-cloud-viewer 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=20191029211300.GI7518@beryl \
    --to=denys@ti.com \
    --cc=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.