mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-30 13:41:48 +00:00
Code Issues 1 Projects Releases Wiki Activity

gl/meson: Allow for the use of libGL as well as OpenGL

Browse source 
OpenGL.framework and libGL are two different providers of a GL
implementation that can be linked into an application together.
This commit is contained in:
Matthew Waters 2018-11-28 20:46:05 +11:00
parent db1722c9cb
commit 9bd8da6ed4
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gst-libs/gst/gl/meson.build
View file

@ -321,7 +321,12 @@ if need_api_opengl != 'no' or need_platform_glx != 'no'
endif endif
endif endif
glx_dep = gl_dep if host_system == 'darwin'
glx_dep = cc.find_library('GL', required : false)
else
glx_dep = gl_dep
endif
if need_api_opengl == 'no' if need_api_opengl == 'no'
gl_dep = unneeded_dep gl_dep = unneeded_dep
endif endif
@ -572,7 +577,7 @@ if need_win_x11 != 'no'
gl_winsys_deps += [x11_dep, xcb_dep] gl_winsys_deps += [x11_dep, xcb_dep]
enabled_gl_winsys += 'x11' enabled_gl_winsys += 'x11'
if need_platform_glx != 'no' and glx_dep.found() if need_platform_glx != 'no' and glx_dep.found() and cc.has_function ('glXMakeCurrent', dependencies : glx_dep)
glconf.set('GST_GL_HAVE_PLATFORM_GLX', 1) glconf.set('GST_GL_HAVE_PLATFORM_GLX', 1)
gl_sources += [ gl_sources += [
'x11/gstglcontext_glx.c', 'x11/gstglcontext_glx.c',