1From 60715769cd5368a63b2bdc2e6d6bb6df0030a54d Mon Sep 17 00:00:00 2001
2From: Peter Seiderer <ps.report@gmx.net>
3Date: Thu, 31 Mar 2022 21:44:22 +0200
4Subject: [PATCH] preview: fix egl_preview compile (conversion from Window to
5 EGLNativeWindowType)
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9
10Fixes:
11
12  .../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]
13    329 |         egl_surface_ = eglCreateWindowSurface(egl_display_, config, window_, NULL);
14        |                                                                     ^~~~~~~
15        |                                                                     |
16        |                                                                     Window {aka long unsigned int}
17
18[Upstream: https://github.com/raspberrypi/libcamera-apps/pull/283]
19Signed-off-by: Peter Seiderer <ps.report@gmx.net>
20---
21 preview/egl_preview.cpp | 2 +-
22 1 file changed, 1 insertion(+), 1 deletion(-)
23
24diff --git a/preview/egl_preview.cpp b/preview/egl_preview.cpp
25index b936e57..593583d 100644
26--- a/preview/egl_preview.cpp
27+++ b/preview/egl_preview.cpp
28@@ -326,7 +326,7 @@ void EglPreview::makeWindow(char const *name)
29 	wm_delete_window_ = XInternAtom(display_, "WM_DELETE_WINDOW", False);
30 	XSetWMProtocols(display_, window_, &wm_delete_window_, 1);
31
32-	egl_surface_ = eglCreateWindowSurface(egl_display_, config, window_, NULL);
33+	egl_surface_ = eglCreateWindowSurface(egl_display_, config, reinterpret_cast<EGLNativeWindowType>(window_), NULL);
34 	if (!egl_surface_)
35 		throw std::runtime_error("eglCreateWindowSurface failed");
36
37--
382.35.1
39
40