mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-23 10:11:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

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

Browse source 
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>
This commit is contained in:
Seungha Yang 2022-05-04 01:03:37 +09:00
parent fe4d6bb469
commit 1444dd91c5
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
subprojects/gst-plugins-bad/sys/nvcodec/meson.build
View file

@ -65,24 +65,25 @@ if host_system == 'linux'
endif endif
endif endif
override_opt = [] if cc.get_id() != 'msvc'
if host_system == 'windows' if host_system == 'windows'
# MinGW 32bits compiler seems to be complaining about redundant-decls # MinGW 32bits compiler seems to be complaining about redundant-decls
# when ComPtr is in use. Let's just disable the warning # when ComPtr is in use. Let's just disable the warning
if cc.get_id() != 'msvc'
extra_args += cc.get_supported_arguments([ extra_args += cc.get_supported_arguments([
'-Wno-redundant-decls', '-Wno-redundant-decls',
]) ])
endif 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 endif
gstnvcodec = library('gstnvcodec', gstnvcodec = library('gstnvcodec',
nvcodec_sources, nvcodec_sources,
c_args : gst_plugins_bad_args + extra_args, c_args : gst_plugins_bad_args + extra_args,
cpp_args : gst_plugins_bad_args + extra_args, cpp_args : gst_plugins_bad_args + extra_args,
override_options: override_opt,
include_directories : plugin_incdirs, include_directories : plugin_incdirs,
dependencies : [gstbase_dep, gstvideo_dep, gstpbutils_dep, gstgl_dep, gstglproto_dep, gmodule_dep, gstcodecs_dep, gstd3d11_dep, gstcuda_dep], dependencies : [gstbase_dep, gstvideo_dep, gstpbutils_dep, gstgl_dep, gstglproto_dep, gmodule_dep, gstcodecs_dep, gstd3d11_dep, gstcuda_dep],
install : true, install : true,