From 57d61172c85d60be0a9d7d8e262f90fa461ec091 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Mon, 17 Aug 2020 18:51:17 +0100 Subject: [PATCH] docs: fix gst-docs build if opencv is not being built The disabler in opencv_dep (retrieved via libs_doc) will cause a meson interpreter error if opencv is not being built: ERROR: The += operator currently only works with arrays, dicts, strings or ints Part-of: --- docs/meson.build | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/meson.build b/docs/meson.build index 47d60ef..09ee135 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -113,7 +113,6 @@ if build_gir {'name': 'player', 'gir': player_gir, 'lib': gstplayer_dep}, {'name': 'insertbin', 'gir': insertbin_gir, 'lib': gstinsertbin_dep}, {'name': 'codecparsers', 'lib': gstcodecparsers_dep}, - {'name': 'opencv', 'lib': gstopencv_dep, 'c_source_patterns': ['*.h', '*.cpp'], 'extra_c_flags': ['-x c++']}, {'name': 'adaptivedemux', 'lib': gstadaptivedemux_dep}, {'name': 'basecamerabinsrc', 'gir': basecamerabin_gir, 'lib': gstbasecamerabin_dep}, {'name': 'webrtc', 'gir': webrtc_gir, 'lib': gstwebrtc_dep, 'suffix': 'lib'}, @@ -122,6 +121,12 @@ if build_gir {'name': 'codecs', 'gir': codecs_gir, 'lib': gstcodecs_dep}, ] + if gstopencv_dep.found() + libs += [ + {'name': 'opencv', 'lib': gstopencv_dep, 'c_source_patterns': ['*.h', '*.cpp'], 'extra_c_flags': ['-x c++']}, + ] + endif + if gstvulkan_dep.found() libs += [ {'name': 'vulkan', 'gir': vulkan_gir, 'lib': gstvulkan_dep, 'suffix': 'lib'}, -- 2.7.4