* [thud/master][PATCH 1/2] qtbase: enable gbm/kms and fix compiling error
@ 2019-03-08 23:02 Eric Ruei
2019-03-08 23:02 ` [thud/master][PATCH 2/2] atbase-config: add eglfs_kms configuration file and change wl shell Eric Ruei
2019-03-08 23:47 ` [thud/master][PATCH 1/2] qtbase: enable gbm/kms and fix compiling error Denys Dmytriyenko
0 siblings, 2 replies; 9+ messages in thread
From: Eric Ruei @ 2019-03-08 23:02 UTC (permalink / raw)
To: meta-arago
- enable gbm/kms for eglfs_kms
- fix compiling error at platform/eglfs_kms
- remove unused patch which has been upstreamed
Signed-off-by: Eric Ruei <e-ruei1@ti.com>
---
...ure-Set-wrap-mode-if-NPOT-textures-are-no.patch | 65 ----------------------
...ins-platforms-eglfs_kms-fix-compiler-erro.patch | 57 +++++++++++++++++++
meta-arago-distro/recipes-qt/qt5/qtbase_%.bbappend | 12 +++-
3 files changed, 66 insertions(+), 68 deletions(-)
delete mode 100644 meta-arago-distro/recipes-qt/qt5/qtbase/0001-QOpenGLTexture-Set-wrap-mode-if-NPOT-textures-are-no.patch
create mode 100644 meta-arago-distro/recipes-qt/qt5/qtbase/0001-qtbase-plugins-platforms-eglfs_kms-fix-compiler-erro.patch
diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase/0001-QOpenGLTexture-Set-wrap-mode-if-NPOT-textures-are-no.patch b/meta-arago-distro/recipes-qt/qt5/qtbase/0001-QOpenGLTexture-Set-wrap-mode-if-NPOT-textures-are-no.patch
deleted file mode 100644
index 84a0195..0000000
--- a/meta-arago-distro/recipes-qt/qt5/qtbase/0001-QOpenGLTexture-Set-wrap-mode-if-NPOT-textures-are-no.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From fbb9c0461c14196ac7100c90088c15263d0cccbb Mon Sep 17 00:00:00 2001
-From: Johan Klokkhammer Helsing <johan.helsing@qt.io>
-Date: Tue, 3 Apr 2018 14:42:15 +0200
-Subject: [PATCH] QOpenGLTexture: Set wrap mode if NPOT textures are not fully
- supported
-
-The OpenGL wrap mode defaults to GL_REPEAT although it is not supported for
-non-power-of-two textures on hardware that only has limited support.
-
-I.e. the following would create a texture with an invalid wrap mode:
-
- auto *t = new QOpenGLTexture(QOpenGLTexture::Target2D);
- t.setSize(123, 456);
-
-This patch adds a check in QOpenGLWindow::setSize to see if it's called with a
-non-power-of-two size on hardware without full support, and if so sets wrapMode
-to ClampToEdge (which should work on devices with limited support).
-
-Task-number: QTBUG-67418
-Change-Id: I56e9f4383dbf5430c2bc5e4e9e585712b3603c13
-Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
----
- src/gui/opengl/qopengltexture.cpp | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/src/gui/opengl/qopengltexture.cpp b/src/gui/opengl/qopengltexture.cpp
-index b825b56..cea4b51 100644
---- a/src/gui/opengl/qopengltexture.cpp
-+++ b/src/gui/opengl/qopengltexture.cpp
-@@ -2800,6 +2800,11 @@ QOpenGLTexture::TextureFormat QOpenGLTexture::format() const
- return d->format;
- }
-
-+static bool isNpot(int width, int height = 1, int depth = 1)
-+{
-+ return width & (width-1) || height & (height-1) || depth & (depth-1);
-+}
-+
- /*!
- Sets the dimensions of this texture object to \a width,
- \a height, and \a depth. The default for each dimension is 1.
-@@ -2807,6 +2812,10 @@ QOpenGLTexture::TextureFormat QOpenGLTexture::format() const
- implementation. Allocating storage for a texture less than the
- maximum size can still fail if your system is low on resources.
-
-+ If a non-power-of-two \a width, \a height or \a depth is provided and your
-+ OpenGL implementation doesn't have support for repeating non-power-of-two
-+ textures, then the wrap mode is automatically set to ClampToEdge.
-+
- \sa width(), height(), depth()
- */
- void QOpenGLTexture::setSize(int width, int height, int depth)
-@@ -2819,6 +2828,9 @@ void QOpenGLTexture::setSize(int width, int height, int depth)
- return;
- }
-
-+ if (isNpot(width, height, depth) && !hasFeature(Feature::NPOTTextureRepeat) && d->target != Target::TargetRectangle)
-+ d->setWrapMode(WrapMode::ClampToEdge);
-+
- switch (d->target) {
- case QOpenGLTexture::Target1D:
- case QOpenGLTexture::Target1DArray:
---
-1.9.1
-
diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase/0001-qtbase-plugins-platforms-eglfs_kms-fix-compiler-erro.patch b/meta-arago-distro/recipes-qt/qt5/qtbase/0001-qtbase-plugins-platforms-eglfs_kms-fix-compiler-erro.patch
new file mode 100644
index 0000000..cbedfc0
--- /dev/null
+++ b/meta-arago-distro/recipes-qt/qt5/qtbase/0001-qtbase-plugins-platforms-eglfs_kms-fix-compiler-erro.patch
@@ -0,0 +1,57 @@
+From 7e1d01d4dc022f4da117f87a993d03b084134018 Mon Sep 17 00:00:00 2001
+From: Eric Ruei <e-ruei1@ti.com>
+Date: Fri, 8 Mar 2019 17:02:38 -0500
+Subject: [PATCH] qtbase: plugins: platforms: eglfs_kms: fix compiler error
+
+Upstream_Status: Pending
+
+Signed-off-by: Eric Ruei <e-ruei1@ti.com>
+---
+ .../eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.cpp | 7 +------
+ .../eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.h | 5 +++++
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.cpp
+index 4023381..eb24175 100644
+--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.cpp
++++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.cpp
+@@ -61,11 +61,6 @@ QEglFSKmsGbmIntegration::QEglFSKmsGbmIntegration()
+ qCDebug(qLcEglfsKmsDebug, "New DRM/KMS via GBM integration created");
+ }
+
+-#ifndef EGL_EXT_platform_base
+-typedef EGLDisplay (EGLAPIENTRYP PFNEGLGETPLATFORMDISPLAYEXTPROC) (EGLenum platform, void *native_display, const EGLint *attrib_list);
+-typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC) (EGLDisplay dpy, EGLConfig config, void *native_window, const EGLint *attrib_list);
+-#endif
+-
+ #ifndef EGL_PLATFORM_GBM_KHR
+ #define EGL_PLATFORM_GBM_KHR 0x31D7
+ #endif
+@@ -83,7 +78,7 @@ EGLDisplay QEglFSKmsGbmIntegration::createDisplay(EGLNativeDisplayType nativeDis
+ }
+
+ if (getPlatformDisplay) {
+- display = getPlatformDisplay(EGL_PLATFORM_GBM_KHR, nativeDisplay, nullptr);
++ display = getPlatformDisplay(EGL_PLATFORM_GBM_KHR, (void *)nativeDisplay, nullptr);
+ } else {
+ qCDebug(qLcEglfsKmsDebug, "No eglGetPlatformDisplay for GBM, falling back to eglGetDisplay");
+ display = eglGetDisplay(nativeDisplay);
+diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.h
+index 71f232a..6467a21 100644
+--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.h
++++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.h
+@@ -48,6 +48,11 @@
+
+ QT_BEGIN_NAMESPACE
+
++#ifndef EGL_EXT_platform_base
++typedef EGLDisplay (EGLAPIENTRYP PFNEGLGETPLATFORMDISPLAYEXTPROC) (EGLenum platform, void *native_display, const EGLint *attrib_list);
++typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC) (EGLDisplay dpy, EGLConfig config, void *native_window, const EGLint *attrib_list);
++#endif
++
+ class QEglFSKmsDevice;
+
+ class QEglFSKmsGbmIntegration : public QEglFSKmsIntegration
+--
+1.9.1
+
diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase_%.bbappend b/meta-arago-distro/recipes-qt/qt5/qtbase_%.bbappend
index 4cb8f9c..1570e1f 100644
--- a/meta-arago-distro/recipes-qt/qt5/qtbase_%.bbappend
+++ b/meta-arago-distro/recipes-qt/qt5/qtbase_%.bbappend
@@ -4,7 +4,14 @@ GLES_EXTRA_DEPS = "libdrm wayland"
PACKAGECONFIG[gles2] = "-opengl es2 -eglfs,,virtual/libgles2 virtual/egl ${GLES_EXTRA_DEPS}"
-PR_append = ".arago13"
+# the orginal gbm packageconfig requires virtual/libgbm
+# Implement the patch here
+
+PACKAGECONFIG[gbm] = "-gbm,-no-gbm,drm virtual/egl"
+PACKAGECONFIG += "gbm"
+PACKAGECONFIG += "kms"
+
+PR_append = ".arago14"
QT_CONFIG_FLAGS += "-qpa ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', 'eglfs', d)}"
@@ -14,12 +21,11 @@ QT_EGLFS_PATCHES = "\
file://quit.png \
"
-# file://0001-QOpenGLTexture-Set-wrap-mode-if-NPOT-textures-are-no.patch
-
SRC_URI += "\
${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', "${QT_EGLFS_PATCHES}", d)}\
file://0001-deform-Fix-how-controls-are-shown.patch \
file://0002-deform-disable-opengl-button.patch \
+ file://0001-qtbase-plugins-platforms-eglfs_kms-fix-compiler-erro.patch \
"
python do_patch_append() {
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [thud/master][PATCH 2/2] atbase-config: add eglfs_kms configuration file and change wl shell
2019-03-08 23:02 [thud/master][PATCH 1/2] qtbase: enable gbm/kms and fix compiling error Eric Ruei
@ 2019-03-08 23:02 ` Eric Ruei
2019-03-08 23:48 ` Denys Dmytriyenko
2019-03-08 23:47 ` [thud/master][PATCH 1/2] qtbase: enable gbm/kms and fix compiling error Denys Dmytriyenko
1 sibling, 1 reply; 9+ messages in thread
From: Eric Ruei @ 2019-03-08 23:02 UTC (permalink / raw)
To: meta-arago
- add eglfs_kms configuration file
- switch to wl-shell because xdb-shell-v5 is obsolete
Signed-off-by: Eric Ruei <e-ruei1@ti.com>
---
.../recipes-qt/qt5/qtbase-conf/eglfs_kms_cfg.json | 15 +++++++++++++++
meta-arago-distro/recipes-qt/qt5/qtbase-conf/qt_env.sh | 3 ++-
.../recipes-qt/qt5/qtbase-conf/ti33x/qt_env.sh | 3 ++-
meta-arago-distro/recipes-qt/qt5/qtbase-conf_1.0.bb | 10 +++++++---
4 files changed, 26 insertions(+), 5 deletions(-)
create mode 100644 meta-arago-distro/recipes-qt/qt5/qtbase-conf/eglfs_kms_cfg.json
diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase-conf/eglfs_kms_cfg.json b/meta-arago-distro/recipes-qt/qt5/qtbase-conf/eglfs_kms_cfg.json
new file mode 100644
index 0000000..61b834b
--- /dev/null
+++ b/meta-arago-distro/recipes-qt/qt5/qtbase-conf/eglfs_kms_cfg.json
@@ -0,0 +1,15 @@
+{
+ "device": "/dev/dri/card0",
+ "hwcursor": false,
+ "pbuffers": true,
+ "outputs": [
+ {
+ "name": "VGA1",
+ "mode": "off"
+ },
+ {
+ "name": "HDMI1",
+ "mode": "1024x768"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase-conf/qt_env.sh b/meta-arago-distro/recipes-qt/qt5/qtbase-conf/qt_env.sh
index 9701a8e..2014d20 100644
--- a/meta-arago-distro/recipes-qt/qt5/qtbase-conf/qt_env.sh
+++ b/meta-arago-distro/recipes-qt/qt5/qtbase-conf/qt_env.sh
@@ -2,5 +2,6 @@
### QT Environment Variables ###
export SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
+export QT_QPA_EGLFS_KMS_CONFIG=/etc/qt5/eglfs_kms_cfg.json
export QT_QPA_EGLFS_INTEGRATION=none
-export QT_WAYLAND_SHELL_INTEGRATION=xdg-shell-v5
+export QT_WAYLAND_SHELL_INTEGRATION=wl-shell
diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase-conf/ti33x/qt_env.sh b/meta-arago-distro/recipes-qt/qt5/qtbase-conf/ti33x/qt_env.sh
index 68ccf04..8ff0508 100644
--- a/meta-arago-distro/recipes-qt/qt5/qtbase-conf/ti33x/qt_env.sh
+++ b/meta-arago-distro/recipes-qt/qt5/qtbase-conf/ti33x/qt_env.sh
@@ -3,5 +3,6 @@
### QT Environment Variables ###
export QT_QPA_EVDEV_TOUCHSCREEN_PARAMETERS="rotate=180"
export SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
+export QT_QPA_EGLFS_KMS_CONFIG=/etc/qt5/eglfs_kms_cfg.json
export QT_QPA_EGLFS_INTEGRATION=none
-export QT_WAYLAND_SHELL_INTEGRATION=xdg-shell-v5
+export QT_WAYLAND_SHELL_INTEGRATION=wl-shell
diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase-conf_1.0.bb b/meta-arago-distro/recipes-qt/qt5/qtbase-conf_1.0.bb
index b2ad0a8..5c2974e 100644
--- a/meta-arago-distro/recipes-qt/qt5/qtbase-conf_1.0.bb
+++ b/meta-arago-distro/recipes-qt/qt5/qtbase-conf_1.0.bb
@@ -5,12 +5,16 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
PACKAGE_ARCH = "${MACHINE_ARCH}"
-SRC_URI = "file://qt_env.sh"
+SRC_URI = "file://qt_env.sh \
+ file://eglfs_kms_cfg.json \
+ "
-# Add custom Arago qtbase Environment script file
+# Add custom Arago qtbase Environment script and eglfs_kms configuration file
do_install () {
install -d ${D}${sysconfdir}/profile.d
install -m 0644 ${WORKDIR}/qt_env.sh ${D}${sysconfdir}/profile.d/
+ install -d ${D}${sysconfdir}/qt5
+ install -m 0644 ${WORKDIR}/eglfs_kms_cfg.json ${D}${sysconfdir}/qt5/
}
-FILES_${PN} += "${sysconfdir}/profile.d/*"
+FILES_${PN} += "${sysconfdir}/profile.d/* ${sysconfdir}/qt5/*"
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [thud/master][PATCH 1/2] qtbase: enable gbm/kms and fix compiling error
2019-03-08 23:02 [thud/master][PATCH 1/2] qtbase: enable gbm/kms and fix compiling error Eric Ruei
2019-03-08 23:02 ` [thud/master][PATCH 2/2] atbase-config: add eglfs_kms configuration file and change wl shell Eric Ruei
@ 2019-03-08 23:47 ` Denys Dmytriyenko
2019-03-09 0:15 ` Ruei, Eric
1 sibling, 1 reply; 9+ messages in thread
From: Denys Dmytriyenko @ 2019-03-08 23:47 UTC (permalink / raw)
To: Eric Ruei; +Cc: meta-arago
On Fri, Mar 08, 2019 at 06:02:06PM -0500, Eric Ruei wrote:
> - enable gbm/kms for eglfs_kms
> - fix compiling error at platform/eglfs_kms
> - remove unused patch which has been upstreamed
>
> Signed-off-by: Eric Ruei <e-ruei1@ti.com>
> ---
> ...ure-Set-wrap-mode-if-NPOT-textures-are-no.patch | 65 ----------------------
> ...ins-platforms-eglfs_kms-fix-compiler-erro.patch | 57 +++++++++++++++++++
> meta-arago-distro/recipes-qt/qt5/qtbase_%.bbappend | 12 +++-
> 3 files changed, 66 insertions(+), 68 deletions(-)
> delete mode 100644 meta-arago-distro/recipes-qt/qt5/qtbase/0001-QOpenGLTexture-Set-wrap-mode-if-NPOT-textures-are-no.patch
> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtbase/0001-qtbase-plugins-platforms-eglfs_kms-fix-compiler-erro.patch
>
> diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase/0001-QOpenGLTexture-Set-wrap-mode-if-NPOT-textures-are-no.patch b/meta-arago-distro/recipes-qt/qt5/qtbase/0001-QOpenGLTexture-Set-wrap-mode-if-NPOT-textures-are-no.patch
> deleted file mode 100644
> index 84a0195..0000000
> --- a/meta-arago-distro/recipes-qt/qt5/qtbase/0001-QOpenGLTexture-Set-wrap-mode-if-NPOT-textures-are-no.patch
> +++ /dev/null
> @@ -1,65 +0,0 @@
> -From fbb9c0461c14196ac7100c90088c15263d0cccbb Mon Sep 17 00:00:00 2001
> -From: Johan Klokkhammer Helsing <johan.helsing@qt.io>
> -Date: Tue, 3 Apr 2018 14:42:15 +0200
> -Subject: [PATCH] QOpenGLTexture: Set wrap mode if NPOT textures are not fully
> - supported
> -
> -The OpenGL wrap mode defaults to GL_REPEAT although it is not supported for
> -non-power-of-two textures on hardware that only has limited support.
> -
> -I.e. the following would create a texture with an invalid wrap mode:
> -
> - auto *t = new QOpenGLTexture(QOpenGLTexture::Target2D);
> - t.setSize(123, 456);
> -
> -This patch adds a check in QOpenGLWindow::setSize to see if it's called with a
> -non-power-of-two size on hardware without full support, and if so sets wrapMode
> -to ClampToEdge (which should work on devices with limited support).
> -
> -Task-number: QTBUG-67418
> -Change-Id: I56e9f4383dbf5430c2bc5e4e9e585712b3603c13
> -Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
> ----
> - src/gui/opengl/qopengltexture.cpp | 12 ++++++++++++
> - 1 file changed, 12 insertions(+)
> -
> -diff --git a/src/gui/opengl/qopengltexture.cpp b/src/gui/opengl/qopengltexture.cpp
> -index b825b56..cea4b51 100644
> ---- a/src/gui/opengl/qopengltexture.cpp
> -+++ b/src/gui/opengl/qopengltexture.cpp
> -@@ -2800,6 +2800,11 @@ QOpenGLTexture::TextureFormat QOpenGLTexture::format() const
> - return d->format;
> - }
> -
> -+static bool isNpot(int width, int height = 1, int depth = 1)
> -+{
> -+ return width & (width-1) || height & (height-1) || depth & (depth-1);
> -+}
> -+
> - /*!
> - Sets the dimensions of this texture object to \a width,
> - \a height, and \a depth. The default for each dimension is 1.
> -@@ -2807,6 +2812,10 @@ QOpenGLTexture::TextureFormat QOpenGLTexture::format() const
> - implementation. Allocating storage for a texture less than the
> - maximum size can still fail if your system is low on resources.
> -
> -+ If a non-power-of-two \a width, \a height or \a depth is provided and your
> -+ OpenGL implementation doesn't have support for repeating non-power-of-two
> -+ textures, then the wrap mode is automatically set to ClampToEdge.
> -+
> - \sa width(), height(), depth()
> - */
> - void QOpenGLTexture::setSize(int width, int height, int depth)
> -@@ -2819,6 +2828,9 @@ void QOpenGLTexture::setSize(int width, int height, int depth)
> - return;
> - }
> -
> -+ if (isNpot(width, height, depth) && !hasFeature(Feature::NPOTTextureRepeat) && d->target != Target::TargetRectangle)
> -+ d->setWrapMode(WrapMode::ClampToEdge);
> -+
> - switch (d->target) {
> - case QOpenGLTexture::Target1D:
> - case QOpenGLTexture::Target1DArray:
> ---
> -1.9.1
> -
> diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase/0001-qtbase-plugins-platforms-eglfs_kms-fix-compiler-erro.patch b/meta-arago-distro/recipes-qt/qt5/qtbase/0001-qtbase-plugins-platforms-eglfs_kms-fix-compiler-erro.patch
> new file mode 100644
> index 0000000..cbedfc0
> --- /dev/null
> +++ b/meta-arago-distro/recipes-qt/qt5/qtbase/0001-qtbase-plugins-platforms-eglfs_kms-fix-compiler-erro.patch
> @@ -0,0 +1,57 @@
> +From 7e1d01d4dc022f4da117f87a993d03b084134018 Mon Sep 17 00:00:00 2001
> +From: Eric Ruei <e-ruei1@ti.com>
> +Date: Fri, 8 Mar 2019 17:02:38 -0500
> +Subject: [PATCH] qtbase: plugins: platforms: eglfs_kms: fix compiler error
> +
> +Upstream_Status: Pending
> +
> +Signed-off-by: Eric Ruei <e-ruei1@ti.com>
> +---
> + .../eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.cpp | 7 +------
> + .../eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.h | 5 +++++
> + 2 files changed, 6 insertions(+), 6 deletions(-)
> +
> +diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.cpp
> +index 4023381..eb24175 100644
> +--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.cpp
> ++++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.cpp
> +@@ -61,11 +61,6 @@ QEglFSKmsGbmIntegration::QEglFSKmsGbmIntegration()
> + qCDebug(qLcEglfsKmsDebug, "New DRM/KMS via GBM integration created");
> + }
> +
> +-#ifndef EGL_EXT_platform_base
> +-typedef EGLDisplay (EGLAPIENTRYP PFNEGLGETPLATFORMDISPLAYEXTPROC) (EGLenum platform, void *native_display, const EGLint *attrib_list);
> +-typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC) (EGLDisplay dpy, EGLConfig config, void *native_window, const EGLint *attrib_list);
> +-#endif
> +-
> + #ifndef EGL_PLATFORM_GBM_KHR
> + #define EGL_PLATFORM_GBM_KHR 0x31D7
> + #endif
> +@@ -83,7 +78,7 @@ EGLDisplay QEglFSKmsGbmIntegration::createDisplay(EGLNativeDisplayType nativeDis
> + }
> +
> + if (getPlatformDisplay) {
> +- display = getPlatformDisplay(EGL_PLATFORM_GBM_KHR, nativeDisplay, nullptr);
> ++ display = getPlatformDisplay(EGL_PLATFORM_GBM_KHR, (void *)nativeDisplay, nullptr);
> + } else {
> + qCDebug(qLcEglfsKmsDebug, "No eglGetPlatformDisplay for GBM, falling back to eglGetDisplay");
> + display = eglGetDisplay(nativeDisplay);
> +diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.h
> +index 71f232a..6467a21 100644
> +--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.h
> ++++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.h
> +@@ -48,6 +48,11 @@
> +
> + QT_BEGIN_NAMESPACE
> +
> ++#ifndef EGL_EXT_platform_base
> ++typedef EGLDisplay (EGLAPIENTRYP PFNEGLGETPLATFORMDISPLAYEXTPROC) (EGLenum platform, void *native_display, const EGLint *attrib_list);
> ++typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC) (EGLDisplay dpy, EGLConfig config, void *native_window, const EGLint *attrib_list);
> ++#endif
> ++
> + class QEglFSKmsDevice;
> +
> + class QEglFSKmsGbmIntegration : public QEglFSKmsIntegration
> +--
> +1.9.1
> +
> diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase_%.bbappend b/meta-arago-distro/recipes-qt/qt5/qtbase_%.bbappend
> index 4cb8f9c..1570e1f 100644
> --- a/meta-arago-distro/recipes-qt/qt5/qtbase_%.bbappend
> +++ b/meta-arago-distro/recipes-qt/qt5/qtbase_%.bbappend
> @@ -4,7 +4,14 @@ GLES_EXTRA_DEPS = "libdrm wayland"
>
> PACKAGECONFIG[gles2] = "-opengl es2 -eglfs,,virtual/libgles2 virtual/egl ${GLES_EXTRA_DEPS}"
>
> -PR_append = ".arago13"
> +# the orginal gbm packageconfig requires virtual/libgbm
Shouldn't be doing this. Our own libgbm should now provide virtual/libgbm -
sent a patch to meta-ti.
> +# Implement the patch here
> +
> +PACKAGECONFIG[gbm] = "-gbm,-no-gbm,drm virtual/egl"
> +PACKAGECONFIG += "gbm"
> +PACKAGECONFIG += "kms"
Any PACKAGECONFIG settings should be done in the distro conf.
> +
> +PR_append = ".arago14"
>
> QT_CONFIG_FLAGS += "-qpa ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', 'eglfs', d)}"
>
> @@ -14,12 +21,11 @@ QT_EGLFS_PATCHES = "\
> file://quit.png \
> "
>
> -# file://0001-QOpenGLTexture-Set-wrap-mode-if-NPOT-textures-are-no.patch
> -
> SRC_URI += "\
> ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', "${QT_EGLFS_PATCHES}", d)}\
> file://0001-deform-Fix-how-controls-are-shown.patch \
> file://0002-deform-disable-opengl-button.patch \
> + file://0001-qtbase-plugins-platforms-eglfs_kms-fix-compiler-erro.patch \
> "
>
> python do_patch_append() {
> --
> 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] 9+ messages in thread
* Re: [thud/master][PATCH 2/2] atbase-config: add eglfs_kms configuration file and change wl shell
2019-03-08 23:02 ` [thud/master][PATCH 2/2] atbase-config: add eglfs_kms configuration file and change wl shell Eric Ruei
@ 2019-03-08 23:48 ` Denys Dmytriyenko
2019-03-09 0:16 ` Ruei, Eric
0 siblings, 1 reply; 9+ messages in thread
From: Denys Dmytriyenko @ 2019-03-08 23:48 UTC (permalink / raw)
To: Eric Ruei; +Cc: meta-arago
> [PATCH 2/2] atbase-config: add eglfs_kms configuration file and change wl shell
atbase? typo?
On Fri, Mar 08, 2019 at 06:02:07PM -0500, Eric Ruei wrote:
> - add eglfs_kms configuration file
> - switch to wl-shell because xdb-shell-v5 is obsolete
>
> Signed-off-by: Eric Ruei <e-ruei1@ti.com>
> ---
> .../recipes-qt/qt5/qtbase-conf/eglfs_kms_cfg.json | 15 +++++++++++++++
> meta-arago-distro/recipes-qt/qt5/qtbase-conf/qt_env.sh | 3 ++-
> .../recipes-qt/qt5/qtbase-conf/ti33x/qt_env.sh | 3 ++-
> meta-arago-distro/recipes-qt/qt5/qtbase-conf_1.0.bb | 10 +++++++---
> 4 files changed, 26 insertions(+), 5 deletions(-)
> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtbase-conf/eglfs_kms_cfg.json
>
> diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase-conf/eglfs_kms_cfg.json b/meta-arago-distro/recipes-qt/qt5/qtbase-conf/eglfs_kms_cfg.json
> new file mode 100644
> index 0000000..61b834b
> --- /dev/null
> +++ b/meta-arago-distro/recipes-qt/qt5/qtbase-conf/eglfs_kms_cfg.json
> @@ -0,0 +1,15 @@
> +{
> + "device": "/dev/dri/card0",
> + "hwcursor": false,
> + "pbuffers": true,
> + "outputs": [
> + {
> + "name": "VGA1",
> + "mode": "off"
> + },
> + {
> + "name": "HDMI1",
> + "mode": "1024x768"
> + }
> + ]
> +}
> \ No newline at end of file
> diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase-conf/qt_env.sh b/meta-arago-distro/recipes-qt/qt5/qtbase-conf/qt_env.sh
> index 9701a8e..2014d20 100644
> --- a/meta-arago-distro/recipes-qt/qt5/qtbase-conf/qt_env.sh
> +++ b/meta-arago-distro/recipes-qt/qt5/qtbase-conf/qt_env.sh
> @@ -2,5 +2,6 @@
>
> ### QT Environment Variables ###
> export SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
> +export QT_QPA_EGLFS_KMS_CONFIG=/etc/qt5/eglfs_kms_cfg.json
> export QT_QPA_EGLFS_INTEGRATION=none
> -export QT_WAYLAND_SHELL_INTEGRATION=xdg-shell-v5
> +export QT_WAYLAND_SHELL_INTEGRATION=wl-shell
> diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase-conf/ti33x/qt_env.sh b/meta-arago-distro/recipes-qt/qt5/qtbase-conf/ti33x/qt_env.sh
> index 68ccf04..8ff0508 100644
> --- a/meta-arago-distro/recipes-qt/qt5/qtbase-conf/ti33x/qt_env.sh
> +++ b/meta-arago-distro/recipes-qt/qt5/qtbase-conf/ti33x/qt_env.sh
> @@ -3,5 +3,6 @@
> ### QT Environment Variables ###
> export QT_QPA_EVDEV_TOUCHSCREEN_PARAMETERS="rotate=180"
> export SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
> +export QT_QPA_EGLFS_KMS_CONFIG=/etc/qt5/eglfs_kms_cfg.json
> export QT_QPA_EGLFS_INTEGRATION=none
> -export QT_WAYLAND_SHELL_INTEGRATION=xdg-shell-v5
> +export QT_WAYLAND_SHELL_INTEGRATION=wl-shell
> diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase-conf_1.0.bb b/meta-arago-distro/recipes-qt/qt5/qtbase-conf_1.0.bb
> index b2ad0a8..5c2974e 100644
> --- a/meta-arago-distro/recipes-qt/qt5/qtbase-conf_1.0.bb
> +++ b/meta-arago-distro/recipes-qt/qt5/qtbase-conf_1.0.bb
> @@ -5,12 +5,16 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
>
> PACKAGE_ARCH = "${MACHINE_ARCH}"
>
> -SRC_URI = "file://qt_env.sh"
> +SRC_URI = "file://qt_env.sh \
> + file://eglfs_kms_cfg.json \
> + "
>
> -# Add custom Arago qtbase Environment script file
> +# Add custom Arago qtbase Environment script and eglfs_kms configuration file
> do_install () {
> install -d ${D}${sysconfdir}/profile.d
> install -m 0644 ${WORKDIR}/qt_env.sh ${D}${sysconfdir}/profile.d/
> + install -d ${D}${sysconfdir}/qt5
> + install -m 0644 ${WORKDIR}/eglfs_kms_cfg.json ${D}${sysconfdir}/qt5/
> }
>
> -FILES_${PN} += "${sysconfdir}/profile.d/*"
> +FILES_${PN} += "${sysconfdir}/profile.d/* ${sysconfdir}/qt5/*"
> --
> 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] 9+ messages in thread
* Re: [thud/master][PATCH 1/2] qtbase: enable gbm/kms and fix compiling error
2019-03-08 23:47 ` [thud/master][PATCH 1/2] qtbase: enable gbm/kms and fix compiling error Denys Dmytriyenko
@ 2019-03-09 0:15 ` Ruei, Eric
2019-03-09 1:06 ` Denys Dmytriyenko
0 siblings, 1 reply; 9+ messages in thread
From: Ruei, Eric @ 2019-03-09 0:15 UTC (permalink / raw)
To: Denys Dmytriyenko, Eric Ruei; +Cc: meta-arago
On 3/8/2019 6:47 PM, Denys Dmytriyenko wrote:
> On Fri, Mar 08, 2019 at 06:02:06PM -0500, Eric Ruei wrote:
>> - enable gbm/kms for eglfs_kms
>> - fix compiling error at platform/eglfs_kms
>> - remove unused patch which has been upstreamed
>>
>> Signed-off-by: Eric Ruei <e-ruei1@ti.com>
>> ---
>> ...ure-Set-wrap-mode-if-NPOT-textures-are-no.patch | 65 ----------------------
>> ...ins-platforms-eglfs_kms-fix-compiler-erro.patch | 57 +++++++++++++++++++
>> meta-arago-distro/recipes-qt/qt5/qtbase_%.bbappend | 12 +++-
>> 3 files changed, 66 insertions(+), 68 deletions(-)
>> delete mode 100644 meta-arago-distro/recipes-qt/qt5/qtbase/0001-QOpenGLTexture-Set-wrap-mode-if-NPOT-textures-are-no.patch
>> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtbase/0001-qtbase-plugins-platforms-eglfs_kms-fix-compiler-erro.patch
>>
>> diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase/0001-QOpenGLTexture-Set-wrap-mode-if-NPOT-textures-are-no.patch b/meta-arago-distro/recipes-qt/qt5/qtbase/0001-QOpenGLTexture-Set-wrap-mode-if-NPOT-textures-are-no.patch
>> deleted file mode 100644
>> index 84a0195..0000000
>> --- a/meta-arago-distro/recipes-qt/qt5/qtbase/0001-QOpenGLTexture-Set-wrap-mode-if-NPOT-textures-are-no.patch
>> +++ /dev/null
>> @@ -1,65 +0,0 @@
>> -From fbb9c0461c14196ac7100c90088c15263d0cccbb Mon Sep 17 00:00:00 2001
>> -From: Johan Klokkhammer Helsing <johan.helsing@qt.io>
>> -Date: Tue, 3 Apr 2018 14:42:15 +0200
>> -Subject: [PATCH] QOpenGLTexture: Set wrap mode if NPOT textures are not fully
>> - supported
>> -
>> -The OpenGL wrap mode defaults to GL_REPEAT although it is not supported for
>> -non-power-of-two textures on hardware that only has limited support.
>> -
>> -I.e. the following would create a texture with an invalid wrap mode:
>> -
>> - auto *t = new QOpenGLTexture(QOpenGLTexture::Target2D);
>> - t.setSize(123, 456);
>> -
>> -This patch adds a check in QOpenGLWindow::setSize to see if it's called with a
>> -non-power-of-two size on hardware without full support, and if so sets wrapMode
>> -to ClampToEdge (which should work on devices with limited support).
>> -
>> -Task-number: QTBUG-67418
>> -Change-Id: I56e9f4383dbf5430c2bc5e4e9e585712b3603c13
>> -Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
>> ----
>> - src/gui/opengl/qopengltexture.cpp | 12 ++++++++++++
>> - 1 file changed, 12 insertions(+)
>> -
>> -diff --git a/src/gui/opengl/qopengltexture.cpp b/src/gui/opengl/qopengltexture.cpp
>> -index b825b56..cea4b51 100644
>> ---- a/src/gui/opengl/qopengltexture.cpp
>> -+++ b/src/gui/opengl/qopengltexture.cpp
>> -@@ -2800,6 +2800,11 @@ QOpenGLTexture::TextureFormat QOpenGLTexture::format() const
>> - return d->format;
>> - }
>> -
>> -+static bool isNpot(int width, int height = 1, int depth = 1)
>> -+{
>> -+ return width & (width-1) || height & (height-1) || depth & (depth-1);
>> -+}
>> -+
>> - /*!
>> - Sets the dimensions of this texture object to \a width,
>> - \a height, and \a depth. The default for each dimension is 1.
>> -@@ -2807,6 +2812,10 @@ QOpenGLTexture::TextureFormat QOpenGLTexture::format() const
>> - implementation. Allocating storage for a texture less than the
>> - maximum size can still fail if your system is low on resources.
>> -
>> -+ If a non-power-of-two \a width, \a height or \a depth is provided and your
>> -+ OpenGL implementation doesn't have support for repeating non-power-of-two
>> -+ textures, then the wrap mode is automatically set to ClampToEdge.
>> -+
>> - \sa width(), height(), depth()
>> - */
>> - void QOpenGLTexture::setSize(int width, int height, int depth)
>> -@@ -2819,6 +2828,9 @@ void QOpenGLTexture::setSize(int width, int height, int depth)
>> - return;
>> - }
>> -
>> -+ if (isNpot(width, height, depth) && !hasFeature(Feature::NPOTTextureRepeat) && d->target != Target::TargetRectangle)
>> -+ d->setWrapMode(WrapMode::ClampToEdge);
>> -+
>> - switch (d->target) {
>> - case QOpenGLTexture::Target1D:
>> - case QOpenGLTexture::Target1DArray:
>> ---
>> -1.9.1
>> -
>> diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase/0001-qtbase-plugins-platforms-eglfs_kms-fix-compiler-erro.patch b/meta-arago-distro/recipes-qt/qt5/qtbase/0001-qtbase-plugins-platforms-eglfs_kms-fix-compiler-erro.patch
>> new file mode 100644
>> index 0000000..cbedfc0
>> --- /dev/null
>> +++ b/meta-arago-distro/recipes-qt/qt5/qtbase/0001-qtbase-plugins-platforms-eglfs_kms-fix-compiler-erro.patch
>> @@ -0,0 +1,57 @@
>> +From 7e1d01d4dc022f4da117f87a993d03b084134018 Mon Sep 17 00:00:00 2001
>> +From: Eric Ruei <e-ruei1@ti.com>
>> +Date: Fri, 8 Mar 2019 17:02:38 -0500
>> +Subject: [PATCH] qtbase: plugins: platforms: eglfs_kms: fix compiler error
>> +
>> +Upstream_Status: Pending
>> +
>> +Signed-off-by: Eric Ruei <e-ruei1@ti.com>
>> +---
>> + .../eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.cpp | 7 +------
>> + .../eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.h | 5 +++++
>> + 2 files changed, 6 insertions(+), 6 deletions(-)
>> +
>> +diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.cpp
>> +index 4023381..eb24175 100644
>> +--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.cpp
>> ++++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.cpp
>> +@@ -61,11 +61,6 @@ QEglFSKmsGbmIntegration::QEglFSKmsGbmIntegration()
>> + qCDebug(qLcEglfsKmsDebug, "New DRM/KMS via GBM integration created");
>> + }
>> +
>> +-#ifndef EGL_EXT_platform_base
>> +-typedef EGLDisplay (EGLAPIENTRYP PFNEGLGETPLATFORMDISPLAYEXTPROC) (EGLenum platform, void *native_display, const EGLint *attrib_list);
>> +-typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC) (EGLDisplay dpy, EGLConfig config, void *native_window, const EGLint *attrib_list);
>> +-#endif
>> +-
>> + #ifndef EGL_PLATFORM_GBM_KHR
>> + #define EGL_PLATFORM_GBM_KHR 0x31D7
>> + #endif
>> +@@ -83,7 +78,7 @@ EGLDisplay QEglFSKmsGbmIntegration::createDisplay(EGLNativeDisplayType nativeDis
>> + }
>> +
>> + if (getPlatformDisplay) {
>> +- display = getPlatformDisplay(EGL_PLATFORM_GBM_KHR, nativeDisplay, nullptr);
>> ++ display = getPlatformDisplay(EGL_PLATFORM_GBM_KHR, (void *)nativeDisplay, nullptr);
>> + } else {
>> + qCDebug(qLcEglfsKmsDebug, "No eglGetPlatformDisplay for GBM, falling back to eglGetDisplay");
>> + display = eglGetDisplay(nativeDisplay);
>> +diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.h
>> +index 71f232a..6467a21 100644
>> +--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.h
>> ++++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.h
>> +@@ -48,6 +48,11 @@
>> +
>> + QT_BEGIN_NAMESPACE
>> +
>> ++#ifndef EGL_EXT_platform_base
>> ++typedef EGLDisplay (EGLAPIENTRYP PFNEGLGETPLATFORMDISPLAYEXTPROC) (EGLenum platform, void *native_display, const EGLint *attrib_list);
>> ++typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC) (EGLDisplay dpy, EGLConfig config, void *native_window, const EGLint *attrib_list);
>> ++#endif
>> ++
>> + class QEglFSKmsDevice;
>> +
>> + class QEglFSKmsGbmIntegration : public QEglFSKmsIntegration
>> +--
>> +1.9.1
>> +
>> diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase_%.bbappend b/meta-arago-distro/recipes-qt/qt5/qtbase_%.bbappend
>> index 4cb8f9c..1570e1f 100644
>> --- a/meta-arago-distro/recipes-qt/qt5/qtbase_%.bbappend
>> +++ b/meta-arago-distro/recipes-qt/qt5/qtbase_%.bbappend
>> @@ -4,7 +4,14 @@ GLES_EXTRA_DEPS = "libdrm wayland"
>>
>> PACKAGECONFIG[gles2] = "-opengl es2 -eglfs,,virtual/libgles2 virtual/egl ${GLES_EXTRA_DEPS}"
>>
>> -PR_append = ".arago13"
>> +# the orginal gbm packageconfig requires virtual/libgbm
>
> Shouldn't be doing this. Our own libgbm should now provide virtual/libgbm -
> sent a patch to meta-ti.
>
>
Got it. I shall remove this.
>> +# Implement the patch here
>> +
>> +PACKAGECONFIG[gbm] = "-gbm,-no-gbm,drm virtual/egl"
>> +PACKAGECONFIG += "gbm"
>> +PACKAGECONFIG += "kms"
>
> Any PACKAGECONFIG settings should be done in the distro conf.
>
>
I do not understand. This is addition to qtbase specific PACKAGECONFIG
as defined at qtbase_git.bb:
# separate some parts of PACKAGECONFIG which are often changed
PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl',
'gl', '', d)}"
PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb',
'directfb', '', d)}"
PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11',
'xcb xinput2 glib xkb xkbcommon-evdev', '', d)}"
PACKAGECONFIG_KDE ?= "${@bb.utils.contains('DISTRO_FEATURES', 'kde', 'sm
cups fontconfig kms gbm libinput', '', d)}"
PACKAGECONFIG_FONTS ?= ""
PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib"
PACKAGECONFIG_DISTRO ?= ""
# Either release or debug, can be overridden in bbappends
PACKAGECONFIG_RELEASE ?= "release"
# This is in qt5.inc, because qtwebkit-examples are using it to enable
ca-certificates dependency
# PACKAGECONFIG_OPENSSL ?= "openssl"
PACKAGECONFIG_DEFAULT ?= "dbus udev evdev widgets tools libs freetype
tests \
${@bb.utils.contains('SELECTED_OPTIMIZATION', '-Os', 'optimize-size
ltcg', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'qt5-static', 'static', '',
d)} \
"
PACKAGECONFIG ?= " \
${PACKAGECONFIG_RELEASE} \
${PACKAGECONFIG_DEFAULT} \
${PACKAGECONFIG_OPENSSL} \
${PACKAGECONFIG_GL} \
${PACKAGECONFIG_FB} \
${PACKAGECONFIG_X11} \
${PACKAGECONFIG_KDE} \
${PACKAGECONFIG_FONTS} \
${PACKAGECONFIG_SYSTEM} \
${PACKAGECONFIG_DISTRO} \
"
Eric
>> +
>> +PR_append = ".arago14"
>>
>> QT_CONFIG_FLAGS += "-qpa ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', 'eglfs', d)}"
>>
>> @@ -14,12 +21,11 @@ QT_EGLFS_PATCHES = "\
>> file://quit.png \
>> "
>>
>> -# file://0001-QOpenGLTexture-Set-wrap-mode-if-NPOT-textures-are-no.patch
>> -
>> SRC_URI += "\
>> ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', "${QT_EGLFS_PATCHES}", d)}\
>> file://0001-deform-Fix-how-controls-are-shown.patch \
>> file://0002-deform-disable-opengl-button.patch \
>> + file://0001-qtbase-plugins-platforms-eglfs_kms-fix-compiler-erro.patch \
>> "
>>
>> python do_patch_append() {
>> --
>> 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] 9+ messages in thread
* Re: [thud/master][PATCH 2/2] atbase-config: add eglfs_kms configuration file and change wl shell
2019-03-08 23:48 ` Denys Dmytriyenko
@ 2019-03-09 0:16 ` Ruei, Eric
2019-03-09 1:09 ` Denys Dmytriyenko
0 siblings, 1 reply; 9+ messages in thread
From: Ruei, Eric @ 2019-03-09 0:16 UTC (permalink / raw)
To: Denys Dmytriyenko, Eric Ruei; +Cc: meta-arago
On 3/8/2019 6:48 PM, Denys Dmytriyenko wrote:
>> [PATCH 2/2] atbase-config: add eglfs_kms configuration file and change wl shell
>
> atbase? typo?
>
>
Should I change it to wayland?
Eric
> On Fri, Mar 08, 2019 at 06:02:07PM -0500, Eric Ruei wrote:
>> - add eglfs_kms configuration file
>> - switch to wl-shell because xdb-shell-v5 is obsolete
>>
>> Signed-off-by: Eric Ruei <e-ruei1@ti.com>
>> ---
>> .../recipes-qt/qt5/qtbase-conf/eglfs_kms_cfg.json | 15 +++++++++++++++
>> meta-arago-distro/recipes-qt/qt5/qtbase-conf/qt_env.sh | 3 ++-
>> .../recipes-qt/qt5/qtbase-conf/ti33x/qt_env.sh | 3 ++-
>> meta-arago-distro/recipes-qt/qt5/qtbase-conf_1.0.bb | 10 +++++++---
>> 4 files changed, 26 insertions(+), 5 deletions(-)
>> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtbase-conf/eglfs_kms_cfg.json
>>
>> diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase-conf/eglfs_kms_cfg.json b/meta-arago-distro/recipes-qt/qt5/qtbase-conf/eglfs_kms_cfg.json
>> new file mode 100644
>> index 0000000..61b834b
>> --- /dev/null
>> +++ b/meta-arago-distro/recipes-qt/qt5/qtbase-conf/eglfs_kms_cfg.json
>> @@ -0,0 +1,15 @@
>> +{
>> + "device": "/dev/dri/card0",
>> + "hwcursor": false,
>> + "pbuffers": true,
>> + "outputs": [
>> + {
>> + "name": "VGA1",
>> + "mode": "off"
>> + },
>> + {
>> + "name": "HDMI1",
>> + "mode": "1024x768"
>> + }
>> + ]
>> +}
>> \ No newline at end of file
>> diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase-conf/qt_env.sh b/meta-arago-distro/recipes-qt/qt5/qtbase-conf/qt_env.sh
>> index 9701a8e..2014d20 100644
>> --- a/meta-arago-distro/recipes-qt/qt5/qtbase-conf/qt_env.sh
>> +++ b/meta-arago-distro/recipes-qt/qt5/qtbase-conf/qt_env.sh
>> @@ -2,5 +2,6 @@
>>
>> ### QT Environment Variables ###
>> export SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
>> +export QT_QPA_EGLFS_KMS_CONFIG=/etc/qt5/eglfs_kms_cfg.json
>> export QT_QPA_EGLFS_INTEGRATION=none
>> -export QT_WAYLAND_SHELL_INTEGRATION=xdg-shell-v5
>> +export QT_WAYLAND_SHELL_INTEGRATION=wl-shell
>> diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase-conf/ti33x/qt_env.sh b/meta-arago-distro/recipes-qt/qt5/qtbase-conf/ti33x/qt_env.sh
>> index 68ccf04..8ff0508 100644
>> --- a/meta-arago-distro/recipes-qt/qt5/qtbase-conf/ti33x/qt_env.sh
>> +++ b/meta-arago-distro/recipes-qt/qt5/qtbase-conf/ti33x/qt_env.sh
>> @@ -3,5 +3,6 @@
>> ### QT Environment Variables ###
>> export QT_QPA_EVDEV_TOUCHSCREEN_PARAMETERS="rotate=180"
>> export SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
>> +export QT_QPA_EGLFS_KMS_CONFIG=/etc/qt5/eglfs_kms_cfg.json
>> export QT_QPA_EGLFS_INTEGRATION=none
>> -export QT_WAYLAND_SHELL_INTEGRATION=xdg-shell-v5
>> +export QT_WAYLAND_SHELL_INTEGRATION=wl-shell
>> diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase-conf_1.0.bb b/meta-arago-distro/recipes-qt/qt5/qtbase-conf_1.0.bb
>> index b2ad0a8..5c2974e 100644
>> --- a/meta-arago-distro/recipes-qt/qt5/qtbase-conf_1.0.bb
>> +++ b/meta-arago-distro/recipes-qt/qt5/qtbase-conf_1.0.bb
>> @@ -5,12 +5,16 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
>>
>> PACKAGE_ARCH = "${MACHINE_ARCH}"
>>
>> -SRC_URI = "file://qt_env.sh"
>> +SRC_URI = "file://qt_env.sh \
>> + file://eglfs_kms_cfg.json \
>> + "
>>
>> -# Add custom Arago qtbase Environment script file
>> +# Add custom Arago qtbase Environment script and eglfs_kms configuration file
>> do_install () {
>> install -d ${D}${sysconfdir}/profile.d
>> install -m 0644 ${WORKDIR}/qt_env.sh ${D}${sysconfdir}/profile.d/
>> + install -d ${D}${sysconfdir}/qt5
>> + install -m 0644 ${WORKDIR}/eglfs_kms_cfg.json ${D}${sysconfdir}/qt5/
>> }
>>
>> -FILES_${PN} += "${sysconfdir}/profile.d/*"
>> +FILES_${PN} += "${sysconfdir}/profile.d/* ${sysconfdir}/qt5/*"
>> --
>> 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] 9+ messages in thread
* Re: [thud/master][PATCH 1/2] qtbase: enable gbm/kms and fix compiling error
2019-03-09 0:15 ` Ruei, Eric
@ 2019-03-09 1:06 ` Denys Dmytriyenko
0 siblings, 0 replies; 9+ messages in thread
From: Denys Dmytriyenko @ 2019-03-09 1:06 UTC (permalink / raw)
To: Ruei, Eric; +Cc: meta-arago
On Fri, Mar 08, 2019 at 07:15:51PM -0500, Ruei, Eric wrote:
> On 3/8/2019 6:47 PM, Denys Dmytriyenko wrote:
> >On Fri, Mar 08, 2019 at 06:02:06PM -0500, Eric Ruei wrote:
> >>- enable gbm/kms for eglfs_kms
> >>- fix compiling error at platform/eglfs_kms
> >>- remove unused patch which has been upstreamed
> >>
> >>Signed-off-by: Eric Ruei <e-ruei1@ti.com>
> >>---
> >>+
> >>diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase_%.bbappend b/meta-arago-distro/recipes-qt/qt5/qtbase_%.bbappend
> >>index 4cb8f9c..1570e1f 100644
> >>--- a/meta-arago-distro/recipes-qt/qt5/qtbase_%.bbappend
> >>+++ b/meta-arago-distro/recipes-qt/qt5/qtbase_%.bbappend
> >>@@ -4,7 +4,14 @@ GLES_EXTRA_DEPS = "libdrm wayland"
> >> PACKAGECONFIG[gles2] = "-opengl es2 -eglfs,,virtual/libgles2 virtual/egl ${GLES_EXTRA_DEPS}"
> >>-PR_append = ".arago13"
> >>+# the orginal gbm packageconfig requires virtual/libgbm
> >
> >Shouldn't be doing this. Our own libgbm should now provide virtual/libgbm -
> >sent a patch to meta-ti.
> >
> >
> Got it. I shall remove this.
>
>
>
> >>+# Implement the patch here
> >>+
> >>+PACKAGECONFIG[gbm] = "-gbm,-no-gbm,drm virtual/egl"
> >>+PACKAGECONFIG += "gbm"
> >>+PACKAGECONFIG += "kms"
> >
> >Any PACKAGECONFIG settings should be done in the distro conf.
> >
> >
> I do not understand. This is addition to qtbase specific PACKAGECONFIG as
> defined at qtbase_git.bb:
A recipe defines different PACKAGECONFIG options and a sane default set of
them to be enabled by default:
PACKAGECONFIG[a] = "..."
PACKAGECONFIG[b] = "..."
PACKAGECONFIG[c] = "..."
PACKAGECONFIG = "a c"
It is not recommended to change the default set in the recipe itself or in a
bbappend. It is recommended to tweak it in a specific configuration - could be
distro.conf, could be local.conf, etc.
We do this in arago.conf:
http://arago-project.org/git/?p=meta-arago.git;a=blob;f=meta-arago-distro/conf/distro/arago.conf;hb=HEAD#l102
It also can be conditional based on DISTRO_FEATURES, or anything else...
> # separate some parts of PACKAGECONFIG which are often changed
> PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl',
> '', d)}"
> PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb',
> 'directfb', '', d)}"
> PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb
> xinput2 glib xkb xkbcommon-evdev', '', d)}"
> PACKAGECONFIG_KDE ?= "${@bb.utils.contains('DISTRO_FEATURES', 'kde', 'sm
> cups fontconfig kms gbm libinput', '', d)}"
> PACKAGECONFIG_FONTS ?= ""
> PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib"
> PACKAGECONFIG_DISTRO ?= ""
> # Either release or debug, can be overridden in bbappends
> PACKAGECONFIG_RELEASE ?= "release"
> # This is in qt5.inc, because qtwebkit-examples are using it to enable
> ca-certificates dependency
> # PACKAGECONFIG_OPENSSL ?= "openssl"
> PACKAGECONFIG_DEFAULT ?= "dbus udev evdev widgets tools libs freetype tests
> \
> ${@bb.utils.contains('SELECTED_OPTIMIZATION', '-Os', 'optimize-size
> ltcg', '', d)} \
> ${@bb.utils.contains('DISTRO_FEATURES', 'qt5-static', 'static', '', d)}
> \
> "
>
> PACKAGECONFIG ?= " \
> ${PACKAGECONFIG_RELEASE} \
> ${PACKAGECONFIG_DEFAULT} \
> ${PACKAGECONFIG_OPENSSL} \
> ${PACKAGECONFIG_GL} \
> ${PACKAGECONFIG_FB} \
> ${PACKAGECONFIG_X11} \
> ${PACKAGECONFIG_KDE} \
> ${PACKAGECONFIG_FONTS} \
> ${PACKAGECONFIG_SYSTEM} \
> ${PACKAGECONFIG_DISTRO} \
> "
>
> Eric
>
> >>+
> >>+PR_append = ".arago14"
> >> QT_CONFIG_FLAGS += "-qpa ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', 'eglfs', d)}"
> >>@@ -14,12 +21,11 @@ QT_EGLFS_PATCHES = "\
> >> file://quit.png \
> >> "
> >>-# file://0001-QOpenGLTexture-Set-wrap-mode-if-NPOT-textures-are-no.patch
> >>-
> >> SRC_URI += "\
> >> ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', "${QT_EGLFS_PATCHES}", d)}\
> >> file://0001-deform-Fix-how-controls-are-shown.patch \
> >> file://0002-deform-disable-opengl-button.patch \
> >>+ file://0001-qtbase-plugins-platforms-eglfs_kms-fix-compiler-erro.patch \
> >> "
> >> python do_patch_append() {
> >>--
> >>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] 9+ messages in thread
* Re: [thud/master][PATCH 2/2] atbase-config: add eglfs_kms configuration file and change wl shell
2019-03-09 0:16 ` Ruei, Eric
@ 2019-03-09 1:09 ` Denys Dmytriyenko
2019-03-09 12:34 ` Ruei, Eric
0 siblings, 1 reply; 9+ messages in thread
From: Denys Dmytriyenko @ 2019-03-09 1:09 UTC (permalink / raw)
To: Ruei, Eric; +Cc: meta-arago
On Fri, Mar 08, 2019 at 07:16:47PM -0500, Ruei, Eric wrote:
> On 3/8/2019 6:48 PM, Denys Dmytriyenko wrote:
> >>[PATCH 2/2] atbase-config: add eglfs_kms configuration file and change wl shell
> >
> >atbase? typo?
> >
> >
> Should I change it to wayland?
I was merely pointing to a typo in the subject - atbase instead of qtbase
But if you think this should go to wayland-conf instead of qtbase-conf, it's
ok, but I thought eglfs was Qt-specific feature...
> Eric
>
>
> >On Fri, Mar 08, 2019 at 06:02:07PM -0500, Eric Ruei wrote:
> >>- add eglfs_kms configuration file
> >>- switch to wl-shell because xdb-shell-v5 is obsolete
> >>
> >>Signed-off-by: Eric Ruei <e-ruei1@ti.com>
> >>---
> >> .../recipes-qt/qt5/qtbase-conf/eglfs_kms_cfg.json | 15 +++++++++++++++
> >> meta-arago-distro/recipes-qt/qt5/qtbase-conf/qt_env.sh | 3 ++-
> >> .../recipes-qt/qt5/qtbase-conf/ti33x/qt_env.sh | 3 ++-
> >> meta-arago-distro/recipes-qt/qt5/qtbase-conf_1.0.bb | 10 +++++++---
> >> 4 files changed, 26 insertions(+), 5 deletions(-)
> >> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtbase-conf/eglfs_kms_cfg.json
> >>
> >>diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase-conf/eglfs_kms_cfg.json b/meta-arago-distro/recipes-qt/qt5/qtbase-conf/eglfs_kms_cfg.json
> >>new file mode 100644
> >>index 0000000..61b834b
> >>--- /dev/null
> >>+++ b/meta-arago-distro/recipes-qt/qt5/qtbase-conf/eglfs_kms_cfg.json
> >>@@ -0,0 +1,15 @@
> >>+{
> >>+ "device": "/dev/dri/card0",
> >>+ "hwcursor": false,
> >>+ "pbuffers": true,
> >>+ "outputs": [
> >>+ {
> >>+ "name": "VGA1",
> >>+ "mode": "off"
> >>+ },
> >>+ {
> >>+ "name": "HDMI1",
> >>+ "mode": "1024x768"
> >>+ }
> >>+ ]
> >>+}
> >>\ No newline at end of file
> >>diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase-conf/qt_env.sh b/meta-arago-distro/recipes-qt/qt5/qtbase-conf/qt_env.sh
> >>index 9701a8e..2014d20 100644
> >>--- a/meta-arago-distro/recipes-qt/qt5/qtbase-conf/qt_env.sh
> >>+++ b/meta-arago-distro/recipes-qt/qt5/qtbase-conf/qt_env.sh
> >>@@ -2,5 +2,6 @@
> >> ### QT Environment Variables ###
> >> export SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
> >>+export QT_QPA_EGLFS_KMS_CONFIG=/etc/qt5/eglfs_kms_cfg.json
> >> export QT_QPA_EGLFS_INTEGRATION=none
> >>-export QT_WAYLAND_SHELL_INTEGRATION=xdg-shell-v5
> >>+export QT_WAYLAND_SHELL_INTEGRATION=wl-shell
> >>diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase-conf/ti33x/qt_env.sh b/meta-arago-distro/recipes-qt/qt5/qtbase-conf/ti33x/qt_env.sh
> >>index 68ccf04..8ff0508 100644
> >>--- a/meta-arago-distro/recipes-qt/qt5/qtbase-conf/ti33x/qt_env.sh
> >>+++ b/meta-arago-distro/recipes-qt/qt5/qtbase-conf/ti33x/qt_env.sh
> >>@@ -3,5 +3,6 @@
> >> ### QT Environment Variables ###
> >> export QT_QPA_EVDEV_TOUCHSCREEN_PARAMETERS="rotate=180"
> >> export SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
> >>+export QT_QPA_EGLFS_KMS_CONFIG=/etc/qt5/eglfs_kms_cfg.json
> >> export QT_QPA_EGLFS_INTEGRATION=none
> >>-export QT_WAYLAND_SHELL_INTEGRATION=xdg-shell-v5
> >>+export QT_WAYLAND_SHELL_INTEGRATION=wl-shell
> >>diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase-conf_1.0.bb b/meta-arago-distro/recipes-qt/qt5/qtbase-conf_1.0.bb
> >>index b2ad0a8..5c2974e 100644
> >>--- a/meta-arago-distro/recipes-qt/qt5/qtbase-conf_1.0.bb
> >>+++ b/meta-arago-distro/recipes-qt/qt5/qtbase-conf_1.0.bb
> >>@@ -5,12 +5,16 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
> >> PACKAGE_ARCH = "${MACHINE_ARCH}"
> >>-SRC_URI = "file://qt_env.sh"
> >>+SRC_URI = "file://qt_env.sh \
> >>+ file://eglfs_kms_cfg.json \
> >>+ "
> >>-# Add custom Arago qtbase Environment script file
> >>+# Add custom Arago qtbase Environment script and eglfs_kms configuration file
> >> do_install () {
> >> install -d ${D}${sysconfdir}/profile.d
> >> install -m 0644 ${WORKDIR}/qt_env.sh ${D}${sysconfdir}/profile.d/
> >>+ install -d ${D}${sysconfdir}/qt5
> >>+ install -m 0644 ${WORKDIR}/eglfs_kms_cfg.json ${D}${sysconfdir}/qt5/
> >> }
> >>-FILES_${PN} += "${sysconfdir}/profile.d/*"
> >>+FILES_${PN} += "${sysconfdir}/profile.d/* ${sysconfdir}/qt5/*"
> >>--
> >>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] 9+ messages in thread
* Re: [thud/master][PATCH 2/2] atbase-config: add eglfs_kms configuration file and change wl shell
2019-03-09 1:09 ` Denys Dmytriyenko
@ 2019-03-09 12:34 ` Ruei, Eric
0 siblings, 0 replies; 9+ messages in thread
From: Ruei, Eric @ 2019-03-09 12:34 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: meta-arago
On 3/8/2019 8:09 PM, Denys Dmytriyenko wrote:
> On Fri, Mar 08, 2019 at 07:16:47PM -0500, Ruei, Eric wrote:
>> On 3/8/2019 6:48 PM, Denys Dmytriyenko wrote:
>>>> [PATCH 2/2] atbase-config: add eglfs_kms configuration file and change wl shell
>>>
>>> atbase? typo?
>>>
>>>
>> Should I change it to wayland?
>
> I was merely pointing to a typo in the subject - atbase instead of qtbase
>
> But if you think this should go to wayland-conf instead of qtbase-conf, it's
> ok, but I thought eglfs was Qt-specific feature...
>
>
Oh, I see. It is a typo indeed. I thought that you meant "wl shell".
Thanks, I shall fix this one at v2.
Eric
>> Eric
>>
>>
>>> On Fri, Mar 08, 2019 at 06:02:07PM -0500, Eric Ruei wrote:
>>>> - add eglfs_kms configuration file
>>>> - switch to wl-shell because xdb-shell-v5 is obsolete
>>>>
>>>> Signed-off-by: Eric Ruei <e-ruei1@ti.com>
>>>> ---
>>>> .../recipes-qt/qt5/qtbase-conf/eglfs_kms_cfg.json | 15 +++++++++++++++
>>>> meta-arago-distro/recipes-qt/qt5/qtbase-conf/qt_env.sh | 3 ++-
>>>> .../recipes-qt/qt5/qtbase-conf/ti33x/qt_env.sh | 3 ++-
>>>> meta-arago-distro/recipes-qt/qt5/qtbase-conf_1.0.bb | 10 +++++++---
>>>> 4 files changed, 26 insertions(+), 5 deletions(-)
>>>> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtbase-conf/eglfs_kms_cfg.json
>>>>
>>>> diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase-conf/eglfs_kms_cfg.json b/meta-arago-distro/recipes-qt/qt5/qtbase-conf/eglfs_kms_cfg.json
>>>> new file mode 100644
>>>> index 0000000..61b834b
>>>> --- /dev/null
>>>> +++ b/meta-arago-distro/recipes-qt/qt5/qtbase-conf/eglfs_kms_cfg.json
>>>> @@ -0,0 +1,15 @@
>>>> +{
>>>> + "device": "/dev/dri/card0",
>>>> + "hwcursor": false,
>>>> + "pbuffers": true,
>>>> + "outputs": [
>>>> + {
>>>> + "name": "VGA1",
>>>> + "mode": "off"
>>>> + },
>>>> + {
>>>> + "name": "HDMI1",
>>>> + "mode": "1024x768"
>>>> + }
>>>> + ]
>>>> +}
>>>> \ No newline at end of file
>>>> diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase-conf/qt_env.sh b/meta-arago-distro/recipes-qt/qt5/qtbase-conf/qt_env.sh
>>>> index 9701a8e..2014d20 100644
>>>> --- a/meta-arago-distro/recipes-qt/qt5/qtbase-conf/qt_env.sh
>>>> +++ b/meta-arago-distro/recipes-qt/qt5/qtbase-conf/qt_env.sh
>>>> @@ -2,5 +2,6 @@
>>>> ### QT Environment Variables ###
>>>> export SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
>>>> +export QT_QPA_EGLFS_KMS_CONFIG=/etc/qt5/eglfs_kms_cfg.json
>>>> export QT_QPA_EGLFS_INTEGRATION=none
>>>> -export QT_WAYLAND_SHELL_INTEGRATION=xdg-shell-v5
>>>> +export QT_WAYLAND_SHELL_INTEGRATION=wl-shell
>>>> diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase-conf/ti33x/qt_env.sh b/meta-arago-distro/recipes-qt/qt5/qtbase-conf/ti33x/qt_env.sh
>>>> index 68ccf04..8ff0508 100644
>>>> --- a/meta-arago-distro/recipes-qt/qt5/qtbase-conf/ti33x/qt_env.sh
>>>> +++ b/meta-arago-distro/recipes-qt/qt5/qtbase-conf/ti33x/qt_env.sh
>>>> @@ -3,5 +3,6 @@
>>>> ### QT Environment Variables ###
>>>> export QT_QPA_EVDEV_TOUCHSCREEN_PARAMETERS="rotate=180"
>>>> export SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
>>>> +export QT_QPA_EGLFS_KMS_CONFIG=/etc/qt5/eglfs_kms_cfg.json
>>>> export QT_QPA_EGLFS_INTEGRATION=none
>>>> -export QT_WAYLAND_SHELL_INTEGRATION=xdg-shell-v5
>>>> +export QT_WAYLAND_SHELL_INTEGRATION=wl-shell
>>>> diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase-conf_1.0.bb b/meta-arago-distro/recipes-qt/qt5/qtbase-conf_1.0.bb
>>>> index b2ad0a8..5c2974e 100644
>>>> --- a/meta-arago-distro/recipes-qt/qt5/qtbase-conf_1.0.bb
>>>> +++ b/meta-arago-distro/recipes-qt/qt5/qtbase-conf_1.0.bb
>>>> @@ -5,12 +5,16 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
>>>> PACKAGE_ARCH = "${MACHINE_ARCH}"
>>>> -SRC_URI = "file://qt_env.sh"
>>>> +SRC_URI = "file://qt_env.sh \
>>>> + file://eglfs_kms_cfg.json \
>>>> + "
>>>> -# Add custom Arago qtbase Environment script file
>>>> +# Add custom Arago qtbase Environment script and eglfs_kms configuration file
>>>> do_install () {
>>>> install -d ${D}${sysconfdir}/profile.d
>>>> install -m 0644 ${WORKDIR}/qt_env.sh ${D}${sysconfdir}/profile.d/
>>>> + install -d ${D}${sysconfdir}/qt5
>>>> + install -m 0644 ${WORKDIR}/eglfs_kms_cfg.json ${D}${sysconfdir}/qt5/
>>>> }
>>>> -FILES_${PN} += "${sysconfdir}/profile.d/*"
>>>> +FILES_${PN} += "${sysconfdir}/profile.d/* ${sysconfdir}/qt5/*"
>>>> --
>>>> 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] 9+ messages in thread
end of thread, other threads:[~2019-03-09 12:34 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-08 23:02 [thud/master][PATCH 1/2] qtbase: enable gbm/kms and fix compiling error Eric Ruei
2019-03-08 23:02 ` [thud/master][PATCH 2/2] atbase-config: add eglfs_kms configuration file and change wl shell Eric Ruei
2019-03-08 23:48 ` Denys Dmytriyenko
2019-03-09 0:16 ` Ruei, Eric
2019-03-09 1:09 ` Denys Dmytriyenko
2019-03-09 12:34 ` Ruei, Eric
2019-03-08 23:47 ` [thud/master][PATCH 1/2] qtbase: enable gbm/kms and fix compiling error Denys Dmytriyenko
2019-03-09 0:15 ` Ruei, Eric
2019-03-09 1:06 ` Denys Dmytriyenko
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.