[Buildroot] [RFC v4 3/3] package/qt5/qt5wayland: fix compile for rpi3
Peter Seiderer
ps.report at gmx.net
Fri Apr 3 21:23:57 UTC 2020
Add three patches to fix compile for rpi3.
Signed-off-by: Peter Seiderer <ps.report at gmx.net>
---
Changes v3 -> v4:
- new patch
---
...ibdrm-related-configure-test-failure.patch | 56 +++++++++++++++++++
...ayland-scanner-client-wayland-protoc.patch | 36 ++++++++++++
...land-texture-sharing-custom-composit.patch | 42 ++++++++++++++
3 files changed, 134 insertions(+)
create mode 100644 package/qt5/qt5wayland/0001-fix-libdrm-related-configure-test-failure.patch
create mode 100644 package/qt5/qt5wayland/0002-brcm-egl-needs-wayland-scanner-client-wayland-protoc.patch
create mode 100644 package/qt5/qt5wayland/0003-examples-fix-wayland-texture-sharing-custom-composit.patch
diff --git a/package/qt5/qt5wayland/0001-fix-libdrm-related-configure-test-failure.patch b/package/qt5/qt5wayland/0001-fix-libdrm-related-configure-test-failure.patch
new file mode 100644
index 0000000000..b4d0a2c302
--- /dev/null
+++ b/package/qt5/qt5wayland/0001-fix-libdrm-related-configure-test-failure.patch
@@ -0,0 +1,56 @@
+From ba93ccba2aa70bd76f0af43675fa5864e166e3c3 Mon Sep 17 00:00:00 2001
+From: Peter Seiderer <ps.report at gmx.net>
+Date: Fri, 3 Apr 2020 21:52:30 +0200
+Subject: [PATCH 1/3] fix libdrm related configure test failure
+
+Fixes:
+
+ Project ERROR: Test config.qtwayland_client.tests.dmabuf-server-buffer tries to use undeclared library 'drm'
+ Project ERROR: Test config.qtwayland_compositor.tests.dmabuf-server-buffer tries to use undeclared library 'drm'
+ Project ERROR: Test config.qtwayland_compositor.tests.dmabuf-client-buffer tries to use undeclared library 'drm'
+
+Signed-off-by: Peter Seiderer <ps.report at gmx.net>
+---
+ src/client/configure.json | 3 ++-
+ src/compositor/configure.json | 6 ++++--
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/src/client/configure.json b/src/client/configure.json
+index 0621396..27c73f8 100644
+--- a/src/client/configure.json
++++ b/src/client/configure.json
+@@ -74,7 +74,8 @@
+ "label": "Linux dma-buf Buffer Sharing",
+ "type": "compile",
+ "test": "dmabuf_server_buffer",
+- "use": "egl drm"
++ "libs": "-ldrm",
++ "use": "egl"
+ },
+ "vulkan-server-buffer": {
+ "label": "Vulkan Buffer Sharing",
+diff --git a/src/compositor/configure.json b/src/compositor/configure.json
+index 0dbb336..73e4c1a 100644
+--- a/src/compositor/configure.json
++++ b/src/compositor/configure.json
+@@ -80,13 +80,15 @@
+ "label": "Linux dma-buf Buffer Sharing",
+ "type": "compile",
+ "test": "dmabuf_server_buffer",
+- "use": "egl drm"
++ "libs": "-ldrm",
++ "use": "egl"
+ },
+ "dmabuf-client-buffer": {
+ "label": "Linux Client dma-buf Buffer Sharing",
+ "type": "compile",
+ "test": "dmabuf_client_buffer",
+- "use": "egl drm"
++ "libs": "-ldrm",
++ "use": "egl"
+ },
+ "vulkan-server-buffer": {
+ "label": "Vulkan Buffer Sharing",
+--
+2.26.0
+
diff --git a/package/qt5/qt5wayland/0002-brcm-egl-needs-wayland-scanner-client-wayland-protoc.patch b/package/qt5/qt5wayland/0002-brcm-egl-needs-wayland-scanner-client-wayland-protoc.patch
new file mode 100644
index 0000000000..f14c374e76
--- /dev/null
+++ b/package/qt5/qt5wayland/0002-brcm-egl-needs-wayland-scanner-client-wayland-protoc.patch
@@ -0,0 +1,36 @@
+From 4770af94884be5a603934b36e6804eed7d18d43c Mon Sep 17 00:00:00 2001
+From: Peter Seiderer <ps.report at gmx.net>
+Date: Fri, 3 Apr 2020 22:42:23 +0200
+Subject: [PATCH 2/3] brcm-egl: needs
+ wayland-scanner-client-wayland-protocol-include
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes:
+
+ wayland-brcm-client-protocol.h: In function ‘wl_buffer* qt_brcm_create_buffer(qt_brcm*, int32_t, int32_t, wl_array*)’:
+ wayland-brcm-client-protocol.h:115:29: error: ‘wl_buffer_interface’ was not declared in this scope; did you mean ‘qt_brcm_interface’?
+ 115 | QT_BRCM_CREATE_BUFFER, &wl_buffer_interface, NULL, width, height, data);
+ | ^~~~~~~~~~~~~~~~~~~
+ | qt_brcm_interface
+
+Signed-off-by: Peter Seiderer <ps.report at gmx.net>
+---
+ src/hardwareintegration/client/brcm-egl/brcm-egl.pri | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/hardwareintegration/client/brcm-egl/brcm-egl.pri b/src/hardwareintegration/client/brcm-egl/brcm-egl.pri
+index f9f8d07..95eb86e 100644
+--- a/src/hardwareintegration/client/brcm-egl/brcm-egl.pri
++++ b/src/hardwareintegration/client/brcm-egl/brcm-egl.pri
+@@ -11,5 +11,5 @@ HEADERS += $$PWD/qwaylandbrcmeglintegration.h \
+ $$PWD/qwaylandbrcmglcontext.h \
+ $$PWD/qwaylandbrcmeglwindow.h
+
+-CONFIG += wayland-scanner
++CONFIG += wayland-scanner-client-wayland-protocol-include
+ WAYLANDCLIENTSOURCES += $$PWD/../../../extensions/brcm.xml
+--
+2.26.0
+
diff --git a/package/qt5/qt5wayland/0003-examples-fix-wayland-texture-sharing-custom-composit.patch b/package/qt5/qt5wayland/0003-examples-fix-wayland-texture-sharing-custom-composit.patch
new file mode 100644
index 0000000000..1f0f919c93
--- /dev/null
+++ b/package/qt5/qt5wayland/0003-examples-fix-wayland-texture-sharing-custom-composit.patch
@@ -0,0 +1,42 @@
+From f7d96ddd00f868810ed2ca260acd41435717e6b8 Mon Sep 17 00:00:00 2001
+From: Peter Seiderer <ps.report at gmx.net>
+Date: Fri, 3 Apr 2020 22:40:29 +0200
+Subject: [PATCH 3/3] 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
+
+Signed-off-by: Peter Seiderer <ps.report at gmx.net>
+---
+ 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 a39c8c3..af37502 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.26.0
+
--
2.26.0
More information about the buildroot
mailing list