From 0b03893c81430b185d8da14c31cc28ef89a555c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Cerveau?= Date: Tue, 29 Mar 2022 17:51:13 +0200 Subject: [PATCH] base:gl: add x11 deps to gstglx11_dep 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: --- .../gst-plugins-base/gst-libs/gst/gl/meson.build | 16 ++++++++-------- .../tests/check/libs/gstglmatrix.c | 2 +- .../gst-plugins-base/tests/check/meson.build | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/subprojects/gst-plugins-base/gst-libs/gst/gl/meson.build b/subprojects/gst-plugins-base/gst-libs/gst/gl/meson.build index c9075d1773..e645223e4f 100644 --- a/subprojects/gst-plugins-base/gst-libs/gst/gl/meson.build +++ b/subprojects/gst-plugins-base/gst-libs/gst/gl/meson.build @@ -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() message('GStreamer OpenGL integration disabled via options.') - gstgl_dep = dependency('', required: false) build_gstgl = false subdir_done() endif @@ -650,6 +655,7 @@ if need_platform_glx == 'yes' endif endif +xcb_dep = unneeded_dep if need_win_x11 != 'no' xcb_dep = dependency('x11-xcb', required : false) if x11_dep.found() and xcb_dep.found() @@ -966,12 +972,6 @@ if enabled_gl_winsys.length() == 0 build_gstgl = false 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 # 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) @@ -1143,7 +1143,7 @@ if build_gstgl gl_x11_gir = gnome.generate_gir(gstgl, kwargs: gir) endif endif - gstglx11_dep = declare_dependency(dependencies : [gstgl_dep], + gstglx11_dep = declare_dependency(dependencies : [gstgl_dep, x11_dep, xcb_dep], sources : gl_x11_gir) meson.override_dependency('gstreamer-gl-x11-1.0', gstglx11_dep) endif diff --git a/subprojects/gst-plugins-base/tests/check/libs/gstglmatrix.c b/subprojects/gst-plugins-base/tests/check/libs/gstglmatrix.c index 04ddd4eae3..aff8d78805 100644 --- a/subprojects/gst-plugins-base/tests/check/libs/gstglmatrix.c +++ b/subprojects/gst-plugins-base/tests/check/libs/gstglmatrix.c @@ -22,7 +22,7 @@ # include "config.h" #endif -#include +#include #undef GST_CAT_DEFAULT #include diff --git a/subprojects/gst-plugins-base/tests/check/meson.build b/subprojects/gst-plugins-base/tests/check/meson.build index f135c1ffb9..17f3588bd6 100644 --- a/subprojects/gst-plugins-base/tests/check/meson.build +++ b/subprojects/gst-plugins-base/tests/check/meson.build @@ -11,7 +11,7 @@ base_tests = [ [ 'libs/baseaudiovisualizer.c' ], [ 'libs/discoverer.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/navigation.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/gstglfeature.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/gstglmatrix.c', not build_gstgl, [gstgl_dep, gstglproto_dep]], + [ 'libs/gstglheaders.c', not build_gstgl, [gstgl_dep, gstglx11_dep, gstglwayland_dep, gstglegl_dep]], + [ 'libs/gstglmatrix.c', not build_gstgl, [gstgl_dep]], [ 'libs/gstglmemory.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]],