mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-04 09:42:19 +00:00
Code Issues 1 Projects Releases Wiki Activity

base:gl: add x11 deps to gstglx11_dep

Browse source 
On MacOS with homebrew the xlib-xcb.h is in
own cellar /opt/homebrew/Cellar/libx11/1.7.3.1/include
Need to add the windowing dependencies to gl tests

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2426>
This commit is contained in:
Stéphane Cerveau 2022-03-29 17:51:13 +02:00 committed by Tim-Philipp Müller
parent 7e441d6245
commit 0b03893c81
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
subprojects/gst-plugins-base/gst-libs/gst/gl/meson.build
View file

@ -1,6 +1,11 @@
gstgl_dep = dependency('', required : false)
gstglproto_dep = dependency('', required : false)
gstglx11_dep = dependency('', required : false)
gstglwayland_dep = dependency('', required : false)
gstglegl_dep = dependency('', required : false)
if get_option('gl').disabled() if get_option('gl').disabled()
message('GStreamer OpenGL integration disabled via options.') message('GStreamer OpenGL integration disabled via options.')
gstgl_dep = dependency('', required: false)
build_gstgl = false build_gstgl = false
subdir_done() subdir_done()
endif endif
@ -650,6 +655,7 @@ if need_platform_glx == 'yes'
endif endif
endif endif
xcb_dep = unneeded_dep
if need_win_x11 != 'no' if need_win_x11 != 'no'
xcb_dep = dependency('x11-xcb', required : false) xcb_dep = dependency('x11-xcb', required : false)
if x11_dep.found() and xcb_dep.found() if x11_dep.found() and xcb_dep.found()
@ -966,12 +972,6 @@ if enabled_gl_winsys.length() == 0
build_gstgl = false build_gstgl = false
endif endif
gstgl_dep = dependency('', required : false)
gstglproto_dep = dependency('', required : false)
gstglx11_dep = dependency('', required : false)
gstglwayland_dep = dependency('', required : false)
gstglegl_dep = dependency('', required : false)
if build_gstgl if build_gstgl
# find some types that may or may not be defined # find some types that may or may not be defined
if cc.has_type('GLeglImageOES', prefix : gl_include_block, dependencies : gl_lib_deps, include_directories : gl_includes) if cc.has_type('GLeglImageOES', prefix : gl_include_block, dependencies : gl_lib_deps, include_directories : gl_includes)
@ -1143,7 +1143,7 @@ if build_gstgl
gl_x11_gir = gnome.generate_gir(gstgl, kwargs: gir) gl_x11_gir = gnome.generate_gir(gstgl, kwargs: gir)
endif endif
endif endif
gstglx11_dep = declare_dependency(dependencies : [gstgl_dep], gstglx11_dep = declare_dependency(dependencies : [gstgl_dep, x11_dep, xcb_dep],
sources : gl_x11_gir) sources : gl_x11_gir)
meson.override_dependency('gstreamer-gl-x11-1.0', gstglx11_dep) meson.override_dependency('gstreamer-gl-x11-1.0', gstglx11_dep)
endif endif

2
subprojects/gst-plugins-base/tests/check/libs/gstglmatrix.c
View file

@ -22,7 +22,7 @@
# include "config.h" # include "config.h"
#endif #endif
#include <gst/gl/gstglutils.c> #include <gst/gl/gl.h>
#undef GST_CAT_DEFAULT #undef GST_CAT_DEFAULT
#include <gst/check/gstcheck.h> #include <gst/check/gstcheck.h>

6
subprojects/gst-plugins-base/tests/check/meson.build
View file

@ -11,7 +11,7 @@ base_tests = [
[ 'libs/baseaudiovisualizer.c' ], [ 'libs/baseaudiovisualizer.c' ],
[ 'libs/discoverer.c' ], [ 'libs/discoverer.c' ],
[ 'libs/fft.c' ], [ 'libs/fft.c' ],
[ 'libs/libsabi.c', false, [ gstgl_dep ] ], [ 'libs/libsabi.c', false, [ gstgl_dep, gstglx11_dep, gstglwayland_dep, gstglegl_dep ] ],
[ 'libs/mikey.c' ], [ 'libs/mikey.c' ],
[ 'libs/navigation.c' ], [ 'libs/navigation.c' ],
[ 'libs/pbutils.c' ], [ 'libs/pbutils.c' ],
@ -92,8 +92,8 @@ if build_gstgl and host_machine.system() != 'windows'
[ 'libs/gstglcontext.c', not build_gstgl, [gstgl_dep, gstglproto_dep]], [ 'libs/gstglcontext.c', not build_gstgl, [gstgl_dep, gstglproto_dep]],
[ 'libs/gstglfeature.c', not build_gstgl, [gstgl_dep, gstglproto_dep]], [ 'libs/gstglfeature.c', not build_gstgl, [gstgl_dep, gstglproto_dep]],
[ 'libs/gstglformat.c', not build_gstgl, [gstgl_dep, gstglproto_dep]], [ 'libs/gstglformat.c', not build_gstgl, [gstgl_dep, gstglproto_dep]],
[ 'libs/gstglheaders.c', not build_gstgl, [gstgl_dep]], [ 'libs/gstglheaders.c', not build_gstgl, [gstgl_dep, gstglx11_dep, gstglwayland_dep, gstglegl_dep]],
[ 'libs/gstglmatrix.c', not build_gstgl, [gstgl_dep, gstglproto_dep]], [ 'libs/gstglmatrix.c', not build_gstgl, [gstgl_dep]],
[ 'libs/gstglmemory.c', not build_gstgl, [gstgl_dep, gstglproto_dep]], [ 'libs/gstglmemory.c', not build_gstgl, [gstgl_dep, gstglproto_dep]],
[ 'libs/gstglquery.c', not build_gstgl, [gstgl_dep, gstglproto_dep]], [ 'libs/gstglquery.c', not build_gstgl, [gstgl_dep, gstglproto_dep]],
[ 'libs/gstglshader.c', not build_gstgl, [gstgl_dep, gstglproto_dep]], [ 'libs/gstglshader.c', not build_gstgl, [gstgl_dep, gstglproto_dep]],