From: Seungha Yang <seungha@centricular.com>
Date: Tue, 3 May 2022 16:03:37 +0000 (+0900)
Subject: meson: nvcodec: Remove unnecessary override option and fix build with non-MSVC
X-Git-Tag: 1.22.0~1686
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1444dd91c5bf3de24fd80a4fef861bb6b053e4b6;p=platform%2Fupstream%2Fgstreamer.git

meson: nvcodec: Remove unnecessary override option and fix build with non-MSVC

cpp_std=c++11 was hack for macOS build but we don't build this plugin
for Apple device anymore. And add "-Wno-deprecated-declarations"
compile option for gcc/clang

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1453>
---

diff --git a/subprojects/gst-plugins-bad/sys/nvcodec/meson.build b/subprojects/gst-plugins-bad/sys/nvcodec/meson.build
index 35d5f18..939c376 100644
--- a/subprojects/gst-plugins-bad/sys/nvcodec/meson.build
+++ b/subprojects/gst-plugins-bad/sys/nvcodec/meson.build
@@ -65,24 +65,25 @@ if host_system == 'linux'
   endif
 endif
 
-override_opt = []
-if host_system == 'windows'
-  # MinGW 32bits compiler seems to be complaining about redundant-decls
-  # when ComPtr is in use. Let's just disable the warning
-  if cc.get_id() != 'msvc'
+if cc.get_id() != 'msvc'
+  if host_system == 'windows'
+    # MinGW 32bits compiler seems to be complaining about redundant-decls
+    # when ComPtr is in use. Let's just disable the warning
     extra_args += cc.get_supported_arguments([
       '-Wno-redundant-decls',
     ])
   endif
-else
-  override_opt += ['cpp_std=c++11']
+
+  # Allow deprecated decls since it's part of SDK header
+  extra_args += cc.get_supported_arguments([
+    '-Wno-deprecated-declarations',
+  ])
 endif
 
 gstnvcodec = library('gstnvcodec',
   nvcodec_sources,
   c_args : gst_plugins_bad_args + extra_args,
   cpp_args : gst_plugins_bad_args + extra_args,
-  override_options: override_opt,
   include_directories : plugin_incdirs,
   dependencies : [gstbase_dep, gstvideo_dep, gstpbutils_dep, gstgl_dep, gstglproto_dep, gmodule_dep, gstcodecs_dep, gstd3d11_dep, gstcuda_dep],
   install : true,