Mesa-based EGL/GLES
v2 cover Mesa-based EGL/GLES
These are the corresponding patches with Mesa-based EGL/GLES including
- re-enable qtwebengine for AM3/4/5
- several hacks to resolve compiling issues triggered by mesa-based EGL header files
- Add DRM(GBM)-based 3D demos
- Makefile cleanup per Mesa-based EGL library names
V2 changes:
- Add Upstream-Status to Weston and qtWebkit patches
Eric Ruei (7):
packagegroup-arago-xxx-qte-xxx: re-enable qtwebengine per EGL 1.5 for
AM3/4/5
qtbase-conf: set the default EGLFS mode to kms
HACK: weston: undefine HAVE_GBM_MODIFIERS explicitly
HACK: qtwebkit: define MESA_EGL_NO_X11_HEADERS at ANGLE/khrplatform.h
img-pvr-sdk: Add DRM(GBM)-based GPU demos
omapdrmtest: Update LDFLAGS at util/Makefile.am per Mesa-based EGL
HACK: matrix-gui-machinevision-demos: disable point-cloud-viewer
.../packagegroups/packagegroup-arago-qte.bb | 9 +-- .../packagegroup-arago-tisdk-qte.bb | 7 +- ...rm-undef-HAVE_GBM_MODIFIERS-explicit.patch | 31 ++++++++ .../wayland/weston_5.0.0.bbappend | 3 +- .../recipes-qt/qt5/qtbase-conf/qt_env.sh | 2 +- .../qt5/qtbase-conf/ti33x/qt_env.sh | 2 +- ...atform.h-add-define-MESA_EGL_NO_X11_.patch | 30 ++++++++ .../recipes-qt/qt5/qtwebkit_%.bbappend | 3 +- .../matrix-gui-machinevision-demos_2.0.bb | 6 +- ...packagegroup-arago-qte-toolchain-target.bb | 12 ++-- .../img-pvr-sdk/img-pvr-sdk_3.3.2.bb | 71 ++++++++++--------- ...am-update-LDFLAGS-for-Mesa-based-EGL.patch | 32 +++++++++ .../omapdrmtest/omapdrmtest_1.0.0.bb | 3 +- 13 files changed, 161 insertions(+), 50 deletions(-) create mode 100644 meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS-explicit.patch create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-HACK-ANGLE-khrplatform.h-add-define-MESA_EGL_NO_X11_.patch create mode 100644 meta-arago-extras/recipes-graphics/omapdrmtest/files/0001-util-Makefile.am-update-LDFLAGS-for-Mesa-based-EGL.patch
Signature · 1 line
2.17.1
PATCH v2 1/7 packagegroup-arago-xxx-qte-xxx: re-enable qtwebengine per EGL 1.5 for AM3/4/5
qtwebengine 5.11.3 works well with mesa-based EGL 1.5 on AM3/4/5 although there are still some display issues on AM6 (arm64).
--- .../packagegroups/packagegroup-arago-qte.bb | 9 +++++---- .../packagegroups/packagegroup-arago-tisdk-qte.bb | 7 +++++-- .../packagegroup-arago-qte-toolchain-target.bb | 12 +++++++----- 3 files changed, 17 insertions(+), 11 deletions(-)
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb +5 -4
@@ -1,6 +1,6 @@ DESCRIPTION = "Task to add Qt embedded related packages" LICENSE = "MIT" -PR = "r15" +PR = "r16" PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -41,6 +41,7 @@ QT5_ESSENTIALS = "\ qtvirtualkeyboard-plugins \ qtvirtualkeyboard-qmlplugins \ qtwebkit-qmlplugins \ + qtwebengine-qmlplugins \ liberation-fonts \ qtconnectivity \ qtconnectivity-qmlplugins \
@@ -49,9 +50,9 @@ QT5_ESSENTIALS = "\ #QT5_ESSENTIALS_append_k3 = "\ # qtwebkit-qmlplugins \ #" -#QT5_ESSENTIALS_remove_k3 = "\ -# qtwebengine-qmlplugins \ -#" +QT5_ESSENTIALS_remove_k3 = "\ + qtwebengine-qmlplugins \ +" RDEPENDS_${PN} = "\ ${@oe.utils.conditional('QT_PROVIDER', 'qt5', "${QT5_ESSENTIALS}", "${QT4_ESSENTIALS}", d)} \
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb +5 -2
@@ -1,6 +1,6 @@ DESCRIPTION = "Task to add Qt embedded related packages" LICENSE = "MIT" -PR = "r21" +PR = "r22" PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -23,13 +23,16 @@ QT5_DEMOS = "\ qtsvg-examples \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland-examples', '', d)} \ qtwebkit-examples-examples \ + qtwebengine-examples \ qtserialport-examples \ qtcharts-examples \ " #QT5_DEMOS_append_k3 = " qtwebkit-examples-examples" # -#QT5_DEMOS_remove_k3 = "\ +QT5_DEMOS_remove_k3 = "\ + qtwebengine-examples \ +" # qtwebbrowser \ # qtwebbrowser-examples \ # qtwebengine-examples \
meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb +7 -5
@@ -1,7 +1,7 @@ DESCRIPTION = "Target packages for Qt Embedded SDK" LICENSE = "MIT" -PR = "r15" +PR = "r16" PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -63,6 +63,8 @@ QT5_DEV = " \ qtxmlpatterns-dev \ qtwebkit-mkspecs \ qtwebkit-dev \ + qtwebengine-mkspecs \ + qtwebengine-dev \ qtserialport-mkspecs \ qtserialport-dev \ qtcharts-mkspecs \
@@ -74,10 +76,10 @@ QT5_DEV = " \ # qtwebkit-dev \ #" # -#QT5_DEV_remove_k3 = " \ -# qtwebengine-mkspecs \ -# qtwebengine-dev \ -#" +QT5_DEV_remove_k3 = " \ + qtwebengine-mkspecs \ + qtwebengine-dev \ +" RDEPENDS_${PN} += " \ ${@oe.utils.conditional('QT_PROVIDER', 'qt5', "${QT5_DEV}", "${QT4_DEV}", d)} \
Signature · 1 line
2.17.1
PATCH v2 2/7 qtbase-conf: set the default EGLFS mode to kms
In reply to Eric RueiWe start to use the Mesa-based EGL 1.5-enabled GLES/EGL libraries where NullDRM window system is no longer supported and GBM(DRM) window system should be used instead for full-screen operation.
--- meta-arago-distro/recipes-qt/qt5/qtbase-conf/qt_env.sh | 2 +- meta-arago-distro/recipes-qt/qt5/qtbase-conf/ti33x/qt_env.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
meta-arago-distro/recipes-qt/qt5/qtbase-conf/qt_env.sh +1 -1
@@ -3,5 +3,5 @@ ### 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_QPA_EGLFS_INTEGRATION=eglfs_kms export QT_WAYLAND_SHELL_INTEGRATION=wl-shell
meta-arago-distro/recipes-qt/qt5/qtbase-conf/ti33x/qt_env.sh +1 -1
@@ -4,5 +4,5 @@ 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_QPA_EGLFS_INTEGRATION=eglfs_kms export QT_WAYLAND_SHELL_INTEGRATION=wl-shell
Signature · 1 line
2.17.1
PATCH v2 3/7 HACK: weston: undefine HAVE_GBM_MODIFIERS explicitly
In reply to Eric RueiThis hack is required tentatively until GBM_MODIFIERS is fully supported by Mesa-based EGL.
--- ...rm-undef-HAVE_GBM_MODIFIERS-explicit.patch | 31 +++++++++++++++++++ .../wayland/weston_5.0.0.bbappend | 3 +- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS-explicit.patch
meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS-explicit.patch new file +31 -0
@@ -0,0 +1,31 @@ +From fb7f77c7b039344f736c77fe85b68f0f49083fae Mon Sep 17 00:00:00 2001 +From: Eric Ruei <[email protected]> +Date: Sun, 1 Sep 2019 08:28:27 -0400 +Subject: [PATCH] HACK: composito-drm: undef HAVE_GBM_MODIFIERS explicitly + +GBM_MODIFIERS is expected for Mesa/gbm 19.1.6, but is not fully supported +yet. + +Upstream-Status: Inappropriate [tentative workaround only] + +Signed-off-by: Eric Ruei <[email protected]> +--- + libweston/compositor-drm.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libweston/compositor-drm.c b/libweston/compositor-drm.c +index d92ecfcd..88f845a8 100644 +--- a/libweston/compositor-drm.c ++++ b/libweston/compositor-drm.c +@@ -68,6 +68,8 @@ + #include "linux-dmabuf-unstable-v1-server-protocol.h" + #include "linux-explicit-synchronization.h" + ++#undef HAVE_GBM_MODIFIERS ++ + #ifndef DRM_CLIENT_CAP_ASPECT_RATIO + #define DRM_CLIENT_CAP_ASPECT_RATIO 4 + #endif +-- +2.17.1 +
meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend +2 -1
@@ -2,7 +2,7 @@ PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor WESTON_NATIVE_BACKEND="fbdev-backend.so",--disable-fbdev-compositor,udev mtdev" PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev virtual/libgbm mtdev" -PR_append = ".arago34" +PR_append = ".arago35" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
@@ -26,6 +26,7 @@ SRC_URI += " \ file://0011-compositor-Add-scene-graph-debug-scope.patch \ file://0012-compositor-drm-Add-backend-pointer-to-drm_output.patch \ file://0013-compositor-drm-Add-drm-backend-log-debug-scope.patch \ + file://0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS-explicit.patch \ " INHIBIT_PACKAGE_STRIP = "1"
Signature · 1 line
2.17.1
PATCH v2 4/7 HACK: qtwebkit: define MESA_EGL_NO_X11_HEADERS at ANGLE/khrplatform.h
In reply to Eric RueiThis is a tentative workaround due to unclean qtwebkit build procedure where khrplatform.h under both sysroot/usr/include and 3rdparty/ANGLE is used.
--- ...atform.h-add-define-MESA_EGL_NO_X11_.patch | 30 +++++++++++++++++++ .../recipes-qt/qt5/qtwebkit_%.bbappend | 3 +- 2 files changed, 32 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
meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-HACK-ANGLE-khrplatform.h-add-define-MESA_EGL_NO_X11_.patch new file +30 -0
@@ -0,0 +1,30 @@ +From 4a21fcedd886772b7e1bd40861835f1b4f33c7ff Mon Sep 17 00:00:00 2001 +From: Eric Ruei <[email protected]> +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 <[email protected]> +--- + 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 +
meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend +2 -1
@@ -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"
Signature · 1 line
2.17.1
PATCH v2 5/7 img-pvr-sdk: Add DRM(GBM)-based GPU demos
In reply to Eric Ruei- bump SRCREV to pick up the GPU demos rebuilt against the latest EGL/GLES libraries
- Add DRM-base demos for full-screen operation
- cleanup the do_install operation
--- .../img-pvr-sdk/img-pvr-sdk_3.3.2.bb | 71 ++++++++++--------- 1 file changed, 39 insertions(+), 32 deletions(-)
meta-arago-extras/recipes-graphics/img-pvr-sdk/img-pvr-sdk_3.3.2.bb +39 -32
@@ -7,9 +7,9 @@ CLEANBROKEN = "1" BRANCH = "master" SRC_URI = "git://git.ti.com/graphics/img-pvr-sdk.git;protocol=git;branch=${BRANCH}" -SRCREV = "e76ae77b27ef570e7b8494c3d7067fd3d72b5976" +SRCREV = "bb8b74cdd1323e76697b3eb2258f863b15fee287" -PR = "r17" +PR = "r18" COMPATIBLE_MACHINE = "omap-a15|ti43x|ti33x|k3"
@@ -25,6 +25,7 @@ do_install () { install -d ${D}${bindir}/SGX/demos/Raw/ install -d ${D}${bindir}/SGX/demos/Wayland/ + install -d ${D}${bindir}/SGX/demos/DRM/ install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/NullWS/OGLES2ChameleonMan ${D}${bindir}/SGX/demos/Raw/ install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/NullWS/OGLES2Coverflow ${D}${bindir}/SGX/demos/Raw/
@@ -33,38 +34,44 @@ do_install () { install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/NullWS/OGLES2MagicLantern ${D}${bindir}/SGX/demos/Raw/ install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/NullWS/OGLES2FilmTV ${D}${bindir}/SGX/demos/Raw/ - if [ ${SRC_DIR} == "arm" ]; then - install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OGLES2ChameleonMan ${D}${bindir}/SGX/demos/Wayland/ - install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OGLES2Coverflow ${D}${bindir}/SGX/demos/Wayland/ - install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OGLES2ExampleUI ${D}${bindir}/SGX/demos/Wayland/ - install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OGLES2Navigation ${D}${bindir}/SGX/demos/Wayland/ - install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OGLES2MagicLantern ${D}${bindir}/SGX/demos/Wayland/ - install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OGLES2FilmTV ${D}${bindir}/SGX/demos/Wayland/ - fi - - if [ ${SRC_DIR} == "arm64" ]; then - install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OpenGLESDeferredShading ${D}${bindir}/SGX/demos/Wayland/ - install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OpenGLESGaussianBlur ${D}${bindir}/SGX/demos/Wayland/ - install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OpenGLESImageBasedLighting ${D}${bindir}/SGX/demos/Wayland/ - install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OpenGLESIntroducingPVRCamera ${D}${bindir}/SGX/demos/Wayland/ - install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OpenGLESIntroducingPVRUtils ${D}${bindir}/SGX/demos/Wayland/ - install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OpenGLESIntroducingUIRenderer ${D}${bindir}/SGX/demos/Wayland/ - install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OpenGLESNavigation2D ${D}${bindir}/SGX/demos/Wayland/ - install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OpenGLESNavigation3D ${D}${bindir}/SGX/demos/Wayland/ - install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OpenGLESParticleSystem ${D}${bindir}/SGX/demos/Wayland/ - - cp -r ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/Assets_OpenGLESDeferredShading ${D}${bindir}/SGX/demos/Wayland/ - cp -r ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/Assets_OpenGLESGaussianBlur ${D}${bindir}/SGX/demos/Wayland/ - cp -r ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/Assets_OpenGLESImageBasedLighting ${D}${bindir}/SGX/demos/Wayland/ - cp -r ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/Assets_OpenGLESIntroducingPVRCamera ${D}${bindir}/SGX/demos/Wayland/ - cp -r ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/Assets_OpenGLESIntroducingPVRUtils ${D}${bindir}/SGX/demos/Wayland/ - cp -r ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/Assets_OpenGLESIntroducingUIRenderer ${D}${bindir}/SGX/demos/Wayland/ - cp -r ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/Assets_OpenGLESNavigation2D ${D}${bindir}/SGX/demos/Wayland/ - cp -r ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/Assets_OpenGLESNavigation3D ${D}${bindir}/SGX/demos/Wayland/ - cp -r ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/Assets_OpenGLESParticleSystem ${D}${bindir}/SGX/demos/Wayland/ - fi + install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OGLES2ChameleonMan ${D}${bindir}/SGX/demos/Wayland/ + install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OGLES2Coverflow ${D}${bindir}/SGX/demos/Wayland/ + install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OGLES2ExampleUI ${D}${bindir}/SGX/demos/Wayland/ + install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OGLES2Navigation ${D}${bindir}/SGX/demos/Wayland/ + install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OGLES2MagicLantern ${D}${bindir}/SGX/demos/Wayland/ + install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OGLES2FilmTV ${D}${bindir}/SGX/demos/Wayland/ + + install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/DRM/OGLES2ChameleonMan ${D}${bindir}/SGX/demos/DRM/ + install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/DRM/OGLES2Coverflow ${D}${bindir}/SGX/demos/DRM/ + install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/DRM/OGLES2ExampleUI ${D}${bindir}/SGX/demos/DRM/ + install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/DRM/OGLES2Navigation ${D}${bindir}/SGX/demos/DRM/ + install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/DRM/OGLES2MagicLantern ${D}${bindir}/SGX/demos/DRM/ + install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/DRM/OGLES2FilmTV ${D}${bindir}/SGX/demos/DRM/ } +do_install_append_j7-evm () { + install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OpenGLESDeferredShading ${D}${bindir}/SGX/demos/Wayland/ + install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OpenGLESGaussianBlur ${D}${bindir}/SGX/demos/Wayland/ + install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OpenGLESImageBasedLighting ${D}${bindir}/SGX/demos/Wayland/ + install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OpenGLESIntroducingPVRCamera ${D}${bindir}/SGX/demos/Wayland/ + install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OpenGLESIntroducingPVRUtils ${D}${bindir}/SGX/demos/Wayland/ + install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OpenGLESIntroducingUIRenderer ${D}${bindir}/SGX/demos/Wayland/ + install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OpenGLESNavigation2D ${D}${bindir}/SGX/demos/Wayland/ + install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OpenGLESNavigation3D ${D}${bindir}/SGX/demos/Wayland/ + install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OpenGLESParticleSystem ${D}${bindir}/SGX/demos/Wayland/ + + cp -r ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/Assets_OpenGLESDeferredShading ${D}${bindir}/SGX/demos/Wayland/ + cp -r ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/Assets_OpenGLESGaussianBlur ${D}${bindir}/SGX/demos/Wayland/ + cp -r ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/Assets_OpenGLESImageBasedLighting ${D}${bindir}/SGX/demos/Wayland/ + cp -r ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/Assets_OpenGLESIntroducingPVRCamera ${D}${bindir}/SGX/demos/Wayland/ + cp -r ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/Assets_OpenGLESIntroducingPVRUtils ${D}${bindir}/SGX/demos/Wayland/ + cp -r ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/Assets_OpenGLESIntroducingUIRenderer ${D}${bindir}/SGX/demos/Wayland/ + cp -r ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/Assets_OpenGLESNavigation2D ${D}${bindir}/SGX/demos/Wayland/ + cp -r ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/Assets_OpenGLESNavigation3D ${D}${bindir}/SGX/demos/Wayland/ + cp -r ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/Assets_OpenGLESParticleSystem ${D}${bindir}/SGX/demos/Wayland/ +} + + RDEPENDS_${PN} = "ti-sgx-ddk-um" RDEPENDS_${PN}_j7-evm = "ti-img-rogue-umlibs"
Signature · 1 line
2.17.1
PATCH v2 6/7 omapdrmtest: Update LDFLAGS at util/Makefile.am per Mesa-based EGL
In reply to Eric Ruei- Replace pvr_wlegl with wayland_egl in the LDFLAGS string
--- ...am-update-LDFLAGS-for-Mesa-based-EGL.patch | 32 +++++++++++++++++++ .../omapdrmtest/omapdrmtest_1.0.0.bb | 3 +- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 meta-arago-extras/recipes-graphics/omapdrmtest/files/0001-util-Makefile.am-update-LDFLAGS-for-Mesa-based-EGL.patch
meta-arago-extras/recipes-graphics/omapdrmtest/files/0001-util-Makefile.am-update-LDFLAGS-for-Mesa-based-EGL.patch new file +32 -0
@@ -0,0 +1,32 @@ +From 06b21346d662209f5ea9816f408f9f883b775d60 Mon Sep 17 00:00:00 2001 +From: Eric Ruei <[email protected]> +Date: Mon, 28 Oct 2019 09:43:47 -0400 +Subject: [PATCH] util: Makefile.am: update LDFLAGS for Mesa-based EGL + +- replace pvr_wlegl with wayland-egl + +Upstream-Status: Pending +Signed-off-by: Eric Ruei <[email protected]> +--- + util/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + mode change 100644 => 100755 util/Makefile.am + +diff --git a/util/Makefile.am b/util/Makefile.am +old mode 100644 +new mode 100755 +index 2bfcb5e..fdeb877 +--- a/util/Makefile.am ++++ b/util/Makefile.am +@@ -37,7 +37,7 @@ endif + if ENABLE_WAYLAND + libutil_la_SOURCES += display-wayland.c wayland-drm-protocol.c viewporter-protocol.c + libutil_la_CFLAGS = @DRM_CFLAGS@ +-libutil_la_LDFLAGS = -lwayland-client -lwayland-cursor -ldrm -ldrm_omap -lpthread -lpvr_wlegl -lavcodec ++libutil_la_LDFLAGS = -lwayland-client -lwayland-cursor -ldrm -ldrm_omap -lpthread -lwayland-egl -lavcodec + + endif + +-- +2.17.1 +
meta-arago-extras/recipes-graphics/omapdrmtest/omapdrmtest_1.0.0.bb +2 -1
@@ -9,7 +9,7 @@ COMPATIBLE_MACHINE = "omap-a15|ti43x" inherit autotools pkgconfig -PR = "r28" +PR = "r29" SRCREV = "20338b9f575ffe9c18c12bbed41c16069d27ccf4" EXTRA_OEMAKE = "CC="${CC}""
@@ -17,6 +17,7 @@ TARGET_CC_ARCH += "${LDFLAGS}" SRC_URI = "git://git.ti.com/glsdk/omapdrmtest.git;protocol=git \ file://0001-Makefile.am-lblah-flags-belong-to-LDADD-not-LDFLAGS.patch \ + file://0001-util-Makefile.am-update-LDFLAGS-for-Mesa-based-EGL.patch \ " S = "${WORKDIR}/git"
Signature · 1 line
2.17.1
PATCH v2 7/7 HACK: matrix-gui-machinevision-demos: disable point-cloud-viewer
In reply to Eric RueiDisable RDEPENDS point-cloud-viewer tentatively until the updated binary built against the MESA-based EGL is available
--- .../matrix/matrix-gui-machinevision-demos_2.0.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
meta-arago-extras/recipes-core/matrix/matrix-gui-machinevision-demos_2.0.bb +4 -2
@@ -3,7 +3,7 @@ HOMEPAGE = "https://gitorious.org/matrix-gui-v2/matrix-gui-v2-apps" require recipes-core/matrix/matrix-gui-apps-git.inc -PR = "${INC_PR}.4" +PR = "${INC_PR}.5" PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -25,9 +25,11 @@ RDEPENDS_matrix-machinevision-demo-dlp3dscanner = " \ " RDEPENDS_matrix-machinevision-demo-dlp3dscanner_append_dra7xx = " \ - ${@bb.utils.contains('MACHINE_FEATURES','gpu','point-cloud-viewer','',d)} \ " +# ${@bb.utils.contains('MACHINE_FEATURES','gpu','point-cloud-viewer','',d)} \ +# + RDEPENDS_matrix-machinevision-demo-barcoderoi = " \ ${MACHINEVISION_RDEPENDS} \ barcode-roi \
Signature · 1 line
2.17.1
qtwebengine fails with this:
cannot find -lIMGegl
Quoted 45 lines · Eric Ruei
These are the corresponding patches with Mesa-based EGL/GLES including
- re-enable qtwebengine for AM3/4/5
- several hacks to resolve compiling issues triggered by mesa-based EGL header files
- Add DRM(GBM)-based 3D demos
-Makefilecleanup per Mesa-based EGL library namesV2 changes:
- Add Upstream-Status to Weston and qtWebkit patchesEric Ruei (7):
packagegroup-arago-xxx-qte-xxx: re-enable qtwebengine per EGL 1.5 forAM3/4/5qtbase-conf: set the default EGLFS mode to kms
HACK: weston: undefineHAVE_GBM_MODIFIERSexplicitly
HACK: qtwebkit: defineMESA_EGL_NO_X11_HEADERSatANGLE/khrplatform.h
img-pvr-sdk: Add DRM(GBM)-based GPU demos
omapdrmtest: Update LDFLAGS at util/Makefile.am per Mesa-based EGL
HACK: matrix-gui-machinevision-demos: disable point-cloud-viewer.../packagegroups/packagegroup-arago-qte.bb | 9 +-- .../packagegroup-arago-tisdk-qte.bb | 7 +- ...rm-undef-HAVE_GBM_MODIFIERS-explicit.patch | 31 ++++++++ .../wayland/weston_5.0.0.bbappend | 3 +- .../recipes-qt/qt5/qtbase-conf/qt_env.sh | 2 +- .../qt5/qtbase-conf/ti33x/qt_env.sh | 2 +- ...atform.h-add-define-MESA_EGL_NO_X11_.patch | 30 ++++++++ .../recipes-qt/qt5/qtwebkit_%.bbappend | 3 +- .../matrix-gui-machinevision-demos_2.0.bb | 6 +- ...packagegroup-arago-qte-toolchain-target.bb | 12 ++-- .../img-pvr-sdk/img-pvr-sdk_3.3.2.bb | 71 ++++++++++--------- ...am-update-LDFLAGS-for-Mesa-based-EGL.patch | 32 +++++++++ .../omapdrmtest/omapdrmtest_1.0.0.bb | 3 +- 13 files changed, 161 insertions(+), 50 deletions(-) create mode 100644 meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS-explicit.patch create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-HACK-ANGLE-khrplatform.h-add-define-MESA_EGL_NO_X11_.patch create mode 100644 meta-arago-extras/recipes-graphics/omapdrmtest/files/0001-util-Makefile.am-update-LDFLAGS-for-Mesa-based-EGL.patchSignature · 6 lines
2.17.1 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
Hi, Denys:
Is the meta-ti patch as in?
What is the target?
I have only tried AM5/6.
Best regards,
Eric
-----Original Message-----
From: Dmytriyenko, Denys
Sent: Thursday, October 31, 2019 11:15 PM
To: Ruei, Eric
Cc: [email protected]
Subject: Re: [meta-arago] [thud/master][PATCH v2 0/7] Mesa-based EGL/GLES
qtwebengine fails with this:
cannot find -lIMGegl
Quoted 45 lines · Eric Ruei
These are the corresponding patches with Mesa-based EGL/GLES including
- re-enable qtwebengine for AM3/4/5
- several hacks to resolve compiling issues triggered by mesa-based EGL header files
- Add DRM(GBM)-based 3D demos
-Makefilecleanup per Mesa-based EGL library namesV2 changes:
- Add Upstream-Status to Weston and qtWebkit patchesEric Ruei (7):
packagegroup-arago-xxx-qte-xxx: re-enable qtwebengine per EGL 1.5 forAM3/4/5qtbase-conf: set the default EGLFS mode to kms
HACK: weston: undefineHAVE_GBM_MODIFIERSexplicitly
HACK: qtwebkit: defineMESA_EGL_NO_X11_HEADERSatANGLE/khrplatform.h
img-pvr-sdk: Add DRM(GBM)-based GPU demos
omapdrmtest: Update LDFLAGS at util/Makefile.am per Mesa-based EGL
HACK: matrix-gui-machinevision-demos: disable point-cloud-viewer.../packagegroups/packagegroup-arago-qte.bb | 9 +-- .../packagegroup-arago-tisdk-qte.bb | 7 +- ...rm-undef-HAVE_GBM_MODIFIERS-explicit.patch | 31 ++++++++ .../wayland/weston_5.0.0.bbappend | 3 +- .../recipes-qt/qt5/qtbase-conf/qt_env.sh | 2 +- .../qt5/qtbase-conf/ti33x/qt_env.sh | 2 +- ...atform.h-add-define-MESA_EGL_NO_X11_.patch | 30 ++++++++ .../recipes-qt/qt5/qtwebkit_%.bbappend | 3 +- .../matrix-gui-machinevision-demos_2.0.bb | 6 +- ...packagegroup-arago-qte-toolchain-target.bb | 12 ++-- .../img-pvr-sdk/img-pvr-sdk_3.3.2.bb | 71 ++++++++++--------- ...am-update-LDFLAGS-for-Mesa-based-EGL.patch | 32 +++++++++ .../omapdrmtest/omapdrmtest_1.0.0.bb | 3 +- 13 files changed, 161 insertions(+), 50 deletions(-) create mode 100644 meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS-explicit.patch create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-HACK-ANGLE-khrplatform.h-add-define-MESA_EGL_NO_X11_.patch create mode 100644 meta-arago-extras/recipes-graphics/omapdrmtest/files/0001-util-Makefile.am-update-LDFLAGS-for-Mesa-based-EGL.patchSignature · 6 lines
2.17.1 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
Quoted 3 lines · Eric
Hi, Denys:
Is the meta-ti patch as in?
Yes.
Quoted 1 line
What is the target?
All of them - AM3/4/5.
AM6 uses qtwebkit.
Quoted 64 lines
I have only tried AM5/6.
Best regards,
Eric
-----Original Message-----
From: Dmytriyenko, Denys
Sent: Thursday, October 31, 2019 11:15 PM
To: Ruei, Eric
Cc: [email protected]
Subject: Re: [meta-arago] [thud/master][PATCH v2 0/7] Mesa-based EGL/GLESqtwebengine fails with this:
cannot find -lIMGeglQuoted 45 lines · Eric Ruei
These are the corresponding patches with Mesa-based EGL/GLES including
- re-enable qtwebengine for AM3/4/5
- several hacks to resolve compiling issues triggered by mesa-based EGL header files
- Add DRM(GBM)-based 3D demos
-Makefilecleanup per Mesa-based EGL library namesV2 changes:
- Add Upstream-Status to Weston and qtWebkit patchesEric Ruei (7):
packagegroup-arago-xxx-qte-xxx: re-enable qtwebengine per EGL 1.5 forAM3/4/5qtbase-conf: set the default EGLFS mode to kms
HACK: weston: undefineHAVE_GBM_MODIFIERSexplicitly
HACK: qtwebkit: defineMESA_EGL_NO_X11_HEADERSatANGLE/khrplatform.h
img-pvr-sdk: Add DRM(GBM)-based GPU demos
omapdrmtest: Update LDFLAGS at util/Makefile.am per Mesa-based EGL
HACK: matrix-gui-machinevision-demos: disable point-cloud-viewer.../packagegroups/packagegroup-arago-qte.bb | 9 +-- .../packagegroup-arago-tisdk-qte.bb | 7 +- ...rm-undef-HAVE_GBM_MODIFIERS-explicit.patch | 31 ++++++++ .../wayland/weston_5.0.0.bbappend | 3 +- .../recipes-qt/qt5/qtbase-conf/qt_env.sh | 2 +- .../qt5/qtbase-conf/ti33x/qt_env.sh | 2 +- ...atform.h-add-define-MESA_EGL_NO_X11_.patch | 30 ++++++++ .../recipes-qt/qt5/qtwebkit_%.bbappend | 3 +- .../matrix-gui-machinevision-demos_2.0.bb | 6 +- ...packagegroup-arago-qte-toolchain-target.bb | 12 ++-- .../img-pvr-sdk/img-pvr-sdk_3.3.2.bb | 71 ++++++++++--------- ...am-update-LDFLAGS-for-Mesa-based-EGL.patch | 32 +++++++++ .../omapdrmtest/omapdrmtest_1.0.0.bb | 3 +- 13 files changed, 161 insertions(+), 50 deletions(-) create mode 100644 meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS-explicit.patch create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-HACK-ANGLE-khrplatform.h-add-define-MESA_EGL_NO_X11_.patch create mode 100644 meta-arago-extras/recipes-graphics/omapdrmtest/files/0001-util-Makefile.am-update-LDFLAGS-for-Mesa-based-EGL.patchSignature · 6 lines
2.17.1 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago