* [dunfell][PATCH v2 1/3] Revert "HACK: qtwebkit: define MESA_EGL_NO_X11_HEADERS at ANGLE/khrplatform.h"
2021-04-05 20:39 [dunfell][PATCH v2 0/3] qtwebkit: Fix no x11 build Gowtham Tammana
@ 2021-04-05 20:39 ` Gowtham Tammana
2021-04-05 20:39 ` [dunfell][PATCH v2 2/3] qtwebkit: Fix no X11 build Gowtham Tammana
` (2 subsequent siblings)
3 siblings, 0 replies; 8+ messages in thread
From: Gowtham Tammana @ 2021-04-05 20:39 UTC (permalink / raw)
To: meta-arago, Praneeth Bajjuri, denys; +Cc: Krunal Bhargav
This reverts commit 1e83ebf61bd22ca8ad04d5538db044d81330df2c. It is no
longer needed as it is handled through build dependencies.
---
...atform.h-add-define-MESA_EGL_NO_X11_.patch | 30 -------------------
.../recipes-qt/qt5/qtwebkit_%.bbappend | 3 +-
2 files changed, 1 insertion(+), 32 deletions(-)
delete 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
deleted file mode 100644
index 29521a8e..00000000
--- a/meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-HACK-ANGLE-khrplatform.h-add-define-MESA_EGL_NO_X11_.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 4a21fcedd886772b7e1bd40861835f1b4f33c7ff 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 [tentative workaround only]
-
-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 1dbe40d1..75213487 100644
--- a/meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend
+++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend
@@ -6,10 +6,9 @@ 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 = ".arago8"
+PR_append = ".arago7"
EXTRA_OECMAKE_append = " -DCMAKE_BUILD_TYPE=Release"
--
2.31.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [dunfell][PATCH v2 2/3] qtwebkit: Fix no X11 build
2021-04-05 20:39 [dunfell][PATCH v2 0/3] qtwebkit: Fix no x11 build Gowtham Tammana
2021-04-05 20:39 ` [dunfell][PATCH v2 1/3] Revert "HACK: qtwebkit: define MESA_EGL_NO_X11_HEADERS at ANGLE/khrplatform.h" Gowtham Tammana
@ 2021-04-05 20:39 ` Gowtham Tammana
2021-04-05 21:28 ` Denys Dmytriyenko
2021-04-05 20:39 ` [dunfell][PATCH v2 3/3] qtwebkit: Cleanup old patches Gowtham Tammana
2021-04-05 21:19 ` [dunfell][PATCH v2 0/3] qtwebkit: Fix no x11 build Denys Dmytriyenko
3 siblings, 1 reply; 8+ messages in thread
From: Gowtham Tammana @ 2021-04-05 20:39 UTC (permalink / raw)
To: meta-arago, Praneeth Bajjuri, denys; +Cc: Krunal Bhargav
qtwebkit build is failing to set EGL_NO_X11 on platforms with no x11
support causing below failure.
```{.package=qtwebkit .version=dunfell}
In file included from
tisdk/build/arago-tmp-external-arm-glibc/work/aarch64-linux/qtwebkit/5.14.2+gitAUTOINC+ab1bd15209-r0.arago7/recipe-sysroot/usr/include/EGL/egl.h:39,
from tisdk/build/arago-tmp-external-arm-glibc/work/aarch64-linux/qtwebkit/5.14.2+gitAUTOINC+ab1bd15209-r0.arago7/git/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.cpp:36:
tisdk/build/arago-tmp-external-arm-glibc/work/aarch64-linux/qtwebkit/5.14.2+gitAUTOINC+ab1bd15209-r0.arago7/recipe-sysroot/usr/include/EGL/eglplatform.h:134:10: fatal error: X11/Xlib.h: No such file or directory
134 | #include <X11/Xlib.h>
| ^~~~~~~~~~~~
compilation terminated.
```
Setting up the flag EGL_NO_X11 when X11 target is disabled.
Signed-off-by: Gowtham Tammana <g-tammana@ti.com>
---
...re-PlatformQt.cmake-Fix-no-x11-build.patch | 46 +++++++++++++++++++
.../recipes-qt/qt5/qtwebkit_%.bbappend | 3 +-
2 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-WebCore-PlatformQt.cmake-Fix-no-x11-build.patch
diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-WebCore-PlatformQt.cmake-Fix-no-x11-build.patch b/meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-WebCore-PlatformQt.cmake-Fix-no-x11-build.patch
new file mode 100644
index 00000000..c70b3dc0
--- /dev/null
+++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-WebCore-PlatformQt.cmake-Fix-no-x11-build.patch
@@ -0,0 +1,46 @@
+From 82b7ec12b768ba9de4b7a4ae71500a3de6574bfd Mon Sep 17 00:00:00 2001
+From: Gowtham Tammana <g-tammana@ti.com>
+Date: Thu, 1 Apr 2021 10:45:13 -0500
+Subject: [PATCH] WebCore/PlatformQt.cmake: Fix no x11 build
+
+For platforms with no x11 support, egl package config sets up EGL_NO_X11
+flag. However the build is not picking up this flag at the moment
+causing below build failure.
+
+```{.package=qtwebkit .version=dunfell}
+In file included from
+tisdk/build/arago-tmp-external-arm-glibc/work/aarch64-linux/qtwebkit/5.14.2+gitAUTOINC+ab1bd15209-r0.arago7/recipe-sysroot/usr/include/EGL/egl.h:39,
+ from tisdk/build/arago-tmp-external-arm-glibc/work/aarch64-linux/qtwebkit/5.14.2+gitAUTOINC+ab1bd15209-r0.arago7/git/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.cpp:36:
+tisdk/build/arago-tmp-external-arm-glibc/work/aarch64-linux/qtwebkit/5.14.2+gitAUTOINC+ab1bd15209-r0.arago7/recipe-sysroot/usr/include/EGL/eglplatform.h:134:10: fatal error: X11/Xlib.h: No such file or directory
+ 134 | #include <X11/Xlib.h>
+ | ^~~~~~~~~~~~
+compilation terminated.
+```
+
+Set this flag explicitly when there is no X11 target enable.
+
+Upstream-Status: Pending
+
+Signed-off-by: Gowtham Tammana <g-tammana@ti.com>
+---
+ Source/WebCore/PlatformQt.cmake | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/Source/WebCore/PlatformQt.cmake b/Source/WebCore/PlatformQt.cmake
+index 99c625dc3..375d28a47 100644
+--- a/Source/WebCore/PlatformQt.cmake
++++ b/Source/WebCore/PlatformQt.cmake
+@@ -350,6 +350,10 @@ if (ENABLE_OPENGL)
+ ${Qt5Gui_EGL_LIBRARIES}
+ ${Qt5Gui_OPENGL_LIBRARIES}
+ )
++ if (NOT ENABLE_X11_TARGET)
++ # EGL definitions are not getting detected. Add the EGL_NO_X11 flag.
++ add_definitions("-DEGL_NO_X11")
++ endif ()
+ else ()
+ list(APPEND WebCore_SOURCES
+ platform/graphics/opengl/Extensions3DOpenGL.cpp
+--
+2.31.1
+
diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend b/meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend
index 75213487..308f3f25 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-WebCore-PlatformQt.cmake-Fix-no-x11-build.patch \
"
-PR_append = ".arago7"
+PR_append = ".arago8"
EXTRA_OECMAKE_append = " -DCMAKE_BUILD_TYPE=Release"
--
2.31.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [dunfell][PATCH v2 2/3] qtwebkit: Fix no X11 build
2021-04-05 20:39 ` [dunfell][PATCH v2 2/3] qtwebkit: Fix no X11 build Gowtham Tammana
@ 2021-04-05 21:28 ` Denys Dmytriyenko
0 siblings, 0 replies; 8+ messages in thread
From: Denys Dmytriyenko @ 2021-04-05 21:28 UTC (permalink / raw)
To: Gowtham Tammana; +Cc: meta-arago, denys, Krunal Bhargav
On Mon, Apr 05, 2021 at 03:39:27PM -0500, Gowtham Tammana wrote:
> qtwebkit build is failing to set EGL_NO_X11 on platforms with no x11
> support causing below failure.
>
> ```{.package=qtwebkit .version=dunfell}
> In file included from
> tisdk/build/arago-tmp-external-arm-glibc/work/aarch64-linux/qtwebkit/5.14.2+gitAUTOINC+ab1bd15209-r0.arago7/recipe-sysroot/usr/include/EGL/egl.h:39,
> from tisdk/build/arago-tmp-external-arm-glibc/work/aarch64-linux/qtwebkit/5.14.2+gitAUTOINC+ab1bd15209-r0.arago7/git/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.cpp:36:
> tisdk/build/arago-tmp-external-arm-glibc/work/aarch64-linux/qtwebkit/5.14.2+gitAUTOINC+ab1bd15209-r0.arago7/recipe-sysroot/usr/include/EGL/eglplatform.h:134:10: fatal error: X11/Xlib.h: No such file or directory
> 134 | #include <X11/Xlib.h>
> | ^~~~~~~~~~~~
> compilation terminated.
> ```
>
> Setting up the flag EGL_NO_X11 when X11 target is disabled.
>
> Signed-off-by: Gowtham Tammana <g-tammana@ti.com>
Reviewed-by: Denys Dmytriyenko <denys@konsulko.com>
> ---
> ...re-PlatformQt.cmake-Fix-no-x11-build.patch | 46 +++++++++++++++++++
> .../recipes-qt/qt5/qtwebkit_%.bbappend | 3 +-
> 2 files changed, 48 insertions(+), 1 deletion(-)
> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-WebCore-PlatformQt.cmake-Fix-no-x11-build.patch
>
> diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-WebCore-PlatformQt.cmake-Fix-no-x11-build.patch b/meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-WebCore-PlatformQt.cmake-Fix-no-x11-build.patch
> new file mode 100644
> index 00000000..c70b3dc0
> --- /dev/null
> +++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-WebCore-PlatformQt.cmake-Fix-no-x11-build.patch
> @@ -0,0 +1,46 @@
> +From 82b7ec12b768ba9de4b7a4ae71500a3de6574bfd Mon Sep 17 00:00:00 2001
> +From: Gowtham Tammana <g-tammana@ti.com>
> +Date: Thu, 1 Apr 2021 10:45:13 -0500
> +Subject: [PATCH] WebCore/PlatformQt.cmake: Fix no x11 build
> +
> +For platforms with no x11 support, egl package config sets up EGL_NO_X11
> +flag. However the build is not picking up this flag at the moment
> +causing below build failure.
> +
> +```{.package=qtwebkit .version=dunfell}
> +In file included from
> +tisdk/build/arago-tmp-external-arm-glibc/work/aarch64-linux/qtwebkit/5.14.2+gitAUTOINC+ab1bd15209-r0.arago7/recipe-sysroot/usr/include/EGL/egl.h:39,
> + from tisdk/build/arago-tmp-external-arm-glibc/work/aarch64-linux/qtwebkit/5.14.2+gitAUTOINC+ab1bd15209-r0.arago7/git/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.cpp:36:
> +tisdk/build/arago-tmp-external-arm-glibc/work/aarch64-linux/qtwebkit/5.14.2+gitAUTOINC+ab1bd15209-r0.arago7/recipe-sysroot/usr/include/EGL/eglplatform.h:134:10: fatal error: X11/Xlib.h: No such file or directory
> + 134 | #include <X11/Xlib.h>
> + | ^~~~~~~~~~~~
> +compilation terminated.
> +```
> +
> +Set this flag explicitly when there is no X11 target enable.
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Gowtham Tammana <g-tammana@ti.com>
> +---
> + Source/WebCore/PlatformQt.cmake | 4 ++++
> + 1 file changed, 4 insertions(+)
> +
> +diff --git a/Source/WebCore/PlatformQt.cmake b/Source/WebCore/PlatformQt.cmake
> +index 99c625dc3..375d28a47 100644
> +--- a/Source/WebCore/PlatformQt.cmake
> ++++ b/Source/WebCore/PlatformQt.cmake
> +@@ -350,6 +350,10 @@ if (ENABLE_OPENGL)
> + ${Qt5Gui_EGL_LIBRARIES}
> + ${Qt5Gui_OPENGL_LIBRARIES}
> + )
> ++ if (NOT ENABLE_X11_TARGET)
> ++ # EGL definitions are not getting detected. Add the EGL_NO_X11 flag.
> ++ add_definitions("-DEGL_NO_X11")
> ++ endif ()
> + else ()
> + list(APPEND WebCore_SOURCES
> + platform/graphics/opengl/Extensions3DOpenGL.cpp
> +--
> +2.31.1
> +
> diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend b/meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend
> index 75213487..308f3f25 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-WebCore-PlatformQt.cmake-Fix-no-x11-build.patch \
> "
>
> -PR_append = ".arago7"
> +PR_append = ".arago8"
>
> EXTRA_OECMAKE_append = " -DCMAKE_BUILD_TYPE=Release"
>
> --
> 2.31.1
>
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
>
--
Regards,
Denys Dmytriyenko <denis@denix.org>
PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964
^ permalink raw reply [flat|nested] 8+ messages in thread
* [dunfell][PATCH v2 3/3] qtwebkit: Cleanup old patches
2021-04-05 20:39 [dunfell][PATCH v2 0/3] qtwebkit: Fix no x11 build Gowtham Tammana
2021-04-05 20:39 ` [dunfell][PATCH v2 1/3] Revert "HACK: qtwebkit: define MESA_EGL_NO_X11_HEADERS at ANGLE/khrplatform.h" Gowtham Tammana
2021-04-05 20:39 ` [dunfell][PATCH v2 2/3] qtwebkit: Fix no X11 build Gowtham Tammana
@ 2021-04-05 20:39 ` Gowtham Tammana
2021-04-05 21:28 ` Denys Dmytriyenko
2021-04-05 21:19 ` [dunfell][PATCH v2 0/3] qtwebkit: Fix no x11 build Denys Dmytriyenko
3 siblings, 1 reply; 8+ messages in thread
From: Gowtham Tammana @ 2021-04-05 20:39 UTC (permalink / raw)
To: meta-arago, Praneeth Bajjuri, denys; +Cc: Krunal Bhargav
Remove the patches that are no longer needed.
Signed-off-by: Gowtham Tammana <g-tammana@ti.com>
---
...e-to-use-GL_NoX-version-of-GraphicsS.patch | 29 ----------------
.../qt5/qtwebkit/GraphicsSurfaceToken.h.patch | 33 -------------------
.../recipes-qt/qt5/qtwebkit/WebCore.pri.patch | 17 ----------
.../recipes-qt/qt5/qtwebkit_%.bbappend | 6 +---
4 files changed, 1 insertion(+), 84 deletions(-)
delete mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-Target.pri-update-to-use-GL_NoX-version-of-GraphicsS.patch
delete mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceToken.h.patch
delete mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/WebCore.pri.patch
diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-Target.pri-update-to-use-GL_NoX-version-of-GraphicsS.patch b/meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-Target.pri-update-to-use-GL_NoX-version-of-GraphicsS.patch
deleted file mode 100644
index 55a4c032..00000000
--- a/meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-Target.pri-update-to-use-GL_NoX-version-of-GraphicsS.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 90de2ab42bdd51b92dd00f700d6766ca1ffd23c0 Mon Sep 17 00:00:00 2001
-From: Denys Dmytriyenko <denys@ti.com>
-Date: Thu, 17 Jul 2014 16:11:46 -0400
-Subject: [PATCH] Target.pri: update to use GL_NoX version of GraphicsSurface
- sources
-
-Signed-off-by: Denys Dmytriyenko <denys@ti.com>
----
- Source/WebCore/Target.pri | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/Source/WebCore/Target.pri b/Source/WebCore/Target.pri
-index e2044bc..cc9bdd4 100644
---- a/Source/WebCore/Target.pri
-+++ b/Source/WebCore/Target.pri
-@@ -4283,6 +4283,10 @@ use?(GRAPHICS_SURFACE) {
- platform/graphics/surfaces/glx/X11Helper.cpp \
- platform/graphics/surfaces/glx/GraphicsSurfaceGLX.cpp
- }
-+ contains(QT_CONFIG, opengles2) {
-+ SOURCES -= platform/graphics/surfaces/qt/GraphicsSurfaceGLX.cpp
-+ SOURCES += platform/graphics/surfaces/qt/GraphicsSurfaceGL_NoX.cpp
-+ }
- }
-
- build?(qttestsupport) {
---
-2.0.0
-
diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceToken.h.patch b/meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceToken.h.patch
deleted file mode 100644
index 722df392..00000000
--- a/meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceToken.h.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- qtwebkit/Source/WebCore/platform/graphics/surfaces/GraphicsSurfaceToken.h.orig 2013-09-07 13:44:47.906849335 +0530
-+++ qtwebkit/Source/WebCore/platform/graphics/surfaces/GraphicsSurfaceToken.h 2013-09-07 13:46:12.554845618 +0530
-@@ -50,17 +50,30 @@ struct GraphicsSurfaceToken {
- {
- return frontBufferHandle != rhs.frontBufferHandle;
- }
-
- bool isValid() const
- {
- return frontBufferHandle;
- }
-+#elif PLATFORM(QT)
-+ GraphicsSurfaceToken(uint32_t windowID = 0)
-+ : frontBufferHandle(windowID)
-+ { }
-+
-+ bool operator!=(const GraphicsSurfaceToken &rhs) const
-+ {
-+ return frontBufferHandle != rhs.frontBufferHandle;
-+ }
-
-+ bool isValid() const
-+ {
-+ return frontBufferHandle;
-+ }
- #endif
-
- #if OS(DARWIN) || OS(WINDOWS)
- GraphicsSurfaceToken(BufferHandle frontBuffer = 0, BufferHandle backBuffer = 0)
- : frontBufferHandle(frontBuffer)
- , backBufferHandle(backBuffer)
- { }
-
diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit/WebCore.pri.patch b/meta-arago-distro/recipes-qt/qt5/qtwebkit/WebCore.pri.patch
deleted file mode 100644
index 276b3cf8..00000000
--- a/meta-arago-distro/recipes-qt/qt5/qtwebkit/WebCore.pri.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/Source/WebCore/WebCore.pri b/Source/WebCore/WebCore.pri
-index 0189394..00f7090 100644
---- a/Source/WebCore/WebCore.pri
-+++ b/Source/WebCore/WebCore.pri
-@@ -227,8 +227,10 @@ use?(3D_GRAPHICS) {
- use?(GRAPHICS_SURFACE) {
- mac: LIBS += -framework IOSurface -framework CoreFoundation
- linux-*: {
-- LIBS += -lXcomposite -lXrender
-- CONFIG *= x11
-+ xlibAvailable() {
-+ LIBS += -lXcomposite -lXrender
-+ CONFIG *= x11
-+ }
- }
- }
-
diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend b/meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend
index 308f3f25..5bcef47f 100644
--- a/meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend
+++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend
@@ -1,15 +1,11 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-# file://GraphicsSurfaceToken.h.patch
-# file://0001-Target.pri-update-to-use-GL_NoX-version-of-GraphicsS.patch
-# file://WebCore.pri.patch
-
SRC_URI += " \
file://GraphicsSurfaceGL_NoX.cpp.patch \
file://0001-WebCore-PlatformQt.cmake-Fix-no-x11-build.patch \
"
-PR_append = ".arago8"
+PR_append = ".arago9"
EXTRA_OECMAKE_append = " -DCMAKE_BUILD_TYPE=Release"
--
2.31.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [dunfell][PATCH v2 3/3] qtwebkit: Cleanup old patches
2021-04-05 20:39 ` [dunfell][PATCH v2 3/3] qtwebkit: Cleanup old patches Gowtham Tammana
@ 2021-04-05 21:28 ` Denys Dmytriyenko
0 siblings, 0 replies; 8+ messages in thread
From: Denys Dmytriyenko @ 2021-04-05 21:28 UTC (permalink / raw)
To: Gowtham Tammana; +Cc: meta-arago, denys, Krunal Bhargav
On Mon, Apr 05, 2021 at 03:39:28PM -0500, Gowtham Tammana wrote:
> Remove the patches that are no longer needed.
>
> Signed-off-by: Gowtham Tammana <g-tammana@ti.com>
Reviewed-by: Denys Dmytriyenko <denys@konsulko.com>
> ---
> ...e-to-use-GL_NoX-version-of-GraphicsS.patch | 29 ----------------
> .../qt5/qtwebkit/GraphicsSurfaceToken.h.patch | 33 -------------------
> .../recipes-qt/qt5/qtwebkit/WebCore.pri.patch | 17 ----------
> .../recipes-qt/qt5/qtwebkit_%.bbappend | 6 +---
> 4 files changed, 1 insertion(+), 84 deletions(-)
> delete mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-Target.pri-update-to-use-GL_NoX-version-of-GraphicsS.patch
> delete mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceToken.h.patch
> delete mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/WebCore.pri.patch
>
> diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-Target.pri-update-to-use-GL_NoX-version-of-GraphicsS.patch b/meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-Target.pri-update-to-use-GL_NoX-version-of-GraphicsS.patch
> deleted file mode 100644
> index 55a4c032..00000000
> --- a/meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-Target.pri-update-to-use-GL_NoX-version-of-GraphicsS.patch
> +++ /dev/null
> @@ -1,29 +0,0 @@
> -From 90de2ab42bdd51b92dd00f700d6766ca1ffd23c0 Mon Sep 17 00:00:00 2001
> -From: Denys Dmytriyenko <denys@ti.com>
> -Date: Thu, 17 Jul 2014 16:11:46 -0400
> -Subject: [PATCH] Target.pri: update to use GL_NoX version of GraphicsSurface
> - sources
> -
> -Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> ----
> - Source/WebCore/Target.pri | 4 ++++
> - 1 file changed, 4 insertions(+)
> -
> -diff --git a/Source/WebCore/Target.pri b/Source/WebCore/Target.pri
> -index e2044bc..cc9bdd4 100644
> ---- a/Source/WebCore/Target.pri
> -+++ b/Source/WebCore/Target.pri
> -@@ -4283,6 +4283,10 @@ use?(GRAPHICS_SURFACE) {
> - platform/graphics/surfaces/glx/X11Helper.cpp \
> - platform/graphics/surfaces/glx/GraphicsSurfaceGLX.cpp
> - }
> -+ contains(QT_CONFIG, opengles2) {
> -+ SOURCES -= platform/graphics/surfaces/qt/GraphicsSurfaceGLX.cpp
> -+ SOURCES += platform/graphics/surfaces/qt/GraphicsSurfaceGL_NoX.cpp
> -+ }
> - }
> -
> - build?(qttestsupport) {
> ---
> -2.0.0
> -
> diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceToken.h.patch b/meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceToken.h.patch
> deleted file mode 100644
> index 722df392..00000000
> --- a/meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceToken.h.patch
> +++ /dev/null
> @@ -1,33 +0,0 @@
> ---- qtwebkit/Source/WebCore/platform/graphics/surfaces/GraphicsSurfaceToken.h.orig 2013-09-07 13:44:47.906849335 +0530
> -+++ qtwebkit/Source/WebCore/platform/graphics/surfaces/GraphicsSurfaceToken.h 2013-09-07 13:46:12.554845618 +0530
> -@@ -50,17 +50,30 @@ struct GraphicsSurfaceToken {
> - {
> - return frontBufferHandle != rhs.frontBufferHandle;
> - }
> -
> - bool isValid() const
> - {
> - return frontBufferHandle;
> - }
> -+#elif PLATFORM(QT)
> -+ GraphicsSurfaceToken(uint32_t windowID = 0)
> -+ : frontBufferHandle(windowID)
> -+ { }
> -+
> -+ bool operator!=(const GraphicsSurfaceToken &rhs) const
> -+ {
> -+ return frontBufferHandle != rhs.frontBufferHandle;
> -+ }
> -
> -+ bool isValid() const
> -+ {
> -+ return frontBufferHandle;
> -+ }
> - #endif
> -
> - #if OS(DARWIN) || OS(WINDOWS)
> - GraphicsSurfaceToken(BufferHandle frontBuffer = 0, BufferHandle backBuffer = 0)
> - : frontBufferHandle(frontBuffer)
> - , backBufferHandle(backBuffer)
> - { }
> -
> diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit/WebCore.pri.patch b/meta-arago-distro/recipes-qt/qt5/qtwebkit/WebCore.pri.patch
> deleted file mode 100644
> index 276b3cf8..00000000
> --- a/meta-arago-distro/recipes-qt/qt5/qtwebkit/WebCore.pri.patch
> +++ /dev/null
> @@ -1,17 +0,0 @@
> -diff --git a/Source/WebCore/WebCore.pri b/Source/WebCore/WebCore.pri
> -index 0189394..00f7090 100644
> ---- a/Source/WebCore/WebCore.pri
> -+++ b/Source/WebCore/WebCore.pri
> -@@ -227,8 +227,10 @@ use?(3D_GRAPHICS) {
> - use?(GRAPHICS_SURFACE) {
> - mac: LIBS += -framework IOSurface -framework CoreFoundation
> - linux-*: {
> -- LIBS += -lXcomposite -lXrender
> -- CONFIG *= x11
> -+ xlibAvailable() {
> -+ LIBS += -lXcomposite -lXrender
> -+ CONFIG *= x11
> -+ }
> - }
> - }
> -
> diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend b/meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend
> index 308f3f25..5bcef47f 100644
> --- a/meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend
> +++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend
> @@ -1,15 +1,11 @@
> FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
>
> -# file://GraphicsSurfaceToken.h.patch
> -# file://0001-Target.pri-update-to-use-GL_NoX-version-of-GraphicsS.patch
> -# file://WebCore.pri.patch
> -
> SRC_URI += " \
> file://GraphicsSurfaceGL_NoX.cpp.patch \
> file://0001-WebCore-PlatformQt.cmake-Fix-no-x11-build.patch \
> "
>
> -PR_append = ".arago8"
> +PR_append = ".arago9"
>
> EXTRA_OECMAKE_append = " -DCMAKE_BUILD_TYPE=Release"
>
> --
> 2.31.1
>
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
>
--
Regards,
Denys Dmytriyenko <denis@denix.org>
PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [dunfell][PATCH v2 0/3] qtwebkit: Fix no x11 build
2021-04-05 20:39 [dunfell][PATCH v2 0/3] qtwebkit: Fix no x11 build Gowtham Tammana
` (2 preceding siblings ...)
2021-04-05 20:39 ` [dunfell][PATCH v2 3/3] qtwebkit: Cleanup old patches Gowtham Tammana
@ 2021-04-05 21:19 ` Denys Dmytriyenko
2021-04-05 21:37 ` [EXTERNAL] " Tammana, Gowtham
3 siblings, 1 reply; 8+ messages in thread
From: Denys Dmytriyenko @ 2021-04-05 21:19 UTC (permalink / raw)
To: Gowtham Tammana; +Cc: meta-arago, denys, Krunal Bhargav
On Mon, Apr 05, 2021 at 03:39:25PM -0500, Gowtham Tammana wrote:
> qtwebkit build was failing when x11 is enabled for the platform.
I guess another typo enabled/disabled here?
If so, I don't think it requires another revision, as this is just a cover
letter and actual patches seem fine. Thanks.
> This was due to
> qtwebkit build not picking up the EGL_NO_X11 flag from the packageconfig. This
> was earlier fixed by enabling the flag directly in the khrplatform header file.
> Fixing up to pass the flag to build environment itself.
>
> Also cleaned up some of the old patches.
>
> v2:
> - fixed typo in patch 2/3 (qtwebkit: Fix no X11 build)
>
> Gowtham Tammana (3):
> Revert "HACK: qtwebkit: define MESA_EGL_NO_X11_HEADERS at
> ANGLE/khrplatform.h"
> qtwebkit: Fix no X11 build
> qtwebkit: Cleanup old patches
>
> ...atform.h-add-define-MESA_EGL_NO_X11_.patch | 30 ------------
> ...e-to-use-GL_NoX-version-of-GraphicsS.patch | 29 ------------
> ...re-PlatformQt.cmake-Fix-no-x11-build.patch | 46 +++++++++++++++++++
> .../qt5/qtwebkit/GraphicsSurfaceToken.h.patch | 33 -------------
> .../recipes-qt/qt5/qtwebkit/WebCore.pri.patch | 17 -------
> .../recipes-qt/qt5/qtwebkit_%.bbappend | 8 +---
> 6 files changed, 48 insertions(+), 115 deletions(-)
> delete mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-HACK-ANGLE-khrplatform.h-add-define-MESA_EGL_NO_X11_.patch
> delete mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-Target.pri-update-to-use-GL_NoX-version-of-GraphicsS.patch
> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-WebCore-PlatformQt.cmake-Fix-no-x11-build.patch
> delete mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceToken.h.patch
> delete mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/WebCore.pri.patch
>
> --
> 2.31.1
>
--
Regards,
Denys Dmytriyenko <denis@denix.org>
PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [EXTERNAL] Re: [dunfell][PATCH v2 0/3] qtwebkit: Fix no x11 build
2021-04-05 21:19 ` [dunfell][PATCH v2 0/3] qtwebkit: Fix no x11 build Denys Dmytriyenko
@ 2021-04-05 21:37 ` Tammana, Gowtham
0 siblings, 0 replies; 8+ messages in thread
From: Tammana, Gowtham @ 2021-04-05 21:37 UTC (permalink / raw)
To: Denys Dmytriyenko
Cc: meta-arago@arago-project.org, denys@konsulko.com, Bhargav, Krunal
>-----Original Message-----
>From: Denys Dmytriyenko <denis@denix.org>
>Sent: Monday, April 05, 2021 4:20 PM
>To: Tammana, Gowtham <g-tammana@ti.com>
>Cc: meta-arago@arago-project.org; Bajjuri, Praneeth <praneeth@ti.com>;
>denys@konsulko.com; Bhargav, Krunal <k-bhargav@ti.com>
>Subject: [EXTERNAL] Re: [meta-arago] [dunfell][PATCH v2 0/3] qtwebkit: Fix
>no x11 build
>
>On Mon, Apr 05, 2021 at 03:39:25PM -0500, Gowtham Tammana wrote:
>> qtwebkit build was failing when x11 is enabled for the platform.
>
>I guess another typo enabled/disabled here?
Yes another typo ☹ should have been disabled.
>If so, I don't think it requires another revision, as this is just a cover
>letter and actual patches seem fine. Thanks.
Thanks for the review.
Gowtham
>> This was due to
>> qtwebkit build not picking up the EGL_NO_X11 flag from the
>packageconfig. This
>> was earlier fixed by enabling the flag directly in the khrplatform
>header file.
>> Fixing up to pass the flag to build environment itself.
>>
>> Also cleaned up some of the old patches.
>>
>> v2:
>> - fixed typo in patch 2/3 (qtwebkit: Fix no X11 build)
>>
>> Gowtham Tammana (3):
>> Revert "HACK: qtwebkit: define MESA_EGL_NO_X11_HEADERS at
>> ANGLE/khrplatform.h"
>> qtwebkit: Fix no X11 build
>> qtwebkit: Cleanup old patches
>>
>> ...atform.h-add-define-MESA_EGL_NO_X11_.patch | 30 ------------
>> ...e-to-use-GL_NoX-version-of-GraphicsS.patch | 29 ------------
>> ...re-PlatformQt.cmake-Fix-no-x11-build.patch | 46 +++++++++++++++++++
>> .../qt5/qtwebkit/GraphicsSurfaceToken.h.patch | 33 -------------
>> .../recipes-qt/qt5/qtwebkit/WebCore.pri.patch | 17 -------
>> .../recipes-qt/qt5/qtwebkit_%.bbappend | 8 +---
>> 6 files changed, 48 insertions(+), 115 deletions(-)
>> delete mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-HACK-
>ANGLE-khrplatform.h-add-define-MESA_EGL_NO_X11_.patch
>> delete mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-
>Target.pri-update-to-use-GL_NoX-version-of-GraphicsS.patch
>> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-
>WebCore-PlatformQt.cmake-Fix-no-x11-build.patch
>> delete mode 100644 meta-arago-distro/recipes-
>qt/qt5/qtwebkit/GraphicsSurfaceToken.h.patch
>> delete mode 100644 meta-arago-distro/recipes-
>qt/qt5/qtwebkit/WebCore.pri.patch
>>
>> --
>> 2.31.1
>>
>
>--
>Regards,
>Denys Dmytriyenko <denis@denix.org>
>PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
>Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964
^ permalink raw reply [flat|nested] 8+ messages in thread