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