summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordan Petridis <jordan@centricular.com>2020-08-05 12:35:12 +0300
committerGStreamer Merge Bot <gitlab-merge-bot@gstreamer-foundation.org>2020-08-05 12:17:06 +0000
commitcee211123a63c54dd2a72a4898a33ac5421d95da (patch)
tree0ee6be1ec87ff24c76fce5fba2e5bc62598256f4
parentb542b1c257a6e2d5b1631fb172002bad9d8cfed4 (diff)
opencv: compile with -Wno-format-nonliteral
opencv plugin is pulling a header which makses clang++ 10 complain a lot and blocks -werror. ``` /usr/include/opencv4/opencv2/flann/logger.h:83:36: error: format string is not a string literal [-Werror,-Wformat-nonliteral] int ret = vfprintf(stream, fmt, arglist); ^~~ ``` Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1494>
-rw-r--r--ext/opencv/meson.build4
-rw-r--r--gst-libs/gst/opencv/meson.build4
2 files changed, 6 insertions, 2 deletions
diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build
index 730a1345f..0b0b3fcf1 100644
--- a/ext/opencv/meson.build
+++ b/ext/opencv/meson.build
@@ -105,7 +105,9 @@ endif
if opencv_found
# opencv4 seems to ship with .pc file that references non-existent include dir
# (/usr/include/opencv4/opencv instead of /usr/include/opencv4/opencv2)
- gstopencv_cargs += cxx.get_supported_arguments(['-Wno-missing-include-dirs'])
+ # clang 10 complains about the following header in opencv4
+ # /usr/include/opencv4/opencv2/flann/logger.h:83:36: error: format string is not a string literal [-Werror,-Wformat-nonliteral]
+ gstopencv_cargs += cxx.get_supported_arguments(['-Wno-missing-include-dirs', '-Wno-format-nonliteral'])
gstopencv = library('gstopencv',
gstopencv_sources,
diff --git a/gst-libs/gst/opencv/meson.build b/gst-libs/gst/opencv/meson.build
index 522f7e5cc..6cc4602f3 100644
--- a/gst-libs/gst/opencv/meson.build
+++ b/gst-libs/gst/opencv/meson.build
@@ -16,7 +16,9 @@ endif
if opencv_dep.found()
# opencv4 seems to ship with .pc file that references non-existent include dir
# (/usr/include/opencv4/opencv instead of /usr/include/opencv4/opencv2)
- gstopencv_cargs = cxx.get_supported_arguments(['-Wno-missing-include-dirs'])
+ # clang 10 complains about the following header in opencv4
+ # /usr/include/opencv4/opencv2/flann/logger.h:83:36: error: format string is not a string literal [-Werror,-Wformat-nonliteral]
+ gstopencv_cargs = cxx.get_supported_arguments(['-Wno-missing-include-dirs', '-Wno-format-nonliteral'])
gstopencv = library('gstopencv-' + api_version,
opencv_sources,