package/libcamera-apps: fix X11 preview compile (conversion from Window to EGLNativeWindowType)
PATCH v2 1/1 package/libcamera-apps: fix X11 preview compile (conversion from Window to EGLNativeWindowType)
- 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}---
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
package/libcamera-apps/0002-preview-fix-egl_preview-compile-conversion-from-Wind.patch new file +39 -0
@@ -0,0 +1,39 @@ +From 60715769cd5368a63b2bdc2e6d6bb6df0030a54d Mon Sep 17 00:00:00 2001 +From: Peter Seiderer <[email protected]> +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 <[email protected]> +--- + 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<EGLNativeWindowType>(window_), NULL); + if (!egl_surface_) + throw std::runtime_error("eglCreateWindowSurface failed"); + +-- +2.35.1 +
Signature · 6 lines
2.35.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Arnout Vandecappelle
AppliedQuoted 10 lines · Peter Seiderer
- 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}
Quoted 5 lines
Signed-off-by Peter Seiderer <[email protected]>---
Changes v1 -> v2:
- add patch with proper type cast instead of '-fpermissive' compiler command line option (suggested by Arnout Vandecappelle)
Thanks for the work!
Applied to master, thanks.
Regards,
Arnout
Quoted 40 lines
--- ...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.patchpackage/libcamera-apps/0002-preview-fix-egl_preview-compile-conversion-from-Wind.patch new file +29
-0@@ -0,0 +1,39 @@ +From 60715769cd5368a63b2bdc2e6d6bb6df0030a54d Mon Sep 17 00:00:00 2001 +From: Peter Seiderer <[email protected]> +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 <[email protected]> +--- + 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);
package/libcamera-apps/0002-preview-fix-egl_preview-compile-conversion-from-Wind.patch line 39
Quoted 10 lines
package/libcamera-apps/0002-preview-fix-egl_preview-compile-conversion-from-Wind.patch new file +10
-0+ XSetWMProtocols(display_, window_, &wm_delete_window_, 1); + +- egl_surface_ = eglCreateWindowSurface(egl_display_, config, window_, NULL); ++ egl_surface_ = eglCreateWindowSurface(egl_display_, config, reinterpret_cast<EGLNativeWindowType>(window_), NULL); + if (!egl_surface_) + throw std::runtime_error("eglCreateWindowSurface failed"); + +-- +2.35.1 +
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 12 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Peter" == Peter Seiderer <[email protected]> writes:
- 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}
Quoted 5 lines
Signed-off-by Peter Seiderer <[email protected]>---
Changes v1 -> v2:
- add patch with proper type cast instead of '-fpermissive' compiler command line option (suggested by Arnout Vandecappelle)
Committed to 2022.02.x, thanks.
Signature · 5 lines
Bye, Peter Korsgaard _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot