From patchwork Thu Mar 31 20:12:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 1611946 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: bilbo.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=VGR1fc/V; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KTvcC4mZdz9sFy for ; Fri, 1 Apr 2022 07:12:42 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 89CD961270; Thu, 31 Mar 2022 20:12:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CBLPe6-QquaG; Thu, 31 Mar 2022 20:12:39 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 98B7060F05; Thu, 31 Mar 2022 20:12:38 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 59FF71BF384 for ; Thu, 31 Mar 2022 20:12:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 5151A424CF for ; Thu, 31 Mar 2022 20:12:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp4.osuosl.org (amavisd-new); dkim=pass (1024-bit key) header.d=gmx.net Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BEb8s4cpMiPS for ; Thu, 31 Mar 2022 20:12:35 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by smtp4.osuosl.org (Postfix) with ESMTPS id 8F6F7424CA for ; Thu, 31 Mar 2022 20:12:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1648757552; bh=Q98yNZ1iDpRzx3XKBQmZBL/ZejWTz7wzqWyDANeNWNQ=; h=X-UI-Sender-Class:From:To:Subject:Date; b=VGR1fc/VzZK28tZHeFP6BxPoa7U2SvXUiuufnKak2po6XmRHz/CfpZyh4v+ezyMEa mhwAGn4121OW0hHTmEDCe9mZe5Yue1KpkCSzJdJOPnVcChsU96d+WIyk04V8/5rTLl rSBwhU+7EO4ncNnhfooQbymGhs0nVXCSFA7IwdlU= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.fritz.box ([62.216.209.131]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1N4QsY-1nz0eH3Dz4-011T0k for ; Thu, 31 Mar 2022 22:12:31 +0200 From: Peter Seiderer To: buildroot@buildroot.org Date: Thu, 31 Mar 2022 22:12:31 +0200 Message-Id: <20220331201231.26526-1-ps.report@gmx.net> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:ohrrdCrop9mZtpDhMr1UHucAbj9MzuMaBpa6TBhVQnumf8zL29V Y3drhvq1FPbuBdz48hRevZFNTtcklBh/KWpfczMY5S7AMCI8vYBNB2CbG/azd3m2Xmh/Jsf BhwA5SfLn/HI2SYNSUHTfiuORlglejULMxQx+W6gB9pV0VAn23QzChLfnmS2p1k4ySKnIv6 IiXV1gdqKOTb7F5lV7uTw== X-UI-Out-Filterresults: notjunk:1;V03:K0:3xZKi2we8Zc=:m4PRR9V9GAnXkRgxDG2Lac dGQ1vxR7fxdDRO0dBYeHTgGO+gt4sh2ySl3poqSLNhN4ZMOBeFjUdjIEgjixOxKRpEz0/w0jJ /5sqKNiDjaomxFw27AnPh+9vTwEbAxDkNYSnVDoH+CAliN2FHuYDyJqE1b1eDRFvdv3wEIPjd 5VwQZpyzkPcL+2IYvA5BvQytUeNdhYaDUwZOKScbaS/1XnAVZa5336Wrlo4DCoiP7GijkPLcU do1QEhBOZ8rM2NCkv3STXpCPvkDiS+lto8HqlRKgMZxXvX5dpuLJOngyPXfH1VyKuil91JQis 4WtFSCdrFp9rabQhBRHk33gyIo8mzuQBX80hpx9wjaCkpw6h2xBmNDjfMahWK+zcRNI22MJGr Dk86mO2wi5V8GbJHtUS3VXmaZ0W0P9splMSPc4lBETUn4uri6R3t//1Izgn2v7CzRpRiZuOqk kNi/YBuqc/E84LwpAqGxNte81fWF++JWkANgzNt5HoYDmKxgiPB3dCrS4iQDL8c1tpOuJ99Y3 qyV//vE4n5QpWIB02iDX6k3QtY3kwdylJcXDd0VVi4IyxM79yWbreSdBraAxKlf7kvb6XJcQl pZrleF4NfEc5dkvviIiaFNRz1EI8+FoKZU6Jlfe7w1ZOxmNZyiVHpP1YwpUiwwfU2qWFwpTyi gbNL4usUePGmeh5eujHK4uow5klXaWIZ72IkXATRhKHkN7hWaxc6b9kU8Ryv9tiD2mwE7mkYE HeaXAdeLzOuBMQr45Pc1eZubOoPDtc0GJx+F84ao3D13AWOSApx932OuN8wJWqVn7+50rGTNF Nw1pmN/lISLWED/M6/+EpcuingI7r/t9+uTM1e0Sg9NaCy140GOv6CJOsyjD2bxPVo5Cb69jY KGu7CN5tMPkFmZu+HpbUi0pt4mg36941GTY5cJ4gosaac+d6DhqoR615K/qrLl1jUiQtHcnOw vwgWKfbptJ5rzjd/g3XfVIp8zpSurx2REn2BT03+mnFAbDuPExwa4zf/Apev/65Z1qOyJ81S1 tPLArx+6izX3SG7BcHD5w83JoKXEkv3i8n21j7913seW4yW4sVtDjwJS1At/MaXTcu++XsFKp tr9joFPPLICdmw= Subject: [Buildroot] [PATCH v2] package/libcamera-apps: fix X11 preview compile (conversion from Window to EGLNativeWindowType) X-BeenThere: buildroot@buildroot.org 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: , Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" - add 002-preview-fix-egl_preview-compile-conversion-from-Wind.patch Fixes: .../build/libcamera-apps-2d1009e3badcc8047361ff81149ad6cba3b911b5/preview/egl_preview.cpp:329:69: error: invalid conversion from ‘Window’ {aka ‘long unsigned int’} to ‘EGLNativeWindowType’ {aka ‘fbdev_window*’} [-fpermissive] 329 | egl_surface_ = eglCreateWindowSurface(egl_display_, config, window_, NULL); | ^~~~~~~ | | | Window {aka long unsigned int} Signed-off-by: Peter Seiderer --- Changes v1 -> v2: - add patch with proper type cast instead of '-fpermissive' compiler command line option (suggested by Arnout Vandecappelle) --- ...preview-compile-conversion-from-Wind.patch | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 package/libcamera-apps/0002-preview-fix-egl_preview-compile-conversion-from-Wind.patch diff --git a/package/libcamera-apps/0002-preview-fix-egl_preview-compile-conversion-from-Wind.patch b/package/libcamera-apps/0002-preview-fix-egl_preview-compile-conversion-from-Wind.patch new file mode 100644 index 0000000000..cc9069aa86 --- /dev/null +++ b/package/libcamera-apps/0002-preview-fix-egl_preview-compile-conversion-from-Wind.patch @@ -0,0 +1,39 @@ +From 60715769cd5368a63b2bdc2e6d6bb6df0030a54d Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Thu, 31 Mar 2022 21:44:22 +0200 +Subject: [PATCH] preview: fix egl_preview compile (conversion from Window to + EGLNativeWindowType) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes: + + .../build/libcamera-apps-2d1009e3badcc8047361ff81149ad6cba3b911b5/preview/egl_preview.cpp:329:69: error: invalid conversion from ‘Window’ {aka ‘long unsigned int’} to ‘EGLNativeWindowType’ {aka ‘fbdev_window*’} [-fpermissive] + 329 | egl_surface_ = eglCreateWindowSurface(egl_display_, config, window_, NULL); + | ^~~~~~~ + | | + | Window {aka long unsigned int} + +[Upstream: https://github.com/raspberrypi/libcamera-apps/pull/283] +Signed-off-by: Peter Seiderer +--- + preview/egl_preview.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/preview/egl_preview.cpp b/preview/egl_preview.cpp +index b936e57..593583d 100644 +--- a/preview/egl_preview.cpp ++++ b/preview/egl_preview.cpp +@@ -326,7 +326,7 @@ void EglPreview::makeWindow(char const *name) + wm_delete_window_ = XInternAtom(display_, "WM_DELETE_WINDOW", False); + XSetWMProtocols(display_, window_, &wm_delete_window_, 1); + +- egl_surface_ = eglCreateWindowSurface(egl_display_, config, window_, NULL); ++ egl_surface_ = eglCreateWindowSurface(egl_display_, config, reinterpret_cast(window_), NULL); + if (!egl_surface_) + throw std::runtime_error("eglCreateWindowSurface failed"); + +-- +2.35.1 +