|
| 1 | +Add additional check on GST_GL_HAVE_PLATFORM_GLX before using gst_gl_display_x11_new_with_display |
| 2 | + |
| 3 | +This ensures that there is a compile time check for glx support in gstreamer as |
| 4 | +runtime check is not enough because gst_gl_display_x11_new_with_display() API comes from |
| 5 | +gst/gl/x11/gstgldisplay_x11.h which is only included when GST_GL_HAVE_PLATFORM_GLX is defined |
| 6 | +therefore make this check consistent to fix build with some platforms which use pvr gl drivers |
| 7 | +where this problem appear at compile time. |
| 8 | + |
| 9 | + |
| 10 | +/mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/webkitgtk/2.40.2-r0/webkitgtk-2.40.2/Source/WebCore/platform/graphics/gstreamer/PlatformDisplayGStreamer.cpp:68:31: error: use of undeclared identifier 'gst_gl_display_x11_new_with_display'; did you mean 'gst_gl_display_egl_new_with_egl_display'? |
| 11 | + 68 | return GST_GL_DISPLAY(gst_gl_display_x11_new_with_display(downcast<PlatformDisplayX11>(sharedDisplay).native())); |
| 12 | + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
| 13 | + | gst_gl_display_egl_new_with_egl_display |
| 14 | + |
| 15 | +This issue is 2.40 specific since GLX support is removed [1] from trunk upstream, therefore |
| 16 | +this patch wont be needed when upgrading to 2.42+ |
| 17 | + |
| 18 | +[1] https://github.com/WebKit/WebKit/commit/320560f9e53ddcd53954059bd005e0c75eb91abf |
| 19 | + |
| 20 | +Upstream-Status: Inappropriate [GLX support is gone in 2.41+] |
| 21 | +Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 22 | + |
| 23 | +--- a/Source/WebCore/platform/graphics/gstreamer/PlatformDisplayGStreamer.cpp 2023-02-20 01:22:18.917743700 -0800 |
| 24 | ++++ b/Source/WebCore/platform/graphics/gstreamer/PlatformDisplayGStreamer.cpp 2023-07-08 08:45:09.739177065 -0700 |
| 25 | +@@ -63,7 +63,7 @@ |
| 26 | + if (glPlatform == GST_GL_PLATFORM_EGL) |
| 27 | + return GST_GL_DISPLAY(gst_gl_display_egl_new_with_egl_display(sharedDisplay.eglDisplay())); |
| 28 | + #endif |
| 29 | +-#if USE(GLX) |
| 30 | ++#if USE(GLX) && GST_GL_HAVE_PLATFORM_GLX |
| 31 | + if (is<PlatformDisplayX11>(sharedDisplay) && glPlatform == GST_GL_PLATFORM_GLX) |
| 32 | + return GST_GL_DISPLAY(gst_gl_display_x11_new_with_display(downcast<PlatformDisplayX11>(sharedDisplay).native())); |
| 33 | + #endif |
0 commit comments