From patchwork Fri Apr 3 21:23:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 1266250 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.net Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=EK00pXdz; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48vCcK1tNsz9sSG for ; Sat, 4 Apr 2020 08:24:16 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 6191D204E3; Fri, 3 Apr 2020 21:24:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ByxxmZbo4MOs; Fri, 3 Apr 2020 21:24:12 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 00AA720524; Fri, 3 Apr 2020 21:24:11 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id A69981BF5DF for ; Fri, 3 Apr 2020 21:24:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A209188374 for ; Fri, 3 Apr 2020 21:24:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Qhi+Q98HVG0M for ; Fri, 3 Apr 2020 21:24:09 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) by whitealder.osuosl.org (Postfix) with ESMTPS id 1AD6187F9B for ; Fri, 3 Apr 2020 21:24:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1585949041; bh=9EGJZwEVDsKyFjUhX5NOCHPxsyveCQMiNnlEPZYdMYk=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=EK00pXdzuYbKVXQD8Hw8OrWPM290bTU9b6+vwpI/n+wmA0zaUh4A5R1vLe6yZQMIx 94oC1EYL3bt5QFoged3B97qEHYs5Ta61KCj8LFoMmvg3oeHjE1S3CJK4yrz+dUPTEj tJCzHwqfqNWaT5fxK+USrvBn9TE2kV+LrL3NKYv4= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.fritz.box ([62.216.209.118]) by mail.gmx.com (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MQ5vW-1jgZ0r0jJ2-00M698; Fri, 03 Apr 2020 23:24:01 +0200 From: Peter Seiderer To: buildroot@busybox.net Date: Fri, 3 Apr 2020 23:23:57 +0200 Message-Id: <20200403212357.26997-3-ps.report@gmx.net> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200403212357.26997-1-ps.report@gmx.net> References: <20200403212357.26997-1-ps.report@gmx.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:D/WglK4OVL/D+QQFW+ubnywF6wnemlhmgmaVvNxrXsEvU9Q9Iqd cyQHwBc4BCV2SEPQ/hKJA+unCEiArZ+v1OilHfDCdzjLr/G4mONwpZeU7sFHkfz5qYPOIwH z193buGdTA8SIa/Btz+J1nA8I1wdUMz08mrQojWg4Zq6W4BYXuXooBa2tkwHiGhb8sGL5ze ef9xcickBZxsw2JOMDZmw== X-UI-Out-Filterresults: notjunk:1; V03:K0:EIsYw0kzQV8=:uNv/U1auVDJhw+OuwLHG6G d2VSalxW7Ymh87CtAVxGQ3vUuuBCvu2OqWKrLbhrs9omWgdjYqg+vAaxMR8AlPG1es2iSYEpf lNhpQulNWRt+rvqy9qyLAFLL9qjwR7vzUXRWtGrDrKnES8lRjuWS1G444g5DVCIBG46M/35/0 HAuTCKeDx702wF3DlgJ3nE6sFhqymgVYuzv/9vwFDWa9td041ju/78BkJvj4QoqrwDVLuRZUo FTFvM1n2ic2452mnALwcYDVAZKtyjduhRLzcssiizbOhiBDdP1GRPK3wGbZBSiEKNSxjfJU3P u6KFWb3YAc8gQYYm8A0btgPfVbf/gHwOydRqYgs6jWL0igKbyUeKxHsY+4vsSV2t9emKpN3lI RAZBdbEHMJG7yiSC81a9XgOikDa8GCVAdBwFJisMrkzpRwXeeRm+Pjjs0ZtjrHqvycnTOdiZt 0QGBJZnrCwALTutRHd4OjhxsMu7TUSk3cpbEZosQhRwOftJ0aNynSJGStR2pLKywq1NsJzc5m EdE/9Jpyyob7/F9Yge+Il5881QV7KswQf3BBGb66OJqYNiGBTBdlwuvuA/I9c6JIhSvoQYQK6 BDy9AxgnbMw0Li6VnH0BGewzygkg8lc4JNcJQd12X6oOt8UjXXqiRtttS+YoDy/Q47lD68s2d SRcSccrwsOplyvka8JNxARAK6x3n6Dp5O7E407+OA+M1YAj2Zd0K5TDe3T7FJ0hjPvmVMk05D oNpDbdRRlKNw8uh30W1Q2E47hJGSfGFIlZt4DJze9h2DhjGcu55Ujqa4fdexBoG9PvKLhBZuy mnhKJTrs9lyO2CqHf+4NXiyVnhQAyTte6vcQY2m64SFDiKyic8vw46/DK80+au9kXVqYEykQp 5DDks8C7jkDV/+XecGBPEZAccs7fktHe16hJ24VYsaLmRcXYh1IZKISdCxN44nLVjdQ46GmrN lB5bTdfbqonFXbn+3kqbc3sHBXPOyrDwzsoAz5B18xxrbhXIMAj1S/etBylk68kb8IztBjPko dMfoNAuockzEgkD7aZ3uBt0cX9yk7S5b5tf792VUFRWyQlQOOcEbV6hL35zKQeKxltqYOXkmT o9tOsCrdOBTKfHFhSQocbLICqf97woOSIDGZ6HrAbnnsDqfS4Mb4CVqq7DT596YhFS1Z99vNg VWdcZicz+XSEfUJPhGZkIuIDfNuiCQ0WK5eywTcIBWNScPGUISnSDQwayDawCL1vdckJ89GH+ nWX8Zt7SCEBJiiqzE Subject: [Buildroot] [RFC v4 3/3] package/qt5/qt5wayland: fix compile for rpi3 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Joshua Henderson , Bartosz Bilas , Julien Corjon , =?utf-8?q?Ga=C3=ABl_Portay?= Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Add three patches to fix compile for rpi3. Signed-off-by: Peter Seiderer --- 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 +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 +--- + 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 +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 +--- + 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 +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 +--- + 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 +