* [PATCH 1/7] packagegroup-arago-xxx-qte-xxx: re-enable qtwebengine per EGL 1.5 for AM3/4/5
2019-10-29 13:53 [PATCH 0/7] Mesa-based EGL/GLES Eric Ruei
@ 2019-10-29 13:53 ` Eric Ruei
2019-10-29 13:53 ` [PATCH 2/7] qtbase-conf: set the default EGLFS mode to kms Eric Ruei
` (5 subsequent siblings)
6 siblings, 0 replies; 21+ messages in thread
From: Eric Ruei @ 2019-10-29 13:53 UTC (permalink / raw)
To: meta-arago
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).
Signed-off-by: Eric Ruei <e-ruei1@ti.com>
---
.../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(-)
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb
index 8cfcdfc3..b48b8c9f 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb
@@ -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)} \
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb
index 8c73a4be..09516693 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb
@@ -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 \
diff --git a/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb b/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb
index a5ed1bff..a90f56c0 100644
--- a/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb
+++ b/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb
@@ -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)} \
--
2.17.1
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH 2/7] qtbase-conf: set the default EGLFS mode to kms
2019-10-29 13:53 [PATCH 0/7] Mesa-based EGL/GLES Eric Ruei
2019-10-29 13:53 ` [PATCH 1/7] packagegroup-arago-xxx-qte-xxx: re-enable qtwebengine per EGL 1.5 for AM3/4/5 Eric Ruei
@ 2019-10-29 13:53 ` Eric Ruei
2019-10-29 13:53 ` [PATCH 3/7] HACK: weston: undefine HAVE_GBM_MODIFIERS explicitly Eric Ruei
` (4 subsequent siblings)
6 siblings, 0 replies; 21+ messages in thread
From: Eric Ruei @ 2019-10-29 13:53 UTC (permalink / raw)
To: meta-arago
We 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.
Signed-off-by: Eric Ruei <e-ruei1@ti.com>
---
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(-)
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 2014d206..2484d82a 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
@@ -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
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 8ff05082..76d3804d 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
@@ -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
--
2.17.1
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH 3/7] HACK: weston: undefine HAVE_GBM_MODIFIERS explicitly
2019-10-29 13:53 [PATCH 0/7] Mesa-based EGL/GLES Eric Ruei
2019-10-29 13:53 ` [PATCH 1/7] packagegroup-arago-xxx-qte-xxx: re-enable qtwebengine per EGL 1.5 for AM3/4/5 Eric Ruei
2019-10-29 13:53 ` [PATCH 2/7] qtbase-conf: set the default EGLFS mode to kms Eric Ruei
@ 2019-10-29 13:53 ` Eric Ruei
2019-10-29 21:13 ` Denys Dmytriyenko
2019-10-29 13:53 ` [PATCH 4/7] HACK: qtwebkit: define MESA_EGL_NO_X11_HEADERS at ANGLE/khrplatform.h Eric Ruei
` (3 subsequent siblings)
6 siblings, 1 reply; 21+ messages in thread
From: Eric Ruei @ 2019-10-29 13:53 UTC (permalink / raw)
To: meta-arago
This hack is required tentatively until GBM_MODIFIERS is fully supported
by Mesa-based EGL.
Signed-off-by: Eric Ruei <e-ruei1@ti.com>
---
...mposito-drm-undef-HAVE_GBM_MODIFIERS.patch | 29 +++++++++++++++++++
.../wayland/weston_5.0.0.bbappend | 3 +-
2 files changed, 31 insertions(+), 1 deletion(-)
create mode 100644 meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS.patch
diff --git a/meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS.patch b/meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS.patch
new file mode 100644
index 00000000..56a78e46
--- /dev/null
+++ b/meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS.patch
@@ -0,0 +1,29 @@
+From e406b4141c23fb762a14a09d565c363ebaccb5a4 Mon Sep 17 00:00:00 2001
+From: Eric Ruei <e-ruei1@ti.com>
+Date: Sun, 1 Sep 2019 08:28:27 -0400
+Subject: [PATCH] HACK: composito-drm: undef HAVE_GBM_MODIFIERS
+
+HAVE_GBM_MODIFIERS is defined, but not fully supported by the gbm module
+yet.
+
+Signed-off-by: Eric Ruei <e-ruei1@ti.com>
+---
+ 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
+
diff --git a/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend b/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend
index 1bdcf7e4..94a5bc60 100644
--- a/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend
+++ b/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend
@@ -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.patch \
"
INHIBIT_PACKAGE_STRIP = "1"
--
2.17.1
^ permalink raw reply related [flat|nested] 21+ messages in thread* Re: [PATCH 3/7] HACK: weston: undefine HAVE_GBM_MODIFIERS explicitly
2019-10-29 13:53 ` [PATCH 3/7] HACK: weston: undefine HAVE_GBM_MODIFIERS explicitly Eric Ruei
@ 2019-10-29 21:13 ` Denys Dmytriyenko
2019-10-30 14:41 ` Ruei, Eric
0 siblings, 1 reply; 21+ messages in thread
From: Denys Dmytriyenko @ 2019-10-29 21:13 UTC (permalink / raw)
To: Eric Ruei; +Cc: meta-arago
On Tue, Oct 29, 2019 at 09:53:45AM -0400, Eric Ruei wrote:
> This hack is required tentatively until GBM_MODIFIERS is fully supported
> by Mesa-based EGL.
>
> Signed-off-by: Eric Ruei <e-ruei1@ti.com>
> ---
> ...mposito-drm-undef-HAVE_GBM_MODIFIERS.patch | 29 +++++++++++++++++++
> .../wayland/weston_5.0.0.bbappend | 3 +-
> 2 files changed, 31 insertions(+), 1 deletion(-)
> create mode 100644 meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS.patch
>
> diff --git a/meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS.patch b/meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS.patch
> new file mode 100644
> index 00000000..56a78e46
> --- /dev/null
> +++ b/meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS.patch
> @@ -0,0 +1,29 @@
> +From e406b4141c23fb762a14a09d565c363ebaccb5a4 Mon Sep 17 00:00:00 2001
> +From: Eric Ruei <e-ruei1@ti.com>
> +Date: Sun, 1 Sep 2019 08:28:27 -0400
> +Subject: [PATCH] HACK: composito-drm: undef HAVE_GBM_MODIFIERS
> +
> +HAVE_GBM_MODIFIERS is defined, but not fully supported by the gbm module
> +yet.
Upstream-Status: Inappropriate [reason]
> +Signed-off-by: Eric Ruei <e-ruei1@ti.com>
> +---
> + 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
> +
> diff --git a/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend b/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend
> index 1bdcf7e4..94a5bc60 100644
> --- a/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend
> +++ b/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend
> @@ -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.patch \
> "
>
> INHIBIT_PACKAGE_STRIP = "1"
> --
> 2.17.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] 21+ messages in thread* Re: [PATCH 3/7] HACK: weston: undefine HAVE_GBM_MODIFIERS explicitly
2019-10-29 21:13 ` Denys Dmytriyenko
@ 2019-10-30 14:41 ` Ruei, Eric
2019-10-30 15:01 ` Andrew F. Davis
0 siblings, 1 reply; 21+ messages in thread
From: Ruei, Eric @ 2019-10-30 14:41 UTC (permalink / raw)
To: Denys Dmytriyenko, Eric Ruei, Andrew F. Davis; +Cc: meta-arago
On 10/29/2019 5:13 PM, Denys Dmytriyenko wrote:
> On Tue, Oct 29, 2019 at 09:53:45AM -0400, Eric Ruei wrote:
>> This hack is required tentatively until GBM_MODIFIERS is fully supported
>> by Mesa-based EGL.
>>
>> Signed-off-by: Eric Ruei <e-ruei1@ti.com>
>> ---
>> ...mposito-drm-undef-HAVE_GBM_MODIFIERS.patch | 29 +++++++++++++++++++
>> .../wayland/weston_5.0.0.bbappend | 3 +-
>> 2 files changed, 31 insertions(+), 1 deletion(-)
>> create mode 100644 meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS.patch
>>
>> diff --git a/meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS.patch b/meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS.patch
>> new file mode 100644
>> index 00000000..56a78e46
>> --- /dev/null
>> +++ b/meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS.patch
>> @@ -0,0 +1,29 @@
>> +From e406b4141c23fb762a14a09d565c363ebaccb5a4 Mon Sep 17 00:00:00 2001
>> +From: Eric Ruei <e-ruei1@ti.com>
>> +Date: Sun, 1 Sep 2019 08:28:27 -0400
>> +Subject: [PATCH] HACK: composito-drm: undef HAVE_GBM_MODIFIERS
>> +
>> +HAVE_GBM_MODIFIERS is defined, but not fully supported by the gbm module
>> +yet.
>
> Upstream-Status: Inappropriate [reason]
>
>
Denys:
Thanks!This patch is no longer needed and I shall remove it at v2.
Eric
>> +Signed-off-by: Eric Ruei <e-ruei1@ti.com>
>> +---
>> + 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
>> +
>> diff --git a/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend b/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend
>> index 1bdcf7e4..94a5bc60 100644
>> --- a/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend
>> +++ b/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend
>> @@ -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.patch \
>> "
>>
>> INHIBIT_PACKAGE_STRIP = "1"
>> --
>> 2.17.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] 21+ messages in thread* Re: [PATCH 3/7] HACK: weston: undefine HAVE_GBM_MODIFIERS explicitly
2019-10-30 14:41 ` Ruei, Eric
@ 2019-10-30 15:01 ` Andrew F. Davis
2019-10-30 15:09 ` Ruei, Eric
0 siblings, 1 reply; 21+ messages in thread
From: Andrew F. Davis @ 2019-10-30 15:01 UTC (permalink / raw)
To: Ruei, Eric, Denys Dmytriyenko, Eric Ruei; +Cc: meta-arago
On 10/30/19 10:41 AM, Ruei, Eric wrote:
> On 10/29/2019 5:13 PM, Denys Dmytriyenko wrote:
>> On Tue, Oct 29, 2019 at 09:53:45AM -0400, Eric Ruei wrote:
>>> This hack is required tentatively until GBM_MODIFIERS is fully supported
>>> by Mesa-based EGL.
>>>
>>> Signed-off-by: Eric Ruei <e-ruei1@ti.com>
>>> ---
>>> ...mposito-drm-undef-HAVE_GBM_MODIFIERS.patch | 29 +++++++++++++++++++
>>> .../wayland/weston_5.0.0.bbappend | 3 +-
>>> 2 files changed, 31 insertions(+), 1 deletion(-)
>>> create mode 100644
>>> meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS.patch
>>>
>>>
>>> diff --git
>>> a/meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS.patch
>>> b/meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS.patch
>>>
>>> new file mode 100644
>>> index 00000000..56a78e46
>>> --- /dev/null
>>> +++
>>> b/meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS.patch
>>>
>>> @@ -0,0 +1,29 @@
>>> +From e406b4141c23fb762a14a09d565c363ebaccb5a4 Mon Sep 17 00:00:00 2001
>>> +From: Eric Ruei <e-ruei1@ti.com>
>>> +Date: Sun, 1 Sep 2019 08:28:27 -0400
>>> +Subject: [PATCH] HACK: composito-drm: undef HAVE_GBM_MODIFIERS
>>> +
>>> +HAVE_GBM_MODIFIERS is defined, but not fully supported by the gbm
>>> module
>>> +yet.
>>
>> Upstream-Status: Inappropriate [reason]
>>
>>
>
> Denys:
>
> Thanks!This patch is no longer needed and I shall remove it at v2.
>
Why is this no longer needed? Last time I built this we still had
failures without explicitly disabling GBM_MODIFIERS.
Andrew
> Eric
>
>>> +Signed-off-by: Eric Ruei <e-ruei1@ti.com>
>>> +---
>>> + 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
>>> +
>>> diff --git
>>> a/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend
>>> b/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend
>>> index 1bdcf7e4..94a5bc60 100644
>>> --- a/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend
>>> +++ b/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend
>>> @@ -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.patch \
>>> "
>>> INHIBIT_PACKAGE_STRIP = "1"
>>> --
>>> 2.17.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] 21+ messages in thread* Re: [PATCH 3/7] HACK: weston: undefine HAVE_GBM_MODIFIERS explicitly
2019-10-30 15:01 ` Andrew F. Davis
@ 2019-10-30 15:09 ` Ruei, Eric
2019-10-30 15:24 ` Andrew F. Davis
0 siblings, 1 reply; 21+ messages in thread
From: Ruei, Eric @ 2019-10-30 15:09 UTC (permalink / raw)
To: Andrew F. Davis, Denys Dmytriyenko, Eric Ruei; +Cc: meta-arago
On 10/30/2019 11:01 AM, Andrew F. Davis wrote:
> On 10/30/19 10:41 AM, Ruei, Eric wrote:
>> On 10/29/2019 5:13 PM, Denys Dmytriyenko wrote:
>>> On Tue, Oct 29, 2019 at 09:53:45AM -0400, Eric Ruei wrote:
>>>> This hack is required tentatively until GBM_MODIFIERS is fully supported
>>>> by Mesa-based EGL.
>>>>
>>>> Signed-off-by: Eric Ruei <e-ruei1@ti.com>
>>>> ---
>>>> ...mposito-drm-undef-HAVE_GBM_MODIFIERS.patch | 29 +++++++++++++++++++
>>>> .../wayland/weston_5.0.0.bbappend | 3 +-
>>>> 2 files changed, 31 insertions(+), 1 deletion(-)
>>>> create mode 100644
>>>> meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS.patch
>>>>
>>>>
>>>> diff --git
>>>> a/meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS.patch
>>>> b/meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS.patch
>>>>
>>>> new file mode 100644
>>>> index 00000000..56a78e46
>>>> --- /dev/null
>>>> +++
>>>> b/meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS.patch
>>>>
>>>> @@ -0,0 +1,29 @@
>>>> +From e406b4141c23fb762a14a09d565c363ebaccb5a4 Mon Sep 17 00:00:00 2001
>>>> +From: Eric Ruei <e-ruei1@ti.com>
>>>> +Date: Sun, 1 Sep 2019 08:28:27 -0400
>>>> +Subject: [PATCH] HACK: composito-drm: undef HAVE_GBM_MODIFIERS
>>>> +
>>>> +HAVE_GBM_MODIFIERS is defined, but not fully supported by the gbm
>>>> module
>>>> +yet.
>>>
>>> Upstream-Status: Inappropriate [reason]
>>>
>>>
>>
>> Denys:
>>
>> Thanks!This patch is no longer needed and I shall remove it at v2.
>>
>
>
> Why is this no longer needed? Last time I built this we still had
> failures without explicitly disabling GBM_MODIFIERS.
>
> Andrew
>
>
The HAVE_GBM_MODIFIERS is no longer defined anywhere. Is it expected?
I am able to rebuild Weston without this patch.
Best regards,
Eric
>> Eric
>>
>>>> +Signed-off-by: Eric Ruei <e-ruei1@ti.com>
>>>> +---
>>>> + 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
>>>> +
>>>> diff --git
>>>> a/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend
>>>> b/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend
>>>> index 1bdcf7e4..94a5bc60 100644
>>>> --- a/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend
>>>> +++ b/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend
>>>> @@ -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.patch \
>>>> "
>>>> INHIBIT_PACKAGE_STRIP = "1"
>>>> --
>>>> 2.17.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] 21+ messages in thread* Re: [PATCH 3/7] HACK: weston: undefine HAVE_GBM_MODIFIERS explicitly
2019-10-30 15:09 ` Ruei, Eric
@ 2019-10-30 15:24 ` Andrew F. Davis
2019-10-30 15:30 ` Denys Dmytriyenko
0 siblings, 1 reply; 21+ messages in thread
From: Andrew F. Davis @ 2019-10-30 15:24 UTC (permalink / raw)
To: Ruei, Eric, Denys Dmytriyenko, Eric Ruei; +Cc: meta-arago
On 10/30/19 11:09 AM, Ruei, Eric wrote:
> On 10/30/2019 11:01 AM, Andrew F. Davis wrote:
>> On 10/30/19 10:41 AM, Ruei, Eric wrote:
>>> On 10/29/2019 5:13 PM, Denys Dmytriyenko wrote:
>>>> On Tue, Oct 29, 2019 at 09:53:45AM -0400, Eric Ruei wrote:
>>>>> This hack is required tentatively until GBM_MODIFIERS is fully
>>>>> supported
>>>>> by Mesa-based EGL.
>>>>>
>>>>> Signed-off-by: Eric Ruei <e-ruei1@ti.com>
>>>>> ---
>>>>> ...mposito-drm-undef-HAVE_GBM_MODIFIERS.patch | 29
>>>>> +++++++++++++++++++
>>>>> .../wayland/weston_5.0.0.bbappend | 3 +-
>>>>> 2 files changed, 31 insertions(+), 1 deletion(-)
>>>>> create mode 100644
>>>>> meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS.patch
>>>>>
>>>>>
>>>>>
>>>>> diff --git
>>>>> a/meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS.patch
>>>>>
>>>>> b/meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS.patch
>>>>>
>>>>>
>>>>> new file mode 100644
>>>>> index 00000000..56a78e46
>>>>> --- /dev/null
>>>>> +++
>>>>> b/meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS.patch
>>>>>
>>>>>
>>>>> @@ -0,0 +1,29 @@
>>>>> +From e406b4141c23fb762a14a09d565c363ebaccb5a4 Mon Sep 17 00:00:00
>>>>> 2001
>>>>> +From: Eric Ruei <e-ruei1@ti.com>
>>>>> +Date: Sun, 1 Sep 2019 08:28:27 -0400
>>>>> +Subject: [PATCH] HACK: composito-drm: undef HAVE_GBM_MODIFIERS
>>>>> +
>>>>> +HAVE_GBM_MODIFIERS is defined, but not fully supported by the gbm
>>>>> module
>>>>> +yet.
>>>>
>>>> Upstream-Status: Inappropriate [reason]
>>>>
>>>>
>>>
>>> Denys:
>>>
>>> Thanks!This patch is no longer needed and I shall remove it at v2.
>>>
>>
>>
>> Why is this no longer needed? Last time I built this we still had
>> failures without explicitly disabling GBM_MODIFIERS.
>>
>> Andrew
>>
>>
>
> The HAVE_GBM_MODIFIERS is no longer defined anywhere. Is it expected?
> I am able to rebuild Weston without this patch.
>
What version of Weston do you have? What keeps the code from trying to
use gbm with modifiers? The build will work as the right functions are
exposed (gbm_surface_create_with_modifiers(), etc..) but when used they
will always return "not supported" and we won't get a surface back.
I still see HAVE_GBM_MODIFIERS used in even the latest Weston[0].
[0]
https://gitlab.freedesktop.org/wayland/weston/blob/master/libweston/backend-drm/drm-gbm.c
Andrew
> Best regards,
>
> Eric
>
>
>
>>> Eric
>>>
>>>>> +Signed-off-by: Eric Ruei <e-ruei1@ti.com>
>>>>> +---
>>>>> + 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
>>>>> +
>>>>> diff --git
>>>>> a/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend
>>>>> b/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend
>>>>> index 1bdcf7e4..94a5bc60 100644
>>>>> --- a/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend
>>>>> +++ b/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend
>>>>> @@ -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.patch \
>>>>> "
>>>>> INHIBIT_PACKAGE_STRIP = "1"
>>>>> --
>>>>> 2.17.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] 21+ messages in thread* Re: [PATCH 3/7] HACK: weston: undefine HAVE_GBM_MODIFIERS explicitly
2019-10-30 15:24 ` Andrew F. Davis
@ 2019-10-30 15:30 ` Denys Dmytriyenko
2019-10-30 15:34 ` Andrew F. Davis
0 siblings, 1 reply; 21+ messages in thread
From: Denys Dmytriyenko @ 2019-10-30 15:30 UTC (permalink / raw)
To: Andrew F. Davis; +Cc: Ruei, Eric, meta-arago
On Wed, Oct 30, 2019 at 11:24:26AM -0400, Andrew F. Davis wrote:
> On 10/30/19 11:09 AM, Ruei, Eric wrote:
> > On 10/30/2019 11:01 AM, Andrew F. Davis wrote:
> >> On 10/30/19 10:41 AM, Ruei, Eric wrote:
> >>> On 10/29/2019 5:13 PM, Denys Dmytriyenko wrote:
> >>>> On Tue, Oct 29, 2019 at 09:53:45AM -0400, Eric Ruei wrote:
> >>>>> This hack is required tentatively until GBM_MODIFIERS is fully
> >>>>> supported
> >>>>> by Mesa-based EGL.
> >>>>>
> >>>>> Signed-off-by: Eric Ruei <e-ruei1@ti.com>
> >>>>> ---
> >>>>> ...mposito-drm-undef-HAVE_GBM_MODIFIERS.patch | 29
> >>>>> +++++++++++++++++++
> >>>>> .../wayland/weston_5.0.0.bbappend | 3 +-
> >>>>> 2 files changed, 31 insertions(+), 1 deletion(-)
> >>>>> create mode 100644
> >>>>> meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS.patch
> >>>>>
> >>>>>
> >>>>>
> >>>>> diff --git
> >>>>> a/meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS.patch
> >>>>>
> >>>>> b/meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS.patch
> >>>>>
> >>>>>
> >>>>> new file mode 100644
> >>>>> index 00000000..56a78e46
> >>>>> --- /dev/null
> >>>>> +++
> >>>>> b/meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS.patch
> >>>>>
> >>>>>
> >>>>> @@ -0,0 +1,29 @@
> >>>>> +From e406b4141c23fb762a14a09d565c363ebaccb5a4 Mon Sep 17 00:00:00
> >>>>> 2001
> >>>>> +From: Eric Ruei <e-ruei1@ti.com>
> >>>>> +Date: Sun, 1 Sep 2019 08:28:27 -0400
> >>>>> +Subject: [PATCH] HACK: composito-drm: undef HAVE_GBM_MODIFIERS
> >>>>> +
> >>>>> +HAVE_GBM_MODIFIERS is defined, but not fully supported by the gbm
> >>>>> module
> >>>>> +yet.
> >>>>
> >>>> Upstream-Status: Inappropriate [reason]
> >>>>
> >>>>
> >>>
> >>> Denys:
> >>>
> >>> Thanks!This patch is no longer needed and I shall remove it at v2.
> >>>
> >>
> >>
> >> Why is this no longer needed? Last time I built this we still had
> >> failures without explicitly disabling GBM_MODIFIERS.
> >>
> >> Andrew
> >>
> >>
> >
> > The HAVE_GBM_MODIFIERS is no longer defined anywhere. Is it expected?
> > I am able to rebuild Weston without this patch.
> >
>
> What version of Weston do you have? What keeps the code from trying to
Weston 5.0 in thud/2019 and 7.0 will be in zeus/2020.
> use gbm with modifiers? The build will work as the right functions are
> exposed (gbm_surface_create_with_modifiers(), etc..) but when used they
> will always return "not supported" and we won't get a surface back.
>
> I still see HAVE_GBM_MODIFIERS used in even the latest Weston[0].
>
> [0]
> https://gitlab.freedesktop.org/wayland/weston/blob/master/libweston/backend-drm/drm-gbm.c
> Andrew
>
>
> > Best regards,
> >
> > Eric
> >
> >
> >
> >>> Eric
> >>>
> >>>>> +Signed-off-by: Eric Ruei <e-ruei1@ti.com>
> >>>>> +---
> >>>>> + 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
> >>>>> +
> >>>>> diff --git
> >>>>> a/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend
> >>>>> b/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend
> >>>>> index 1bdcf7e4..94a5bc60 100644
> >>>>> --- a/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend
> >>>>> +++ b/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend
> >>>>> @@ -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.patch \
> >>>>> "
> >>>>> INHIBIT_PACKAGE_STRIP = "1"
> >>>>> --
> >>>>> 2.17.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] 21+ messages in thread* Re: [PATCH 3/7] HACK: weston: undefine HAVE_GBM_MODIFIERS explicitly
2019-10-30 15:30 ` Denys Dmytriyenko
@ 2019-10-30 15:34 ` Andrew F. Davis
2019-10-30 15:57 ` Ruei, Eric
0 siblings, 1 reply; 21+ messages in thread
From: Andrew F. Davis @ 2019-10-30 15:34 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: Ruei, Eric, meta-arago
On 10/30/19 11:30 AM, Denys Dmytriyenko wrote:
> On Wed, Oct 30, 2019 at 11:24:26AM -0400, Andrew F. Davis wrote:
>> On 10/30/19 11:09 AM, Ruei, Eric wrote:
>>> On 10/30/2019 11:01 AM, Andrew F. Davis wrote:
>>>> On 10/30/19 10:41 AM, Ruei, Eric wrote:
>>>>> On 10/29/2019 5:13 PM, Denys Dmytriyenko wrote:
>>>>>> On Tue, Oct 29, 2019 at 09:53:45AM -0400, Eric Ruei wrote:
>>>>>>> This hack is required tentatively until GBM_MODIFIERS is fully
>>>>>>> supported
>>>>>>> by Mesa-based EGL.
>>>>>>>
>>>>>>> Signed-off-by: Eric Ruei <e-ruei1@ti.com>
>>>>>>> ---
>>>>>>> ...mposito-drm-undef-HAVE_GBM_MODIFIERS.patch | 29
>>>>>>> +++++++++++++++++++
>>>>>>> .../wayland/weston_5.0.0.bbappend | 3 +-
>>>>>>> 2 files changed, 31 insertions(+), 1 deletion(-)
>>>>>>> create mode 100644
>>>>>>> meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS.patch
>>>>>>>
>>>>>>>
>>>>>>>
>>>>>>> diff --git
>>>>>>> a/meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS.patch
>>>>>>>
>>>>>>> b/meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS.patch
>>>>>>>
>>>>>>>
>>>>>>> new file mode 100644
>>>>>>> index 00000000..56a78e46
>>>>>>> --- /dev/null
>>>>>>> +++
>>>>>>> b/meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS.patch
>>>>>>>
>>>>>>>
>>>>>>> @@ -0,0 +1,29 @@
>>>>>>> +From e406b4141c23fb762a14a09d565c363ebaccb5a4 Mon Sep 17 00:00:00
>>>>>>> 2001
>>>>>>> +From: Eric Ruei <e-ruei1@ti.com>
>>>>>>> +Date: Sun, 1 Sep 2019 08:28:27 -0400
>>>>>>> +Subject: [PATCH] HACK: composito-drm: undef HAVE_GBM_MODIFIERS
>>>>>>> +
>>>>>>> +HAVE_GBM_MODIFIERS is defined, but not fully supported by the gbm
>>>>>>> module
>>>>>>> +yet.
>>>>>>
>>>>>> Upstream-Status: Inappropriate [reason]
>>>>>>
>>>>>>
>>>>>
>>>>> Denys:
>>>>>
>>>>> Thanks!This patch is no longer needed and I shall remove it at v2.
>>>>>
>>>>
>>>>
>>>> Why is this no longer needed? Last time I built this we still had
>>>> failures without explicitly disabling GBM_MODIFIERS.
>>>>
>>>> Andrew
>>>>
>>>>
>>>
>>> The HAVE_GBM_MODIFIERS is no longer defined anywhere. Is it expected?
>>> I am able to rebuild Weston without this patch.
>>>
>>
>> What version of Weston do you have? What keeps the code from trying to
>
> Weston 5.0 in thud/2019 and 7.0 will be in zeus/2020.
>
Both these version have HAVE_GBM_MODIFIERS, I'd say this patch is still
needed.
Andrew
>
>> use gbm with modifiers? The build will work as the right functions are
>> exposed (gbm_surface_create_with_modifiers(), etc..) but when used they
>> will always return "not supported" and we won't get a surface back.
>>
>> I still see HAVE_GBM_MODIFIERS used in even the latest Weston[0].
>>
>> [0]
>> https://gitlab.freedesktop.org/wayland/weston/blob/master/libweston/backend-drm/drm-gbm.c
>> Andrew
>>
>>
>>> Best regards,
>>>
>>> Eric
>>>
>>>
>>>
>>>>> Eric
>>>>>
>>>>>>> +Signed-off-by: Eric Ruei <e-ruei1@ti.com>
>>>>>>> +---
>>>>>>> + 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
>>>>>>> +
>>>>>>> diff --git
>>>>>>> a/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend
>>>>>>> b/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend
>>>>>>> index 1bdcf7e4..94a5bc60 100644
>>>>>>> --- a/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend
>>>>>>> +++ b/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend
>>>>>>> @@ -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.patch \
>>>>>>> "
>>>>>>> INHIBIT_PACKAGE_STRIP = "1"
>>>>>>> --
>>>>>>> 2.17.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] 21+ messages in thread* Re: [PATCH 3/7] HACK: weston: undefine HAVE_GBM_MODIFIERS explicitly
2019-10-30 15:34 ` Andrew F. Davis
@ 2019-10-30 15:57 ` Ruei, Eric
0 siblings, 0 replies; 21+ messages in thread
From: Ruei, Eric @ 2019-10-30 15:57 UTC (permalink / raw)
To: Andrew F. Davis, Denys Dmytriyenko; +Cc: meta-arago
On 10/30/2019 11:34 AM, Andrew F. Davis wrote:
> On 10/30/19 11:30 AM, Denys Dmytriyenko wrote:
>> On Wed, Oct 30, 2019 at 11:24:26AM -0400, Andrew F. Davis wrote:
>>> On 10/30/19 11:09 AM, Ruei, Eric wrote:
>>>> On 10/30/2019 11:01 AM, Andrew F. Davis wrote:
>>>>> On 10/30/19 10:41 AM, Ruei, Eric wrote:
>>>>>> On 10/29/2019 5:13 PM, Denys Dmytriyenko wrote:
>>>>>>> On Tue, Oct 29, 2019 at 09:53:45AM -0400, Eric Ruei wrote:
>>>>>>>> This hack is required tentatively until GBM_MODIFIERS is fully
>>>>>>>> supported
>>>>>>>> by Mesa-based EGL.
>>>>>>>>
>>>>>>>> Signed-off-by: Eric Ruei <e-ruei1@ti.com>
>>>>>>>> ---
>>>>>>>> ...mposito-drm-undef-HAVE_GBM_MODIFIERS.patch | 29
>>>>>>>> +++++++++++++++++++
>>>>>>>> .../wayland/weston_5.0.0.bbappend | 3 +-
>>>>>>>> 2 files changed, 31 insertions(+), 1 deletion(-)
>>>>>>>> create mode 100644
>>>>>>>> meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS.patch
>>>>>>>>
>>>>>>>>
>>>>>>>>
>>>>>>>> diff --git
>>>>>>>> a/meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS.patch
>>>>>>>>
>>>>>>>> b/meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS.patch
>>>>>>>>
>>>>>>>>
>>>>>>>> new file mode 100644
>>>>>>>> index 00000000..56a78e46
>>>>>>>> --- /dev/null
>>>>>>>> +++
>>>>>>>> b/meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS.patch
>>>>>>>>
>>>>>>>>
>>>>>>>> @@ -0,0 +1,29 @@
>>>>>>>> +From e406b4141c23fb762a14a09d565c363ebaccb5a4 Mon Sep 17 00:00:00
>>>>>>>> 2001
>>>>>>>> +From: Eric Ruei <e-ruei1@ti.com>
>>>>>>>> +Date: Sun, 1 Sep 2019 08:28:27 -0400
>>>>>>>> +Subject: [PATCH] HACK: composito-drm: undef HAVE_GBM_MODIFIERS
>>>>>>>> +
>>>>>>>> +HAVE_GBM_MODIFIERS is defined, but not fully supported by the gbm
>>>>>>>> module
>>>>>>>> +yet.
>>>>>>>
>>>>>>> Upstream-Status: Inappropriate [reason]
>>>>>>>
>>>>>>>
>>>>>>
>>>>>> Denys:
>>>>>>
>>>>>> Thanks!This patch is no longer needed and I shall remove it at v2.
>>>>>>
>>>>>
>>>>>
>>>>> Why is this no longer needed? Last time I built this we still had
>>>>> failures without explicitly disabling GBM_MODIFIERS.
>>>>>
>>>>> Andrew
>>>>>
>>>>>
>>>>
>>>> The HAVE_GBM_MODIFIERS is no longer defined anywhere. Is it expected?
>>>> I am able to rebuild Weston without this patch.
>>>>
>>>
>>> What version of Weston do you have? What keeps the code from trying to
>>
>> Weston 5.0 in thud/2019 and 7.0 will be in zeus/2020.
>>
>
>
> Both these version have HAVE_GBM_MODIFIERS, I'd say this patch is still
> needed.
>
> Andrew
>
You are right. The HAVE_GBM_MODIFIERS is defined at config.h per
configure.ac. It looks like that it is defined because the version
number of gbm is 19.1.6 (> 17.1). The Mesa/gbm is supposed to support
GBM_MODIFIERS, but it does not.
configure.ac
PKG_CHECK_MODULES(DRM_COMPOSITOR_GBM_MODIFIERS, [gbm >= 17.1],
[AC_DEFINE([HAVE_GBM_MODIFIERS], 1, [GBM supports modifiers])],
[AC_MSG_WARN([GBM does not support modifiers])])
Yes, the patch is still required.
Eric
>
>>
>>> use gbm with modifiers? The build will work as the right functions are
>>> exposed (gbm_surface_create_with_modifiers(), etc..) but when used they
>>> will always return "not supported" and we won't get a surface back.
>>>
>>> I still see HAVE_GBM_MODIFIERS used in even the latest Weston[0].
>>>
>>> [0]
>>> https://gitlab.freedesktop.org/wayland/weston/blob/master/libweston/backend-drm/drm-gbm.c
>>> Andrew
>>>
>>>
>>>> Best regards,
>>>>
>>>> Eric
>>>>
>>>>
>>>>
>>>>>> Eric
>>>>>>
>>>>>>>> +Signed-off-by: Eric Ruei <e-ruei1@ti.com>
>>>>>>>> +---
>>>>>>>> + 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
>>>>>>>> +
>>>>>>>> diff --git
>>>>>>>> a/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend
>>>>>>>> b/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend
>>>>>>>> index 1bdcf7e4..94a5bc60 100644
>>>>>>>> --- a/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend
>>>>>>>> +++ b/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend
>>>>>>>> @@ -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.patch \
>>>>>>>> "
>>>>>>>> INHIBIT_PACKAGE_STRIP = "1"
>>>>>>>> --
>>>>>>>> 2.17.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] 21+ messages in thread
* [PATCH 4/7] HACK: qtwebkit: define MESA_EGL_NO_X11_HEADERS at ANGLE/khrplatform.h
2019-10-29 13:53 [PATCH 0/7] Mesa-based EGL/GLES Eric Ruei
` (2 preceding siblings ...)
2019-10-29 13:53 ` [PATCH 3/7] HACK: weston: undefine HAVE_GBM_MODIFIERS explicitly Eric Ruei
@ 2019-10-29 13:53 ` Eric Ruei
2019-10-29 21:13 ` Denys Dmytriyenko
2019-10-29 13:53 ` [PATCH 5/7] img-pvr-sdk: Add DRM(GBM)-based GPU demos Eric Ruei
` (2 subsequent siblings)
6 siblings, 1 reply; 21+ messages in thread
From: Eric Ruei @ 2019-10-29 13:53 UTC (permalink / raw)
To: meta-arago
This is a tentative workaround due to unclean qtwebkit build procedure
where khrplatform.h under both sysroot/usr/include and 3rdparty/ANGLE
is used.
Signed-off-by: Eric Ruei <e-ruei1@ti.com>
---
...atform.h-add-define-MESA_EGL_NO_X11_.patch | 28 +++++++++++++++++++
.../recipes-qt/qt5/qtwebkit_%.bbappend | 3 +-
2 files changed, 30 insertions(+), 1 deletion(-)
create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-HACK-ANGLE-khrplatform.h-add-define-MESA_EGL_NO_X11_.patch
diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-HACK-ANGLE-khrplatform.h-add-define-MESA_EGL_NO_X11_.patch b/meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-HACK-ANGLE-khrplatform.h-add-define-MESA_EGL_NO_X11_.patch
new file mode 100644
index 00000000..c6022ef6
--- /dev/null
+++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-HACK-ANGLE-khrplatform.h-add-define-MESA_EGL_NO_X11_.patch
@@ -0,0 +1,28 @@
+From c969fa7eedb3bce04c8f48caf469a46361437aa7 Mon Sep 17 00:00:00 2001
+From: Eric Ruei <e-ruei1@ti.com>
+Date: Fri, 30 Aug 2019 17:41:13 -0400
+Subject: [PATCH] HACK: ANGLE/khrplatform.h: add #define
+ MESA_EGL_NO_X11_HEADERS
+
+Note: Only the KHR/khrplatform.h at sysroot/usr/include should be used.
+ This patch is a tentative workaround to make both files compatible
+
+Signed-off-by: Eric Ruei <e-ruei1@ti.com>
+---
+ Source/ThirdParty/ANGLE/include/KHR/khrplatform.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Source/ThirdParty/ANGLE/include/KHR/khrplatform.h b/Source/ThirdParty/ANGLE/include/KHR/khrplatform.h
+index c9e6f17d3..4e3ff69a8 100644
+--- a/Source/ThirdParty/ANGLE/include/KHR/khrplatform.h
++++ b/Source/ThirdParty/ANGLE/include/KHR/khrplatform.h
+@@ -279,4 +279,6 @@ typedef enum {
+ KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM
+ } khronos_boolean_enum_t;
+
++#define MESA_EGL_NO_X11_HEADERS
++
+ #endif /* __khrplatform_h_ */
+--
+2.17.1
+
diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend b/meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend
index 75213487..1dbe40d1 100644
--- a/meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend
+++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend
@@ -6,9 +6,10 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
SRC_URI += " \
file://GraphicsSurfaceGL_NoX.cpp.patch \
+ file://0001-HACK-ANGLE-khrplatform.h-add-define-MESA_EGL_NO_X11_.patch \
"
-PR_append = ".arago7"
+PR_append = ".arago8"
EXTRA_OECMAKE_append = " -DCMAKE_BUILD_TYPE=Release"
--
2.17.1
^ permalink raw reply related [flat|nested] 21+ messages in thread* Re: [PATCH 4/7] HACK: qtwebkit: define MESA_EGL_NO_X11_HEADERS at ANGLE/khrplatform.h
2019-10-29 13:53 ` [PATCH 4/7] HACK: qtwebkit: define MESA_EGL_NO_X11_HEADERS at ANGLE/khrplatform.h Eric Ruei
@ 2019-10-29 21:13 ` Denys Dmytriyenko
2019-10-30 15:01 ` Ruei, Eric
0 siblings, 1 reply; 21+ messages in thread
From: Denys Dmytriyenko @ 2019-10-29 21:13 UTC (permalink / raw)
To: Eric Ruei; +Cc: meta-arago
On Tue, Oct 29, 2019 at 09:53:46AM -0400, Eric Ruei wrote:
> This is a tentative workaround due to unclean qtwebkit build procedure
> where khrplatform.h under both sysroot/usr/include and 3rdparty/ANGLE
> is used.
>
> Signed-off-by: Eric Ruei <e-ruei1@ti.com>
> ---
> ...atform.h-add-define-MESA_EGL_NO_X11_.patch | 28 +++++++++++++++++++
> .../recipes-qt/qt5/qtwebkit_%.bbappend | 3 +-
> 2 files changed, 30 insertions(+), 1 deletion(-)
> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-HACK-ANGLE-khrplatform.h-add-define-MESA_EGL_NO_X11_.patch
>
> diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-HACK-ANGLE-khrplatform.h-add-define-MESA_EGL_NO_X11_.patch b/meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-HACK-ANGLE-khrplatform.h-add-define-MESA_EGL_NO_X11_.patch
> new file mode 100644
> index 00000000..c6022ef6
> --- /dev/null
> +++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-HACK-ANGLE-khrplatform.h-add-define-MESA_EGL_NO_X11_.patch
> @@ -0,0 +1,28 @@
> +From c969fa7eedb3bce04c8f48caf469a46361437aa7 Mon Sep 17 00:00:00 2001
> +From: Eric Ruei <e-ruei1@ti.com>
> +Date: Fri, 30 Aug 2019 17:41:13 -0400
> +Subject: [PATCH] HACK: ANGLE/khrplatform.h: add #define
> + MESA_EGL_NO_X11_HEADERS
> +
> +Note: Only the KHR/khrplatform.h at sysroot/usr/include should be used.
> + This patch is a tentative workaround to make both files compatible
Upstream-Status: Inappropriate [reason]
> +Signed-off-by: Eric Ruei <e-ruei1@ti.com>
> +---
> + Source/ThirdParty/ANGLE/include/KHR/khrplatform.h | 2 ++
> + 1 file changed, 2 insertions(+)
> +
> +diff --git a/Source/ThirdParty/ANGLE/include/KHR/khrplatform.h b/Source/ThirdParty/ANGLE/include/KHR/khrplatform.h
> +index c9e6f17d3..4e3ff69a8 100644
> +--- a/Source/ThirdParty/ANGLE/include/KHR/khrplatform.h
> ++++ b/Source/ThirdParty/ANGLE/include/KHR/khrplatform.h
> +@@ -279,4 +279,6 @@ typedef enum {
> + KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM
> + } khronos_boolean_enum_t;
> +
> ++#define MESA_EGL_NO_X11_HEADERS
> ++
> + #endif /* __khrplatform_h_ */
> +--
> +2.17.1
> +
> diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend b/meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend
> index 75213487..1dbe40d1 100644
> --- a/meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend
> +++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend
> @@ -6,9 +6,10 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
>
> SRC_URI += " \
> file://GraphicsSurfaceGL_NoX.cpp.patch \
> + file://0001-HACK-ANGLE-khrplatform.h-add-define-MESA_EGL_NO_X11_.patch \
> "
>
> -PR_append = ".arago7"
> +PR_append = ".arago8"
>
> EXTRA_OECMAKE_append = " -DCMAKE_BUILD_TYPE=Release"
>
> --
> 2.17.1
>
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: [PATCH 4/7] HACK: qtwebkit: define MESA_EGL_NO_X11_HEADERS at ANGLE/khrplatform.h
2019-10-29 21:13 ` Denys Dmytriyenko
@ 2019-10-30 15:01 ` Ruei, Eric
0 siblings, 0 replies; 21+ messages in thread
From: Ruei, Eric @ 2019-10-30 15:01 UTC (permalink / raw)
To: Denys Dmytriyenko, Eric Ruei; +Cc: meta-arago
On 10/29/2019 5:13 PM, Denys Dmytriyenko wrote:
> On Tue, Oct 29, 2019 at 09:53:46AM -0400, Eric Ruei wrote:
>> This is a tentative workaround due to unclean qtwebkit build procedure
>> where khrplatform.h under both sysroot/usr/include and 3rdparty/ANGLE
>> is used.
>>
>> Signed-off-by: Eric Ruei <e-ruei1@ti.com>
>> ---
>> ...atform.h-add-define-MESA_EGL_NO_X11_.patch | 28 +++++++++++++++++++
>> .../recipes-qt/qt5/qtwebkit_%.bbappend | 3 +-
>> 2 files changed, 30 insertions(+), 1 deletion(-)
>> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-HACK-ANGLE-khrplatform.h-add-define-MESA_EGL_NO_X11_.patch
>>
>> diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-HACK-ANGLE-khrplatform.h-add-define-MESA_EGL_NO_X11_.patch b/meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-HACK-ANGLE-khrplatform.h-add-define-MESA_EGL_NO_X11_.patch
>> new file mode 100644
>> index 00000000..c6022ef6
>> --- /dev/null
>> +++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-HACK-ANGLE-khrplatform.h-add-define-MESA_EGL_NO_X11_.patch
>> @@ -0,0 +1,28 @@
>> +From c969fa7eedb3bce04c8f48caf469a46361437aa7 Mon Sep 17 00:00:00 2001
>> +From: Eric Ruei <e-ruei1@ti.com>
>> +Date: Fri, 30 Aug 2019 17:41:13 -0400
>> +Subject: [PATCH] HACK: ANGLE/khrplatform.h: add #define
>> + MESA_EGL_NO_X11_HEADERS
>> +
>> +Note: Only the KHR/khrplatform.h at sysroot/usr/include should be used.
>> + This patch is a tentative workaround to make both files compatible
>
> Upstream-Status: Inappropriate [reason]
>
>
Thanks! I should fix this at v2.
Eric
>> +Signed-off-by: Eric Ruei <e-ruei1@ti.com>
>> +---
>> + Source/ThirdParty/ANGLE/include/KHR/khrplatform.h | 2 ++
>> + 1 file changed, 2 insertions(+)
>> +
>> +diff --git a/Source/ThirdParty/ANGLE/include/KHR/khrplatform.h b/Source/ThirdParty/ANGLE/include/KHR/khrplatform.h
>> +index c9e6f17d3..4e3ff69a8 100644
>> +--- a/Source/ThirdParty/ANGLE/include/KHR/khrplatform.h
>> ++++ b/Source/ThirdParty/ANGLE/include/KHR/khrplatform.h
>> +@@ -279,4 +279,6 @@ typedef enum {
>> + KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM
>> + } khronos_boolean_enum_t;
>> +
>> ++#define MESA_EGL_NO_X11_HEADERS
>> ++
>> + #endif /* __khrplatform_h_ */
>> +--
>> +2.17.1
>> +
>> diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend b/meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend
>> index 75213487..1dbe40d1 100644
>> --- a/meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend
>> +++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend
>> @@ -6,9 +6,10 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
>>
>> SRC_URI += " \
>> file://GraphicsSurfaceGL_NoX.cpp.patch \
>> + file://0001-HACK-ANGLE-khrplatform.h-add-define-MESA_EGL_NO_X11_.patch \
>> "
>>
>> -PR_append = ".arago7"
>> +PR_append = ".arago8"
>>
>> EXTRA_OECMAKE_append = " -DCMAKE_BUILD_TYPE=Release"
>>
>> --
>> 2.17.1
>>
>> _______________________________________________
>> meta-arago mailing list
>> meta-arago@arago-project.org
>> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH 5/7] img-pvr-sdk: Add DRM(GBM)-based GPU demos
2019-10-29 13:53 [PATCH 0/7] Mesa-based EGL/GLES Eric Ruei
` (3 preceding siblings ...)
2019-10-29 13:53 ` [PATCH 4/7] HACK: qtwebkit: define MESA_EGL_NO_X11_HEADERS at ANGLE/khrplatform.h Eric Ruei
@ 2019-10-29 13:53 ` Eric Ruei
2019-10-29 13:53 ` [PATCH 6/7] omapdrmtest: Update LDFLAGS at util/Makefile.am per Mesa-based EGL Eric Ruei
2019-10-29 13:53 ` [PATCH 7/7] HACK: matrix-gui-machinevision-demos: disable point-cloud-viewer Eric Ruei
6 siblings, 0 replies; 21+ messages in thread
From: Eric Ruei @ 2019-10-29 13:53 UTC (permalink / raw)
To: meta-arago
- 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
Signed-off-by: Eric Ruei <e-ruei1@ti.com>
---
.../img-pvr-sdk/img-pvr-sdk_3.3.2.bb | 71 ++++++++++---------
1 file changed, 39 insertions(+), 32 deletions(-)
diff --git a/meta-arago-extras/recipes-graphics/img-pvr-sdk/img-pvr-sdk_3.3.2.bb b/meta-arago-extras/recipes-graphics/img-pvr-sdk/img-pvr-sdk_3.3.2.bb
index 98fb6e00..7cdc6183 100644
--- a/meta-arago-extras/recipes-graphics/img-pvr-sdk/img-pvr-sdk_3.3.2.bb
+++ b/meta-arago-extras/recipes-graphics/img-pvr-sdk/img-pvr-sdk_3.3.2.bb
@@ -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"
--
2.17.1
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH 6/7] omapdrmtest: Update LDFLAGS at util/Makefile.am per Mesa-based EGL
2019-10-29 13:53 [PATCH 0/7] Mesa-based EGL/GLES Eric Ruei
` (4 preceding siblings ...)
2019-10-29 13:53 ` [PATCH 5/7] img-pvr-sdk: Add DRM(GBM)-based GPU demos Eric Ruei
@ 2019-10-29 13:53 ` Eric Ruei
2019-10-30 15:04 ` Andrew F. Davis
2019-10-29 13:53 ` [PATCH 7/7] HACK: matrix-gui-machinevision-demos: disable point-cloud-viewer Eric Ruei
6 siblings, 1 reply; 21+ messages in thread
From: Eric Ruei @ 2019-10-29 13:53 UTC (permalink / raw)
To: meta-arago
- Replace pvr_wlegl with wayland-egl in the LDFLAGS string
Signed-off-by: Eric Ruei <e-ruei1@ti.com>
---
...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
diff --git a/meta-arago-extras/recipes-graphics/omapdrmtest/files/0001-util-Makefile.am-update-LDFLAGS-for-Mesa-based-EGL.patch b/meta-arago-extras/recipes-graphics/omapdrmtest/files/0001-util-Makefile.am-update-LDFLAGS-for-Mesa-based-EGL.patch
new file mode 100644
index 00000000..4774425f
--- /dev/null
+++ b/meta-arago-extras/recipes-graphics/omapdrmtest/files/0001-util-Makefile.am-update-LDFLAGS-for-Mesa-based-EGL.patch
@@ -0,0 +1,32 @@
+From 06b21346d662209f5ea9816f408f9f883b775d60 Mon Sep 17 00:00:00 2001
+From: Eric Ruei <e-ruei1@ti.com>
+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 <e-ruei1@ti.com>
+---
+ 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
+
diff --git a/meta-arago-extras/recipes-graphics/omapdrmtest/omapdrmtest_1.0.0.bb b/meta-arago-extras/recipes-graphics/omapdrmtest/omapdrmtest_1.0.0.bb
index 079663e7..bb166b74 100644
--- a/meta-arago-extras/recipes-graphics/omapdrmtest/omapdrmtest_1.0.0.bb
+++ b/meta-arago-extras/recipes-graphics/omapdrmtest/omapdrmtest_1.0.0.bb
@@ -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"
--
2.17.1
^ permalink raw reply related [flat|nested] 21+ messages in thread* Re: [PATCH 6/7] omapdrmtest: Update LDFLAGS at util/Makefile.am per Mesa-based EGL
2019-10-29 13:53 ` [PATCH 6/7] omapdrmtest: Update LDFLAGS at util/Makefile.am per Mesa-based EGL Eric Ruei
@ 2019-10-30 15:04 ` Andrew F. Davis
2019-10-30 15:09 ` Denys Dmytriyenko
2019-10-30 15:10 ` Ruei, Eric
0 siblings, 2 replies; 21+ messages in thread
From: Andrew F. Davis @ 2019-10-30 15:04 UTC (permalink / raw)
To: Eric Ruei, meta-arago
On 10/29/19 9:53 AM, Eric Ruei wrote:
> - Replace pvr_wlegl with wayland-egl in the LDFLAGS string
>
> Signed-off-by: Eric Ruei <e-ruei1@ti.com>
> ---
> ...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
>
> diff --git a/meta-arago-extras/recipes-graphics/omapdrmtest/files/0001-util-Makefile.am-update-LDFLAGS-for-Mesa-based-EGL.patch b/meta-arago-extras/recipes-graphics/omapdrmtest/files/0001-util-Makefile.am-update-LDFLAGS-for-Mesa-based-EGL.patch
> new file mode 100644
> index 00000000..4774425f
> --- /dev/null
> +++ b/meta-arago-extras/recipes-graphics/omapdrmtest/files/0001-util-Makefile.am-update-LDFLAGS-for-Mesa-based-EGL.patch
> @@ -0,0 +1,32 @@
> +From 06b21346d662209f5ea9816f408f9f883b775d60 Mon Sep 17 00:00:00 2001
> +From: Eric Ruei <e-ruei1@ti.com>
> +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
Who owns the omapdrmtest repo? This should be a trivial fix to get in.
Andrew
> +Signed-off-by: Eric Ruei <e-ruei1@ti.com>
> +---
> + 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
> +
> diff --git a/meta-arago-extras/recipes-graphics/omapdrmtest/omapdrmtest_1.0.0.bb b/meta-arago-extras/recipes-graphics/omapdrmtest/omapdrmtest_1.0.0.bb
> index 079663e7..bb166b74 100644
> --- a/meta-arago-extras/recipes-graphics/omapdrmtest/omapdrmtest_1.0.0.bb
> +++ b/meta-arago-extras/recipes-graphics/omapdrmtest/omapdrmtest_1.0.0.bb
> @@ -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"
>
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: [PATCH 6/7] omapdrmtest: Update LDFLAGS at util/Makefile.am per Mesa-based EGL
2019-10-30 15:04 ` Andrew F. Davis
@ 2019-10-30 15:09 ` Denys Dmytriyenko
2019-10-30 15:10 ` Ruei, Eric
1 sibling, 0 replies; 21+ messages in thread
From: Denys Dmytriyenko @ 2019-10-30 15:09 UTC (permalink / raw)
To: Andrew F. Davis; +Cc: meta-arago
On Wed, Oct 30, 2019 at 11:04:18AM -0400, Andrew F. Davis wrote:
> On 10/29/19 9:53 AM, Eric Ruei wrote:
> > - Replace pvr_wlegl with wayland-egl in the LDFLAGS string
> >
> > Signed-off-by: Eric Ruei <e-ruei1@ti.com>
> > ---
> > ...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
> >
> > diff --git a/meta-arago-extras/recipes-graphics/omapdrmtest/files/0001-util-Makefile.am-update-LDFLAGS-for-Mesa-based-EGL.patch b/meta-arago-extras/recipes-graphics/omapdrmtest/files/0001-util-Makefile.am-update-LDFLAGS-for-Mesa-based-EGL.patch
> > new file mode 100644
> > index 00000000..4774425f
> > --- /dev/null
> > +++ b/meta-arago-extras/recipes-graphics/omapdrmtest/files/0001-util-Makefile.am-update-LDFLAGS-for-Mesa-based-EGL.patch
> > @@ -0,0 +1,32 @@
> > +From 06b21346d662209f5ea9816f408f9f883b775d60 Mon Sep 17 00:00:00 2001
> > +From: Eric Ruei <e-ruei1@ti.com>
> > +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
>
>
> Who owns the omapdrmtest repo? This should be a trivial fix to get in.
http://git.ti.com/gitweb/?p=glsdk/omapdrmtest.git
Ram Prasad is the last committer.
> Andrew
>
>
> > +Signed-off-by: Eric Ruei <e-ruei1@ti.com>
> > +---
> > + 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
> > +
> > diff --git a/meta-arago-extras/recipes-graphics/omapdrmtest/omapdrmtest_1.0.0.bb b/meta-arago-extras/recipes-graphics/omapdrmtest/omapdrmtest_1.0.0.bb
> > index 079663e7..bb166b74 100644
> > --- a/meta-arago-extras/recipes-graphics/omapdrmtest/omapdrmtest_1.0.0.bb
> > +++ b/meta-arago-extras/recipes-graphics/omapdrmtest/omapdrmtest_1.0.0.bb
> > @@ -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"
> >
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: [PATCH 6/7] omapdrmtest: Update LDFLAGS at util/Makefile.am per Mesa-based EGL
2019-10-30 15:04 ` Andrew F. Davis
2019-10-30 15:09 ` Denys Dmytriyenko
@ 2019-10-30 15:10 ` Ruei, Eric
1 sibling, 0 replies; 21+ messages in thread
From: Ruei, Eric @ 2019-10-30 15:10 UTC (permalink / raw)
To: Andrew F. Davis, Eric Ruei, meta-arago
On 10/30/2019 11:04 AM, Andrew F. Davis wrote:
> On 10/29/19 9:53 AM, Eric Ruei wrote:
>> - Replace pvr_wlegl with wayland-egl in the LDFLAGS string
>>
>> Signed-off-by: Eric Ruei <e-ruei1@ti.com>
>> ---
>> ...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
>>
>> diff --git a/meta-arago-extras/recipes-graphics/omapdrmtest/files/0001-util-Makefile.am-update-LDFLAGS-for-Mesa-based-EGL.patch b/meta-arago-extras/recipes-graphics/omapdrmtest/files/0001-util-Makefile.am-update-LDFLAGS-for-Mesa-based-EGL.patch
>> new file mode 100644
>> index 00000000..4774425f
>> --- /dev/null
>> +++ b/meta-arago-extras/recipes-graphics/omapdrmtest/files/0001-util-Makefile.am-update-LDFLAGS-for-Mesa-based-EGL.patch
>> @@ -0,0 +1,32 @@
>> +From 06b21346d662209f5ea9816f408f9f883b775d60 Mon Sep 17 00:00:00 2001
>> +From: Eric Ruei <e-ruei1@ti.com>
>> +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
>
>
> Who owns the omapdrmtest repo? This should be a trivial fix to get in.
>
> Andrew
>
>
Agree. I just want to get the initial patch in and I shall work on those
issues.
Eric
>> +Signed-off-by: Eric Ruei <e-ruei1@ti.com>
>> +---
>> + 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
>> +
>> diff --git a/meta-arago-extras/recipes-graphics/omapdrmtest/omapdrmtest_1.0.0.bb b/meta-arago-extras/recipes-graphics/omapdrmtest/omapdrmtest_1.0.0.bb
>> index 079663e7..bb166b74 100644
>> --- a/meta-arago-extras/recipes-graphics/omapdrmtest/omapdrmtest_1.0.0.bb
>> +++ b/meta-arago-extras/recipes-graphics/omapdrmtest/omapdrmtest_1.0.0.bb
>> @@ -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"
>>
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH 7/7] HACK: matrix-gui-machinevision-demos: disable point-cloud-viewer
2019-10-29 13:53 [PATCH 0/7] Mesa-based EGL/GLES Eric Ruei
` (5 preceding siblings ...)
2019-10-29 13:53 ` [PATCH 6/7] omapdrmtest: Update LDFLAGS at util/Makefile.am per Mesa-based EGL Eric Ruei
@ 2019-10-29 13:53 ` Eric Ruei
6 siblings, 0 replies; 21+ messages in thread
From: Eric Ruei @ 2019-10-29 13:53 UTC (permalink / raw)
To: meta-arago
Disable RDEPENDS point-cloud-viewer tentatively until the updated binary
built against the MESA-based EGL is available
Signed-off-by: Eric Ruei <e-ruei1@ti.com>
---
.../matrix/matrix-gui-machinevision-demos_2.0.bb | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-machinevision-demos_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-machinevision-demos_2.0.bb
index cadfefac..4337ae9d 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-machinevision-demos_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-machinevision-demos_2.0.bb
@@ -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 \
--
2.17.1
^ permalink raw reply related [flat|nested] 21+ messages in thread