From b5b7a3aec3282c30fbe100901e7789666fc4cb14 Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Fri, 9 Sep 2016 11:08:53 +1000 Subject: [PATCH] meson: add some starting build files for GL Currently only works on linux with egl/glx + wayland/x11 but the general principals have been layed out for adding the other GL platforms/winsys'. --- ext/gl/meson.build | 110 +++++++ ext/meson.build | 2 +- gst-libs/gst/gl/gstglconfig.h.meson | 5 + gst-libs/gst/gl/meson.build | 551 ++++++++++++++++++++++++++++++++---- gst-libs/gst/meson.build | 6 +- meson_options.txt | 3 + pkgconfig/meson.build | 7 +- 7 files changed, 628 insertions(+), 56 deletions(-) create mode 100644 ext/gl/meson.build diff --git a/ext/gl/meson.build b/ext/gl/meson.build new file mode 100644 index 0000000..7076880 --- /dev/null +++ b/ext/gl/meson.build @@ -0,0 +1,110 @@ +opengl_sources = [ + 'gstopengl.c', + 'gstglbasemixer.c', + 'gstgluploadelement.c', + 'gstgldownloadelement.c', + 'gstglcolorconvertelement.c', + 'gstglfilterbin.c', + 'gstglmixerbin.c', + 'gstglsinkbin.c', + 'gstglsrcbin.c', + 'gstglimagesink.c', + 'gstglfiltercube.c', + 'gstgleffects.c', + 'effects/gstgleffectscurves.c', + 'effects/gstgleffectssources.c', + 'effects/gstgleffectidentity.c', + 'effects/gstgleffectmirror.c', + 'effects/gstgleffectsqueeze.c', + 'effects/gstgleffectstretch.c', + 'effects/gstgleffectfisheye.c', + 'effects/gstgleffecttwirl.c', + 'effects/gstgleffectbulge.c', + 'effects/gstgleffecttunnel.c', + 'effects/gstgleffectsquare.c', + 'effects/gstgleffectlumatocurve.c', + 'effects/gstgleffectrgbtocurve.c', + 'effects/gstgleffectsin.c', + 'effects/gstgleffectxray.c', + 'effects/gstgleffectglow.c', + 'effects/gstgleffectblur.c', + 'effects/gstgleffectsobel.c', + 'effects/gstgleffectlaplacian.c', + 'gstglcolorscale.c', + 'gstglcolorbalance.c', + 'gstglmixer.c', + 'gstglvideomixer.c', + 'gstglfiltershader.c', + 'gstglfilterapp.c', + 'gstglviewconvert.c', + 'gstglstereosplit.c', + 'gstgldeinterlace.c', + 'gstglstereomix.c', + 'gltestsrc.c', + 'gstgltestsrc.c', +] + +if build_gstgl and gstgl_dep.found() + optional_deps = [] + opengl_defines = ['-DGST_USE_UNSTABLE_API'] + + if gl_dep.found() # have desktop GL + opengl_sources += [ + 'gstglfilterglass.c', + 'gstglmosaic.c', + ] + endif + + graphene_dep = dependency('graphene-1.0', version : '>=1.4.0', required : false) + if graphene_dep.found() + optional_deps += graphene_dep + opengl_defines += '-DHAVE_GRAPHENE=1' + opengl_sources += [ + 'gstgltransformation.c', + 'gstglvideoflip.c', + ] + endif + + png_dep = dependency('libpng', version : '>=1.0', required : false) + jpeg_dep = cc.find_library('jpeg-mmx', required : false) + if not jpeg_dep.found() + jpeg_dep = cc.find_library('jpeg', required : false) + endif + + if png_dep.found() + optional_deps += png_dep + opengl_defines += '-DHAVE_PNG=1' + opengl_sources += [ + 'gstgldifferencematte.c', + ] + if jpeg_dep.found() + optional_deps += jpeg_dep + opengl_defines += '-DHAVE_JPEG=1' + opengl_sources += [ + 'gstgloverlay.c', + ] + endif + endif + + if false # have cocoa + opengl_sources += [ + 'caopengllayersink.m', + ] + endif + + if x11_dep.found() + # for XInitThreads() + optional_deps += x11_dep + endif + + gstopengl = library('gstopengl', + opengl_sources, + c_args : gst_plugins_bad_args + opengl_defines, + link_args : noseh_link_args, + include_directories : [configinc], + dependencies : [gstgl_dep, gstbadvideo_dep, gstbadbase_dep, gstvideo_dep, + gstbase_dep, libm] + optional_deps, + install : true, + install_dir : plugins_install_dir, + ) +endif diff --git a/ext/meson.build b/ext/meson.build index 1809645..f91a737 100644 --- a/ext/meson.build +++ b/ext/meson.build @@ -14,7 +14,7 @@ subdir('faac') subdir('faad') subdir('flite') subdir('fluidsynth') -#subdir('gl') +subdir('gl') #subdir('gme') #subdir('gsm') #subdir('gtk') diff --git a/gst-libs/gst/gl/gstglconfig.h.meson b/gst-libs/gst/gl/gstglconfig.h.meson index 6726c84..ebe410d 100644 --- a/gst-libs/gst/gl/gstglconfig.h.meson +++ b/gst-libs/gst/gl/gstglconfig.h.meson @@ -33,7 +33,12 @@ G_BEGIN_DECLS #mesondefine GST_GL_HAVE_GLCHAR #mesondefine GST_GL_HAVE_GLSIZEIPTR #mesondefine GST_GL_HAVE_GLINTPTR +#mesondefine GST_GL_HAVE_GLSYNC +#mesondefine GST_GL_HAVE_GLUINT64 +#mesondefine GST_GL_HAVE_GLINT64 +#mesondefine GST_GL_HAVE_EGLATTRIB +#mesondefine GST_GL_HAVE_DMABUF G_END_DECLS diff --git a/gst-libs/gst/gl/meson.build b/gst-libs/gst/gl/meson.build index 6c210de..f0e8bac 100644 --- a/gst-libs/gst/gl/meson.build +++ b/gst-libs/gst/gl/meson.build @@ -1,20 +1,32 @@ gl_sources = [ - 'gstgldisplay.c', - 'gstglcontext.c', - 'gstglmemory.c', + 'gstglapi.c', + 'gstglbasefilter.c', + 'gstglbasememory.c', + 'gstglcolorconvert.c', + 'gstglcontrolbindingproxy.c', + 'gstglbuffer.c', 'gstglbufferpool.c', + 'gstglcontext.c', + 'gstgldebug.c', + 'gstgldisplay.c', + 'gstglfeature.c', 'gstglfilter.c', + 'gstglformat.c', + 'gstglframebuffer.c', + 'gstglmemory.c', + 'gstglmemorypbo.c', + 'gstgloverlaycompositor.c', + 'gstglquery.c', + 'gstglrenderbuffer.c', 'gstglshader.c', - 'gstglshadervariables.c', - 'gstglcolorconvert.c', - 'gstgldownload.c', + 'gstglshaderstrings.c', + 'gstglsl.c', + 'gstglslstage.c', + 'gstglsyncmeta.c', 'gstglupload.c', - 'gstgluploadmeta.c', - 'gstglwindow.c', - 'gstglapi.c', - 'gstglfeature.c', 'gstglutils.c', - 'gstglframebuffer.c', + 'gstglviewconvert.c', + 'gstglwindow.c', ] gl_headers = [ @@ -49,44 +61,487 @@ gl_headers = [ 'gstglviewconvert.h', 'gstglwindow.h', ] -# FIXME: Install glprototypes -install_headers(gl_headers, subdir : 'gstreamer-1.0/gst/gl') + +gl_prototype_headers = [ + 'glprototypes/all_functions.h', + 'glprototypes/base.h', + 'glprototypes/blending.h', + 'glprototypes/buffers.h', + 'glprototypes/debug.h', + 'glprototypes/eglimage.h', + 'glprototypes/fbo.h', + 'glprototypes/fixedfunction.h', + 'glprototypes/gles.h', + 'glprototypes/gstgl_compat.h', + 'glprototypes/gstgl_gles2compat.h', + 'glprototypes/Makefile.am', + 'glprototypes/opengl.h', + 'glprototypes/query.h', + 'glprototypes/README', + 'glprototypes/shaders.h', + 'glprototypes/sync.h', + 'glprototypes/vao.h', +] + +gl_x11_headers = [] +gl_wayland_headers = [] +gl_win32_headers = [] +gl_cocoa_headers = [] +gl_egl_headers = [] glconf = configuration_data() -glconf.set10('GST_GL_HAVE_OPENGL', gl_dep.found()) +gmodule_dep = dependency('gmodule-no-export-2.0') +unneeded_dep = dependency('', required : false) +if unneeded_dep.found() + error ('Found unfindable dependency') +endif -if x11_dep.found() - gl_sources += [ - 'x11/gstgldisplay_x11.c', - 'x11/gstglwindow_x11.c', - 'x11/x11_event_source.c', - 'x11/gstglcontext_glx.c', -] - glconf.set('GST_GL_HAVE_WINDOW_X11', 1) - glconf.set('GST_GL_HAVE_PLATFORM_GLX', 1) -endif - -# Add rest of gl config here. - -configure_file(input : 'gstglconfig.h.meson', - output : 'gstglconfig.h', - install_dir : get_option('libdir') + '/gstreamer-1.0/include/gst/gl', - configuration : glconf) - -gstgl = library('gstgl-' + api_version, - gl_sources, - c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API'], - include_directories : [configinc, libsinc], - version : libversion, - soversion : soversion, - install : true, - dependencies : [gstbase_dep, gstvideo_dep], - # FIXME: This symbol list is generated on Linux, so this is wrong for Windows - vs_module_defs: vs_module_defs_dir + 'libgstgl.def', -) -# TODO: generate gir - -gstgl_dep = declare_dependency(link_with : gstgl, - include_directories : [libsinc], - dependencies : [gstbase_dep, gstvideo_dep]) +# OpenGL/GLES2 libraries +gl_lib_deps = [] +# GL platform - EGL, GLX, CGL, WGL, etc +gl_platform_deps = [] +# GL winsys - wayland, X11, Cocoa, win32, etc +gl_winsys_deps = [] +# other things we need. +gl_misc_deps = [] + +enabled_gl_apis = [] +enabled_gl_platforms = [] +enabled_gl_winsys = [] + +# parse provided options +gl_apis_s = get_option ('with_gl_api') +if gl_apis_s == 'auto' + need_api_opengl = 'auto' + need_api_gles2 = 'auto' +else + need_api_opengl = 'no' + need_api_gles2 = 'no' + gl_apis = gl_apis_s.split(',') + foreach api : gl_apis + if api == 'opengl' + need_api_opengl = 'yes' + elif api == 'gles2' + need_api_gles2 = 'yes' + else + error('Unsupported GL api provided ' + api) + endif + endforeach +endif + +gl_platforms_s = get_option ('with_gl_platform') +if gl_platforms_s == 'auto' + need_platform_egl = 'auto' + need_platform_glx = 'auto' + need_platform_cgl = 'auto' + need_platform_wgl = 'auto' + need_platform_eagl = 'auto' +else + need_platform_egl = 'no' + need_platform_glx = 'no' + need_platform_cgl = 'no' + need_platform_wgl = 'no' + need_platform_eagl = 'no' + gl_platforms = gl_platforms_s.split(',') + foreach platform : gl_platforms + if platform == 'egl' + need_platform_egl = 'yes' + elif platform == 'glx' + need_platform_glx = 'yes' +# elif platform == 'cgl' +# need_platform_cgl = 'yes' +# elif platform == 'wgl' +# need_platform_wgl = 'yes' +# elif platform == 'eagl' +# need_platform_eagl = 'yes' + else + error('Unsupported GL platform provided ' + platform) + endif + endforeach +endif + +gl_winsys_s = get_option ('with_gl_winsys') +if gl_winsys_s == 'auto' + need_win_x11 = 'auto' + need_win_wayland = 'auto' + need_win_win32 = 'auto' + need_win_cocoa = 'auto' + need_win_eagl = 'auto' + need_win_dispmanx = 'auto' +else + need_win_x11 = 'no' + need_win_wayland = 'no' + need_win_win32 = 'no' + need_win_cocoa = 'no' + need_win_eagl = 'no' + need_win_dispmanx = 'no' + gl_winsys = gl_winsys_s.split(',') + foreach winsys : gl_winsys + if winsys == 'x11' + need_win_x11 = 'yes' + elif winsys == 'wayland' + need_win_wayland = 'yes' +# elif winsys == 'win32' +# need_win_win32 = 'yes' +# elif winsys == 'cocoa' +# need_win_cocoa = 'yes' +# elif winsys == 'eagl' +# need_win_eagl = 'yes' +# elif winsys == 'dispmanx' +# need_win_dispmanx = 'yes' + else + error('Unsupported GL winsys provided ' + platform) + endif + endforeach +endif + +gl_include_header = ''' +#ifdef __GNUC__ +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wredundant-decls" +#endif +#ifndef GL_GLEXT_PROTOTYPES +#define GL_GLEXT_PROTOTYPES 1 +#endif +''' + +# Desktop OpenGL checks +gl_dep = unneeded_dep +if need_api_opengl != 'no' + gl_dep = dependency('GL', required : false) + if not gl_dep.found() +# if host_machine.system() == 'windows' +# gl_dep = cc.find_library('opengl32', required : false) +# elif host_machine.system() == 'darwin' +# gl_dep = cc.find_library('OpenGL', required : false) +# else + gl_dep = cc.find_library('GL', required : false) +# endif + + if not gl_dep.found() and need_api_opengl == 'yes' + error ('Could not find requested OpenGL library') + endif + endif + + opengl_includes = ''' +#ifdef __APPLE__ +# include +# include +# if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 +# define GL_DO_NOT_WARN_IF_MULTI_GL_VERSION_HEADERS_INCLUDED +# include +# endif +#else +# include +# if __WIN32__ || _WIN32 +# include +# endif +#endif +''' +endif + +# GLES2 checks +gles2_dep = unneeded_dep +if need_api_gles2 != 'no' + gles2_dep = dependency('GLESv2', required : false) + if not gles2_dep.found() +# if host_machine.system() == 'windows' +# elif host_machine.system() == 'darwin' +# gles2_dep = cc.find_library('GLESv2', required : false) +# else + gles2_dep = cc.find_library('GLESv2', required : false) +# endif + + if not gles2_dep.found() and need_api_gles2 == 'yes' + error ('Could not find requested OpenGL ES library') + endif + endif + + gles3_h = gles2_dep.found() and cc.has_header('GLES3/gl3.h', required : false, dependencies : gles2_dep) + + gles_includes = ''' +#ifdef HAVE_IOS /* FIXME */ +# include +# include +#else''' + if gles3_h + gles_includes += ''' +# include +# include ''' + else + gles_includes += ''' +# include +# include ''' + endif + gles_includes += ''' +#endif +''' +endif + +# can we include both gles2 and opengl headers? +if gles2_dep.found() and gl_dep.found() + gl_include_block = gl_include_header + gles_includes + opengl_includes + if not cc.compiles('void f (void) {}', prefix : gl_include_block, dependencies : [gles2_dep, gl_dep] ) + message ('Cannot include both OpenGL and OpenGL ES headers') + if need_gles2 != 'yes' + gles2_dep = unneeded_dep + elif need_opengl != 'yes' + gl_dep = unneeded_dep + else + error('Both OpenGL and OpenGL ES were requested but cannot be included together') + endif + endif +endif +gl_include_block = gl_include_header +if gles2_dep.found() + gl_include_block += gles_includes +endif +if gl_dep.found() + gl_include_block += opengl_includes +endif + +if gles2_dep.found() + gl_lib_deps += gles2_dep + glconf.set10('GST_GL_HAVE_GLES2', 1) + if gles3_h + glconf.set10('GST_GL_HAVE_GLES3', 1) + endif + enabled_gl_apis += 'gles2' +endif + +if gl_dep.found() + gl_lib_deps += gl_dep + glconf.set10('GST_GL_HAVE_OPENGL', 1) + enabled_gl_apis += 'opengl' +endif + +# EGL checks +egl_dep = unneeded_dep +if need_platform_egl != 'no' + egl_dep = dependency('EGL', required : false) + if not egl_dep.found() + egl_dep = cc.find_library('EGL', required : false) + + if not egl_dep.found() and need_platform_egl == 'yes' + error ('Could not find requested EGL library') + endif + endif + + if egl_dep.found() + gl_sources += [ + 'egl/gsteglimage.c', + 'egl/gstglcontext_egl.c', + 'egl/gstgldisplay_egl.c', + 'egl/gstglmemoryegl.c', + ] + gl_egl_headers += [ + 'egl/gstegl.h', + 'egl/gsteglimage.h', + 'egl/gstglcontext_egl.h', + 'egl/gstgldisplay_egl.h', + 'egl/gstglmemoryegl.h', + ] + gl_platform_deps += egl_dep + glconf.set10('GST_GL_HAVE_PLATFORM_EGL', 1) + + if cc.has_header('libdrm/drm_fourcc.h', required : false) + gl_misc_deps += gstallocators_dep + glconf.set10('GST_GL_HAVE_DMABUF', 1) + endif + + egl_includes = ''' +#include +#include +''' + endif + + enabled_gl_platforms += 'egl' +endif + +# wayland checks +wayland_client_dep = unneeded_dep +wayland_cursor_dep = unneeded_dep +wayland_egl_dep = unneeded_dep +if need_win_wayland != 'no' + if need_win_wayland == 'yes' + if need_platform_egl == 'no' + error('Impossible situation requested: Cannot use Wayland without EGL support') + endif + endif + if not egl_dep.found() + if need_win_wayland == 'yes' + error ('Could not find EGL libraries for wayland') + else + message ('Could not find EGL libraries for wayland') + endif + else + wayland_client_dep = dependency('wayland-client', version : '>= 1.0', required : false) + wayland_cursor_dep = dependency('wayland-cursor', version : '>= 1.0', required : false) + wayland_egl_dep = dependency('wayland-egl', version : '>= 1.0', required : false) + + if wayland_client_dep.found() and wayland_cursor_dep.found() and wayland_egl_dep.found() + gl_sources += [ + 'wayland/gstgldisplay_wayland.c', + 'wayland/gstglwindow_wayland_egl.c', + 'wayland/wayland_event_source.c', + ] + glconf.set('GST_GL_HAVE_WINDOW_WAYLAND', 1) + gl_winsys_deps += [wayland_client_dep, wayland_cursor_dep, wayland_egl_dep] + enabled_gl_winsys += 'wayland' + else + if need_win_wayland == 'yes' + error ('Could not find requested Wayland libraries') + endif + wayland_client_dep = unneeded_dep + wayland_cursor_dep = unneeded_dep + wayland_egl_dep = unneeded_dep + endif + endif +endif + +# X11 checks +if need_platform_glx == 'yes' + if need_win_x11 == 'no' + error('Impossible situation requested: Cannot use GLX without X11 support') + elif need_api_opengl == 'no' + error('Impossible situation requested: Cannot use GLX without the OpenGL library') + endif +endif + +if need_win_x11 != 'no' + if x11_dep.found() + gl_sources += [ + 'x11/gstgldisplay_x11.c', + 'x11/gstglwindow_x11.c', + 'x11/x11_event_source.c', + ] + gl_x11_headers += [ + 'x11/gstgldisplay_x11.h', + ] + glconf.set('GST_GL_HAVE_WINDOW_X11', 1) + gl_winsys_deps += x11_dep + enabled_gl_winsys += 'x11' + + if need_platform_glx != 'no' + glconf.set('GST_GL_HAVE_PLATFORM_GLX', 1) + gl_sources += [ + 'x11/gstglcontext_glx.c', + ] + # GLX is in the opengl library on linux + gl_platform_deps += gl_dep + enabled_gl_platforms += 'glx' + endif + elif need_win_x11 == 'yes' + error ('Could not find requested X11 libraries') + endif +endif + +# win32 checks +if need_platform_wgl == 'yes' + if need_win_win32 == 'no' + error('Impossible situation requested: Cannot use WGL without the win32 window system') + endif +endif + +# XXX: untested +#if need_platform_wgl != 'no' and need_win_win32 != 'no' +# gdi_dep = cc.find_library('gdi32', required : false) +# +# if cc.has_header('GL/wglext.h') and gdi_dep.found() and gl_dep.found() +# gl_platform_deps += gdi_dep +# gl_sources += [ +# 'win32/gstglwindow_win32.c', +# 'win32/gstglwindow_win32.c', +# ] +# enabled_gl_winsys += 'win32' +# enabled_gl_platforms += 'wgl' +# endif +#endif + +if host_machine.system() == 'darwin' + # FIXME: how to know if we're on iOS or OS X? +# gl_cocoa_headers += [ +# 'gstglcontext_cocoa.h', +# 'gstglcaopengllayer.h', +# ] +endif + +# TODO: Add rest of gl config here. +# --with-{egl,gles2,opengl}-module-name +# rpi, arm-mali, iOS, OS X, win32 specific support + +build_gstgl = true +if gl_lib_deps.length() == 0 + message('No OpenGL API libraries found or requested') + build_gstgl = false +endif +if gl_platform_deps.length() == 0 + message('No OpenGL Platforms found or requested') + build_gstgl = false +endif +if gl_winsys_deps.length() == 0 + message('No OpenGL Window systems found or requested') + build_gstgl = false +endif + +if build_gstgl + # find some types that may or may not be defined + if cc.has_type('GLeglImageOES', prefix : gl_include_block, dependencies : gl_lib_deps) + glconf.set('GST_GL_HAVE_GLEGLIMAGEOES', 1) + endif + if cc.has_type('GLchar', prefix : gl_include_block, dependencies : gl_lib_deps) + glconf.set('GST_GL_HAVE_GLCHAR', 1) + endif + if cc.has_type('GLsizeiptr', prefix : gl_include_block, dependencies : gl_lib_deps) + glconf.set('GST_GL_HAVE_GLSIZEIPTR', 1) + endif + if cc.has_type('GLintptr', prefix : gl_include_block, dependencies : gl_lib_deps) + glconf.set('GST_GL_HAVE_GLINTPTR', 1) + endif + if cc.has_type('GLsync', prefix : gl_include_block, dependencies : gl_lib_deps) + glconf.set('GST_GL_HAVE_GLSYNC', 1) + endif + if cc.has_type('GLuint64', prefix : gl_include_block, dependencies : gl_lib_deps) + glconf.set('GST_GL_HAVE_GLUINT64', 1) + endif + if cc.has_type('GLint64', prefix : gl_include_block, dependencies : gl_lib_deps) + glconf.set('GST_GL_HAVE_GLINT64', 1) + endif + if egl_dep.found() and cc.has_type('EGLAttrib', prefix : gl_include_block + egl_includes, dependencies : gl_lib_deps + [egl_dep]) + glconf.set('GST_GL_HAVE_EGLATTRIB', 1) + endif + + message('Building libgstgl with GL api: ' + ' '.join(enabled_gl_apis)) + message('Building libgstgl with GL platform: ' + ' '.join(enabled_gl_platforms)) + message('Building libgstgl with GL winsys: ' + ' '.join(enabled_gl_winsys)) + + install_headers(gl_headers, subdir : 'gstreamer-1.0/gst/gl') + install_headers(gl_cocoa_headers, subdir : 'gstreamer-1.0/gst/gl/cocoa') + install_headers(gl_egl_headers, subdir : 'gstreamer-1.0/gst/gl/egl') + install_headers(gl_prototype_headers, subdir : 'gstreamer-1.0/gst/gl/glprototypes') + install_headers(gl_x11_headers, subdir : 'gstreamer-1.0/gst/gl/x11') + + configure_file(input : 'gstglconfig.h.meson', + output : 'gstglconfig.h', + install_dir : get_option('libdir') + '/gstreamer-1.0/include/gst/gl', + configuration : glconf) + + gstgl = library('gstgl-' + api_version, + gl_sources, + c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API'], + include_directories : [configinc, libsinc], + version : libversion, + soversion : soversion, + install : true, + dependencies : [gstbase_dep, gstvideo_dep, gmodule_dep, + gl_lib_deps, gl_platform_deps, gl_winsys_deps, gl_misc_deps], + # FIXME: This symbol list is generated on Linux, so this is wrong for Windows + vs_module_defs: vs_module_defs_dir + 'libgstgl.def', + ) + # TODO: generate gir + + gstgl_dep = declare_dependency(link_with : gstgl, + include_directories : [libsinc], + dependencies : [gstbase_dep, gstvideo_dep]) +endif diff --git a/gst-libs/gst/meson.build b/gst-libs/gst/meson.build index 89aa92f..d6c2bd6 100644 --- a/gst-libs/gst/meson.build +++ b/gst-libs/gst/meson.build @@ -14,8 +14,4 @@ subdir('video') # FIXME: port configure.ac logic #subdir('wayland') -# FIXME: broken and incomplete -#gl_dep = dependency('gl', required : false) -#if gl_dep.found() -# subdir('gl') -#endif +subdir('gl') diff --git a/meson_options.txt b/meson_options.txt index bf0a7ee..a52b475 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1 +1,4 @@ option('use_orc', type : 'combo', choices : ['yes', 'no', 'auto'], value : 'auto') +option('with_gl_api', type : 'string', value : 'auto', description : 'A comma separated list of opengl APIs to enable building against. Supported values are opengl and gles2.') +option('with_gl_platform', type : 'string', value : 'auto', description : 'A comma separated list of opengl platforms to enable building against. Supported values are glx, egl, cgl, wgl and eagl') +option('with_gl_winsys', type : 'string', value : 'auto', description : 'A comma separated list of opengl windows systems to enable building against. Supported values are x11, wayland, win32, cocoa, and dispmanx') diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build index 3356936..e430462 100644 --- a/pkgconfig/meson.build +++ b/pkgconfig/meson.build @@ -14,14 +14,17 @@ pkg_libs = [ 'bad-base', 'bad-video', 'codecparsers', - # Broken and not built currently - #'gl', 'insertbin', 'mpegts', 'player', 'plugins-bad', ] +# XXX: requires the meson.build to be parsed/executed after gst-libs/gl/meson.build +if build_gstgl + pkg_libs += 'gl' +endif + # FIXME: -uninstalled.pc files (if still needed?) foreach p : pkg_libs infile = 'gstreamer-@0@.pc.in'.format(p) -- 2.7.4