mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 01:30:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

meson: Support building qml6glsink on win32

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4762>
This commit is contained in:
Nirbheek Chauhan 2023-05-18 14:23:49 +05:30
parent 515fd66289
commit f813a2813e
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
subprojects/gst-plugins-good/ext/qt6/gstqt6glutility.cc
View file

@ -254,7 +254,6 @@ gst_qml6_get_gl_wrapcontext (GstGLDisplay * display,
gst_gl_display_filter_gl_api (display, gst_gl_context_get_gl_api (*wrap_glcontext)); gst_gl_display_filter_gl_api (display, gst_gl_context_get_gl_api (*wrap_glcontext));
gst_gl_context_activate (*wrap_glcontext, FALSE); gst_gl_context_activate (*wrap_glcontext, FALSE);
} }
#if 0
#if GST_GL_HAVE_WINDOW_WIN32 && GST_GL_HAVE_PLATFORM_WGL && defined (HAVE_QT_WIN32) #if GST_GL_HAVE_WINDOW_WIN32 && GST_GL_HAVE_PLATFORM_WGL && defined (HAVE_QT_WIN32)
g_return_val_if_fail (context != NULL, FALSE); g_return_val_if_fail (context != NULL, FALSE);
@ -288,7 +287,6 @@ gst_qml6_get_gl_wrapcontext (GstGLDisplay * display,
return FALSE; return FALSE;
} G_STMT_END; } G_STMT_END;
#endif
#endif #endif
return TRUE; return TRUE;
} }

16
subprojects/gst-plugins-good/ext/qt6/meson.build
View file

@ -105,7 +105,21 @@ endif
# TODO: Android windowing # TODO: Android windowing
# TODO: Win32 windowing # Win32 windowing
if host_system == 'windows'
qt6_win32 = qt6_option \
.require(gst_gl_have_window_win32, error_message: 'win32 windowing support in gstreamer-gl is required') \
.require(gst_gl_have_platform_wgl, error_message: 'wgl platform support in gstreamer-gl is required')
if qt6_win32.allowed()
# for wglMakeCurrent()
opengl32_dep = cc.find_library('opengl32', required : qt6_win32)
if opengl32_dep.found()
qt_defines += ['-DHAVE_QT_WIN32']
optional_deps += opengl32_dep
have_qt_windowing = true
endif
endif
endif
# macOS windowing # macOS windowing
if host_system == 'darwin' if host_system == 'darwin'