* [dunfell][PATCH] qtwayland: backport texture-sharing/custom-compositor fix
@ 2020-10-06 16:50 Gowtham Tammana
0 siblings, 0 replies; 4+ messages in thread
From: Gowtham Tammana @ 2020-10-06 16:50 UTC (permalink / raw)
To: meta-arago, Denys Dmytriyenko
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="y", Size: 3390 bytes --]
Signed-off-by: Gowtham Tammana <g-tammana@ti.com>
---
...land-texture-sharing-custom-composit.patch | 52 +++++++++++++++++++
.../recipes-qt/qt5/qtwayland_git.bbappend | 3 +-
2 files changed, 54 insertions(+), 1 deletion(-)
create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwayland/0001-examples-fix-wayland-texture-sharing-custom-composit.patch
diff --git a/meta-arago-distro/recipes-qt/qt5/qtwayland/0001-examples-fix-wayland-texture-sharing-custom-composit.patch b/meta-arago-distro/recipes-qt/qt5/qtwayland/0001-examples-fix-wayland-texture-sharing-custom-composit.patch
new file mode 100644
index 00000000..c209dfc4
--- /dev/null
+++ b/meta-arago-distro/recipes-qt/qt5/qtwayland/0001-examples-fix-wayland-texture-sharing-custom-composit.patch
@@ -0,0 +1,52 @@
+From 1d18591d9e7ed9b3580e06c37be23bfde24bc30c Mon Sep 17 00:00:00 2001
+From: Peter Seiderer <ps.report@gmx.net>
+Date: Fri, 3 Apr 2020 22:40:29 +0200
+Subject: [PATCH] examples: fix wayland/texture-sharing/custom-compositor
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes:
+
+ main.cpp:83:33: error: ‘GL_RGBA8’ was not declared in this scope; did you mean ‘GL_RGBA4’?
+ 83 | *glInternalFormat = GL_RGBA8;
+ | ^~~~~~~~
+ | GL_RGBA4
+ main.cpp:120:33: error: ‘GL_RGBA8’ was not declared in this scope; did you mean ‘GL_RGBA4’?
+ 120 | *glInternalFormat = GL_RGBA8;
+ | ^~~~~~~~
+ | GL_RGBA4
+
+Task-number: QTBUG-83304
+Change-Id: I0515f3303b08c405d162986e280e9a7bd35e28f7
+Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
+Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
+
+Upstream-Status: Backport [1d18591d9e7ed9b3580e06c37be23bfde24bc30c]
+
+The patch is backport from upstream commit -
+1d18591d9e7ed9b3580e06c37be23bfde24bc30c
+
+Signed-off-by: Gowtham Tammana <g-tammana@ti.com>
+---
+ examples/wayland/texture-sharing/custom-compositor/main.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/examples/wayland/texture-sharing/custom-compositor/main.cpp b/examples/wayland/texture-sharing/custom-compositor/main.cpp
+index a39c8c38..af375024 100644
+--- a/examples/wayland/texture-sharing/custom-compositor/main.cpp
++++ b/examples/wayland/texture-sharing/custom-compositor/main.cpp
+@@ -63,6 +63,10 @@
+
+ #include "QtWaylandCompositor/private/qwltexturesharingextension_p.h"
+
++#ifndef GL_RGBA8
++#define GL_RGBA8 0x8058
++#endif
++
+ class CustomSharingExtension : public QWaylandTextureSharingExtension
+ {
+ Q_OBJECT
+--
+2.17.1
+
diff --git a/meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend b/meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend
index bd529d2e..c602813c 100644
--- a/meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend
+++ b/meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend
@@ -1,6 +1,7 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-PR_append = ".arago1"
+PR_append = ".arago2"
SRC_URI += " \
file://0001-plugins-decorations-bradient-display-window-icon-onl.patch \
+ file://0001-examples-fix-wayland-texture-sharing-custom-composit.patch \
"
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [dunfell][PATCH] qtwayland: backport texture-sharing/custom-compositor fix
2020-10-06 15:38 ` Denys Dmytriyenko
@ 2020-10-06 16:03 ` Tammana, Gowtham
0 siblings, 0 replies; 4+ messages in thread
From: Tammana, Gowtham @ 2020-10-06 16:03 UTC (permalink / raw)
To: Dmytriyenko, Denys; +Cc: meta-arago
>-----Original Message-----
>From: Dmytriyenko, Denys
>Sent: Tuesday, October 06, 2020 10:39 AM
>To: Tammana, Gowtham <g-tammana@ti.com>
>Cc: meta-arago@arago-project.org
>Subject: Re: [meta-arago][dunfell][PATCH] qtwayland: backport texture-
>sharing/custom-compositor fix
>
>Gowtham,
>
>Great, thanks for finding the fix upstream!
>Would you be willing to submit it to meta-qt5 layer?
>https://github.com/meta-qt5/meta-qt5/tree/dunfell
>
>They prefer github pull requests, but would also take a patch from meta-oe
>list. Looks like it is only needed for dunfell, as it's already fixed in
>new
>version.
Sure, was taking a look at how to push changes for qt. Thanks for the pointers. Will push it there as well.
Thanks,
Gowtham
>Either way, for meta-arago change:
>
>Reviewed-by: Denys Dmytriyenko <denys@ti.com>
>
>
>On Tue, Oct 06, 2020 at 07:38:40AM -0500, Gowtham Tammana wrote:
>> Signed-off-by: Gowtham Tammana <g-tammana@ti.com>
>> ---
>> ...land-texture-sharing-custom-composit.patch | 52 +++++++++++++++++++
>> .../recipes-qt/qt5/qtwayland_git.bbappend | 3 +-
>> 2 files changed, 54 insertions(+), 1 deletion(-)
>> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwayland/0001-
>examples-fix-wayland-texture-sharing-custom-composit.patch
>>
>> diff --git a/meta-arago-distro/recipes-qt/qt5/qtwayland/0001-examples-
>fix-wayland-texture-sharing-custom-composit.patch b/meta-arago-
>distro/recipes-qt/qt5/qtwayland/0001-examples-fix-wayland-texture-sharing-
>custom-composit.patch
>> new file mode 100644
>> index 00000000..c209dfc4
>> --- /dev/null
>> +++ b/meta-arago-distro/recipes-qt/qt5/qtwayland/0001-examples-fix-
>wayland-texture-sharing-custom-composit.patch
>> @@ -0,0 +1,52 @@
>> +From 1d18591d9e7ed9b3580e06c37be23bfde24bc30c Mon Sep 17 00:00:00 2001
>> +From: Peter Seiderer <ps.report@gmx.net>
>> +Date: Fri, 3 Apr 2020 22:40:29 +0200
>> +Subject: [PATCH] examples: fix wayland/texture-sharing/custom-compositor
>> +MIME-Version: 1.0
>> +Content-Type: text/plain; charset=UTF-8
>> +Content-Transfer-Encoding: 8bit
>> +
>> +Fixes:
>> +
>> + main.cpp:83:33: error: ‘GL_RGBA8’ was not declared in this scope; did
>you mean ‘GL_RGBA4’?
>> + 83 | *glInternalFormat = GL_RGBA8;
>> + | ^~~~~~~~
>> + | GL_RGBA4
>> + main.cpp:120:33: error: ‘GL_RGBA8’ was not declared in this scope; did
>you mean ‘GL_RGBA4’?
>> + 120 | *glInternalFormat = GL_RGBA8;
>> + | ^~~~~~~~
>> + | GL_RGBA4
>> +
>> +Task-number: QTBUG-83304
>> +Change-Id: I0515f3303b08c405d162986e280e9a7bd35e28f7
>> +Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
>> +Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-
>blomfeldt@qt.io>
>> +
>> +Upstream-Status: Backport [1d18591d9e7ed9b3580e06c37be23bfde24bc30c]
>> +
>> +The patch is backport from upstream commit -
>> +1d18591d9e7ed9b3580e06c37be23bfde24bc30c
>> +
>> +Signed-off-by: Gowtham Tammana <g-tammana@ti.com>
>> +---
>> + examples/wayland/texture-sharing/custom-compositor/main.cpp | 4 ++++
>> + 1 file changed, 4 insertions(+)
>> +
>> +diff --git a/examples/wayland/texture-sharing/custom-compositor/main.cpp
>b/examples/wayland/texture-sharing/custom-compositor/main.cpp
>> +index a39c8c38..af375024 100644
>> +--- a/examples/wayland/texture-sharing/custom-compositor/main.cpp
>> ++++ b/examples/wayland/texture-sharing/custom-compositor/main.cpp
>> +@@ -63,6 +63,10 @@
>> +
>> + #include "QtWaylandCompositor/private/qwltexturesharingextension_p.h"
>> +
>> ++#ifndef GL_RGBA8
>> ++#define GL_RGBA8 0x8058
>> ++#endif
>> ++
>> + class CustomSharingExtension : public QWaylandTextureSharingExtension
>> + {
>> + Q_OBJECT
>> +--
>> +2.17.1
>> +
>> diff --git a/meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend
>b/meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend
>> index bd529d2e..c602813c 100644
>> --- a/meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend
>> +++ b/meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend
>> @@ -1,6 +1,7 @@
>> FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
>> -PR_append = ".arago1"
>> +PR_append = ".arago2"
>>
>> SRC_URI += " \
>> file://0001-plugins-decorations-bradient-display-window-icon-
>onl.patch \
>> + file://0001-examples-fix-wayland-texture-sharing-custom-
>composit.patch \
>> "
>> --
>> 2.17.1
>>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [dunfell][PATCH] qtwayland: backport texture-sharing/custom-compositor fix
2020-10-06 12:38 Gowtham Tammana
@ 2020-10-06 15:38 ` Denys Dmytriyenko
2020-10-06 16:03 ` Tammana, Gowtham
0 siblings, 1 reply; 4+ messages in thread
From: Denys Dmytriyenko @ 2020-10-06 15:38 UTC (permalink / raw)
To: Gowtham Tammana; +Cc: meta-arago
Gowtham,
Great, thanks for finding the fix upstream!
Would you be willing to submit it to meta-qt5 layer?
https://github.com/meta-qt5/meta-qt5/tree/dunfell
They prefer github pull requests, but would also take a patch from meta-oe
list. Looks like it is only needed for dunfell, as it's already fixed in new
version.
Either way, for meta-arago change:
Reviewed-by: Denys Dmytriyenko <denys@ti.com>
On Tue, Oct 06, 2020 at 07:38:40AM -0500, Gowtham Tammana wrote:
> Signed-off-by: Gowtham Tammana <g-tammana@ti.com>
> ---
> ...land-texture-sharing-custom-composit.patch | 52 +++++++++++++++++++
> .../recipes-qt/qt5/qtwayland_git.bbappend | 3 +-
> 2 files changed, 54 insertions(+), 1 deletion(-)
> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwayland/0001-examples-fix-wayland-texture-sharing-custom-composit.patch
>
> diff --git a/meta-arago-distro/recipes-qt/qt5/qtwayland/0001-examples-fix-wayland-texture-sharing-custom-composit.patch b/meta-arago-distro/recipes-qt/qt5/qtwayland/0001-examples-fix-wayland-texture-sharing-custom-composit.patch
> new file mode 100644
> index 00000000..c209dfc4
> --- /dev/null
> +++ b/meta-arago-distro/recipes-qt/qt5/qtwayland/0001-examples-fix-wayland-texture-sharing-custom-composit.patch
> @@ -0,0 +1,52 @@
> +From 1d18591d9e7ed9b3580e06c37be23bfde24bc30c Mon Sep 17 00:00:00 2001
> +From: Peter Seiderer <ps.report@gmx.net>
> +Date: Fri, 3 Apr 2020 22:40:29 +0200
> +Subject: [PATCH] examples: fix wayland/texture-sharing/custom-compositor
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +Fixes:
> +
> + main.cpp:83:33: error: ‘GL_RGBA8’ was not declared in this scope; did you mean ‘GL_RGBA4’?
> + 83 | *glInternalFormat = GL_RGBA8;
> + | ^~~~~~~~
> + | GL_RGBA4
> + main.cpp:120:33: error: ‘GL_RGBA8’ was not declared in this scope; did you mean ‘GL_RGBA4’?
> + 120 | *glInternalFormat = GL_RGBA8;
> + | ^~~~~~~~
> + | GL_RGBA4
> +
> +Task-number: QTBUG-83304
> +Change-Id: I0515f3303b08c405d162986e280e9a7bd35e28f7
> +Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
> +Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
> +
> +Upstream-Status: Backport [1d18591d9e7ed9b3580e06c37be23bfde24bc30c]
> +
> +The patch is backport from upstream commit -
> +1d18591d9e7ed9b3580e06c37be23bfde24bc30c
> +
> +Signed-off-by: Gowtham Tammana <g-tammana@ti.com>
> +---
> + examples/wayland/texture-sharing/custom-compositor/main.cpp | 4 ++++
> + 1 file changed, 4 insertions(+)
> +
> +diff --git a/examples/wayland/texture-sharing/custom-compositor/main.cpp b/examples/wayland/texture-sharing/custom-compositor/main.cpp
> +index a39c8c38..af375024 100644
> +--- a/examples/wayland/texture-sharing/custom-compositor/main.cpp
> ++++ b/examples/wayland/texture-sharing/custom-compositor/main.cpp
> +@@ -63,6 +63,10 @@
> +
> + #include "QtWaylandCompositor/private/qwltexturesharingextension_p.h"
> +
> ++#ifndef GL_RGBA8
> ++#define GL_RGBA8 0x8058
> ++#endif
> ++
> + class CustomSharingExtension : public QWaylandTextureSharingExtension
> + {
> + Q_OBJECT
> +--
> +2.17.1
> +
> diff --git a/meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend b/meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend
> index bd529d2e..c602813c 100644
> --- a/meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend
> +++ b/meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend
> @@ -1,6 +1,7 @@
> FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> -PR_append = ".arago1"
> +PR_append = ".arago2"
>
> SRC_URI += " \
> file://0001-plugins-decorations-bradient-display-window-icon-onl.patch \
> + file://0001-examples-fix-wayland-texture-sharing-custom-composit.patch \
> "
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [dunfell][PATCH] qtwayland: backport texture-sharing/custom-compositor fix
@ 2020-10-06 12:38 Gowtham Tammana
2020-10-06 15:38 ` Denys Dmytriyenko
0 siblings, 1 reply; 4+ messages in thread
From: Gowtham Tammana @ 2020-10-06 12:38 UTC (permalink / raw)
To: meta-arago, Denys Dmytriyenko
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="y", Size: 3390 bytes --]
Signed-off-by: Gowtham Tammana <g-tammana@ti.com>
---
...land-texture-sharing-custom-composit.patch | 52 +++++++++++++++++++
.../recipes-qt/qt5/qtwayland_git.bbappend | 3 +-
2 files changed, 54 insertions(+), 1 deletion(-)
create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwayland/0001-examples-fix-wayland-texture-sharing-custom-composit.patch
diff --git a/meta-arago-distro/recipes-qt/qt5/qtwayland/0001-examples-fix-wayland-texture-sharing-custom-composit.patch b/meta-arago-distro/recipes-qt/qt5/qtwayland/0001-examples-fix-wayland-texture-sharing-custom-composit.patch
new file mode 100644
index 00000000..c209dfc4
--- /dev/null
+++ b/meta-arago-distro/recipes-qt/qt5/qtwayland/0001-examples-fix-wayland-texture-sharing-custom-composit.patch
@@ -0,0 +1,52 @@
+From 1d18591d9e7ed9b3580e06c37be23bfde24bc30c Mon Sep 17 00:00:00 2001
+From: Peter Seiderer <ps.report@gmx.net>
+Date: Fri, 3 Apr 2020 22:40:29 +0200
+Subject: [PATCH] examples: fix wayland/texture-sharing/custom-compositor
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes:
+
+ main.cpp:83:33: error: ‘GL_RGBA8’ was not declared in this scope; did you mean ‘GL_RGBA4’?
+ 83 | *glInternalFormat = GL_RGBA8;
+ | ^~~~~~~~
+ | GL_RGBA4
+ main.cpp:120:33: error: ‘GL_RGBA8’ was not declared in this scope; did you mean ‘GL_RGBA4’?
+ 120 | *glInternalFormat = GL_RGBA8;
+ | ^~~~~~~~
+ | GL_RGBA4
+
+Task-number: QTBUG-83304
+Change-Id: I0515f3303b08c405d162986e280e9a7bd35e28f7
+Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
+Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
+
+Upstream-Status: Backport [1d18591d9e7ed9b3580e06c37be23bfde24bc30c]
+
+The patch is backport from upstream commit -
+1d18591d9e7ed9b3580e06c37be23bfde24bc30c
+
+Signed-off-by: Gowtham Tammana <g-tammana@ti.com>
+---
+ examples/wayland/texture-sharing/custom-compositor/main.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/examples/wayland/texture-sharing/custom-compositor/main.cpp b/examples/wayland/texture-sharing/custom-compositor/main.cpp
+index a39c8c38..af375024 100644
+--- a/examples/wayland/texture-sharing/custom-compositor/main.cpp
++++ b/examples/wayland/texture-sharing/custom-compositor/main.cpp
+@@ -63,6 +63,10 @@
+
+ #include "QtWaylandCompositor/private/qwltexturesharingextension_p.h"
+
++#ifndef GL_RGBA8
++#define GL_RGBA8 0x8058
++#endif
++
+ class CustomSharingExtension : public QWaylandTextureSharingExtension
+ {
+ Q_OBJECT
+--
+2.17.1
+
diff --git a/meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend b/meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend
index bd529d2e..c602813c 100644
--- a/meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend
+++ b/meta-arago-distro/recipes-qt/qt5/qtwayland_git.bbappend
@@ -1,6 +1,7 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-PR_append = ".arago1"
+PR_append = ".arago2"
SRC_URI += " \
file://0001-plugins-decorations-bradient-display-window-icon-onl.patch \
+ file://0001-examples-fix-wayland-texture-sharing-custom-composit.patch \
"
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-10-06 16:53 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-06 16:50 [dunfell][PATCH] qtwayland: backport texture-sharing/custom-compositor fix Gowtham Tammana
-- strict thread matches above, loose matches on Subject: below --
2020-10-06 12:38 Gowtham Tammana
2020-10-06 15:38 ` Denys Dmytriyenko
2020-10-06 16:03 ` Tammana, Gowtham
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.