diff options
| author | U. Artie Eoff <ullysses.a.eoff@intel.com> | 2020-06-30 11:15:43 -0700 |
|---|---|---|
| committer | U. Artie Eoff <ullysses.a.eoff@intel.com> | 2021-09-15 10:04:14 -0700 |
| commit | 48474d3cf77f91702cc2219ea17ceed881c372ae (patch) | |
| tree | ec8d5cb27edf02bc74eadcfb82af8e70a4256696 | |
| parent | 162026961bff14dbf8198fb556b83a2f655f4c4b (diff) | |
| download | gstreamer-plugins-bad-48474d3cf77f91702cc2219ea17ceed881c372ae.tar.gz | |
tests: skip cc tests if plugin is disabled
Skip the closedcaption element tests if the
closedcaption option is disabled at compile
time (i.e. -Dclosedcaption=disabled).
v2: rename pangocairo_dep to avoid conflict
with later definition in ext/ttml/meson.build
as suggested by @tpm.
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1388>
| -rw-r--r-- | ext/closedcaption/meson.build | 6 | ||||
| -rw-r--r-- | tests/check/meson.build | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/ext/closedcaption/meson.build b/ext/closedcaption/meson.build index 9a4c7a0b2..cb0585f0e 100644 --- a/ext/closedcaption/meson.build +++ b/ext/closedcaption/meson.build @@ -1,4 +1,4 @@ -pangocairo_dep = dependency('pangocairo', version : '>= 1.22.0', +closedcaption_dep = dependency('pangocairo', version : '>= 1.22.0', required : get_option('closedcaption')) zvbi_sources = [ @@ -9,7 +9,7 @@ zvbi_sources = [ 'io-sim.c', ] -if pangocairo_dep.found() +if closedcaption_dep.found() gstclosedcaption = library('gstclosedcaption', 'gstcccombiner.c', 'gstccextractor.c', 'gstccconverter.c', 'gstclosedcaption.c', 'gstline21dec.c', 'gstcea708decoder.c', 'gstceaccoverlay.c', 'gstline21enc.c', @@ -17,7 +17,7 @@ if pangocairo_dep.found() c_args : gst_plugins_bad_args, link_args : noseh_link_args, include_directories : [configinc], - dependencies : [gstvideo_dep, gstbase_dep, gst_dep, pangocairo_dep, libm], + dependencies : [gstvideo_dep, gstbase_dep, gst_dep, closedcaption_dep, libm], install : true, install_dir : plugins_install_dir, ) diff --git a/tests/check/meson.build b/tests/check/meson.build index 195761b55..b13755aa2 100644 --- a/tests/check/meson.build +++ b/tests/check/meson.build @@ -29,9 +29,9 @@ base_tests = [ [['elements/autovideoconvert.c']], [['elements/avwait.c']], [['elements/camerabin.c']], - [['elements/ccconverter.c'], not pangocairo_dep.found(), [gstvideo_dep]], - [['elements/cccombiner.c'], not pangocairo_dep.found(), ], - [['elements/ccextractor.c'], not pangocairo_dep.found(), ], + [['elements/ccconverter.c'], not closedcaption_dep.found(), [gstvideo_dep]], + [['elements/cccombiner.c'], not closedcaption_dep.found(), ], + [['elements/ccextractor.c'], not closedcaption_dep.found(), ], [['elements/cudaconvert.c'], false, [gmodule_dep, gstgl_dep]], [['elements/cudafilter.c'], false, [gmodule_dep, gstgl_dep]], [['elements/d3d11colorconvert.c'], host_machine.system() != 'windows', ], @@ -44,7 +44,7 @@ base_tests = [ [['elements/id3mux.c']], [['elements/interlace.c']], [['elements/jpeg2000parse.c'], false, [libparser_dep, gstcodecparsers_dep]], - [['elements/line21.c'], not pangocairo_dep.found(), ], + [['elements/line21.c'], not closedcaption_dep.found(), ], [['elements/mfvideosrc.c'], host_machine.system() != 'windows', ], [['elements/mpegtsdemux.c'], false, [gstmpegts_dep]], [['elements/mpegtsmux.c'], false, [gstmpegts_dep]], |