From b2d22c0f00e671e3d12795e4f52f710f50c84b5b Mon Sep 17 00:00:00 2001
From: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Sat, 30 Jul 2022 02:29:49 +0530
Subject: [PATCH] meson: Don't pass -Werror to vendored code
Do it the correct way with libusrsctp -- override the option so that
it's done in a compiler-agnostic and future-proof way.
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2494>
---
subprojects/gst-plugins-bad/ext/sctp/usrsctp/meson.build | 2 +-
subprojects/gst-plugins-bad/sys/qsv/libmfx/meson.build | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/subprojects/gst-plugins-bad/ext/sctp/usrsctp/meson.build b/subprojects/gst-plugins-bad/ext/sctp/usrsctp/meson.build
index 0869dd59fd..6a1ab845da 100644
--- a/subprojects/gst-plugins-bad/ext/sctp/usrsctp/meson.build
+++ b/subprojects/gst-plugins-bad/ext/sctp/usrsctp/meson.build
@@ -31,7 +31,6 @@ else
'-Wno-missing-declarations',
'-Wno-old-style-definition',
'-Wno-redundant-decls',
- '-Wno-error',
])
endif
@@ -169,6 +168,7 @@ usrsctp_static = static_library('usrsctp-static', sources,
c_args: compile_args,
dependencies: dependencies,
include_directories: include_dirs,
+ override_options: ['werror=false'],
install: false)
# Declare dependency
diff --git a/subprojects/gst-plugins-bad/sys/qsv/libmfx/meson.build b/subprojects/gst-plugins-bad/sys/qsv/libmfx/meson.build
index fcb11f3bf8..1b54be6cdb 100644
--- a/subprojects/gst-plugins-bad/sys/qsv/libmfx/meson.build
+++ b/subprojects/gst-plugins-bad/sys/qsv/libmfx/meson.build
@@ -81,7 +81,8 @@ libmfx_static = static_library('libmfx-static',
c_args : libmfx_extra_args,
cpp_args : libmfx_extra_args,
dependencies : libmfx_extra_deps,
- include_directories : libmfx_incl
+ include_directories : libmfx_incl,
+ override_options: ['werror=false'],
)
libmfx_internal_dep = declare_dependency(