mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 14:26:43 +00:00
Code Issues 1 Projects Releases Wiki Activity

MSDK: Add gst d3d11 lib into MSDK's dependency

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3231>
This commit is contained in:
Tong Wu 2022-05-07 16:28:50 +08:00 committed by GStreamer Marge Bot
parent eb0f90f6ec
commit 11e13b189d
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
subprojects/gst-plugins-bad/sys/msdk/meson.build
View file

@ -31,6 +31,10 @@ use_msdk = false
use_onevpl = false use_onevpl = false
onevpl_extra_args = [] onevpl_extra_args = []
extra_args = [
'-DGST_USE_UNSTABLE_API',
]
msdk_option = get_option('msdk') msdk_option = get_option('msdk')
if msdk_option.disabled() if msdk_option.disabled()
subdir_done() subdir_done()
@ -38,6 +42,15 @@ endif
if host_machine.system() == 'windows' if host_machine.system() == 'windows'
msdk_sources += ['msdk_d3d.c', 'gstmsdkallocator_d3d.c' ] msdk_sources += ['msdk_d3d.c', 'gstmsdkallocator_d3d.c' ]
if gstd3d11_dep.found()
extra_args += ['-DCOBJMACROS']
else
if msdk_option.enabled()
error('The msdk plugin was enabled explicity, but required d3d11 dependencies were not found.')
endif
subdir_done()
endif
else else
if not gstva_dep.found() if not gstva_dep.found()
if msdk_option.enabled() if msdk_option.enabled()
@ -167,9 +180,8 @@ if host_machine.system() == 'windows'
error('msdk plugin can only be built with MSVC') error('msdk plugin can only be built with MSVC')
endif endif
legacy_stdio_dep = cc.find_library('legacy_stdio_definitions', required: get_option('msdk')) legacy_stdio_dep = cc.find_library('legacy_stdio_definitions', required: get_option('msdk'))
d3d11_dep = cc.find_library('d3d11', required: get_option('msdk')) msdk_deps = declare_dependency(dependencies: [gstd3d11_dep, legacy_stdio_dep])
msdk_deps = declare_dependency(dependencies: [d3d11_dep, legacy_stdio_dep]) msdk_deps_found = gstd3d11_dep.found() and legacy_stdio_dep.found() and cc.get_id() == 'msvc'
msdk_deps_found = d3d11_dep.found() and legacy_stdio_dep.found() and cc.get_id() == 'msvc'
else else
libdl_dep = cc.find_library('dl', required: get_option('msdk')) libdl_dep = cc.find_library('dl', required: get_option('msdk'))
libgudev_dep = dependency('gudev-1.0', required: get_option('msdk')) libgudev_dep = dependency('gudev-1.0', required: get_option('msdk'))
@ -189,7 +201,7 @@ if msdk_deps_found
gstmsdktag = library('gstmsdk', gstmsdktag = library('gstmsdk',
msdk_sources, msdk_sources,
c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API'] + onevpl_extra_args, c_args : gst_plugins_bad_args + extra_args + onevpl_extra_args,
include_directories : [configinc, mfx_inc], include_directories : [configinc, mfx_inc],
dependencies : [gstbase_dep, gstvideo_dep, gstpbutils_dep, gstallocators_dep, gstcodecparsers_dep, mfx_dep, msdk_deps], dependencies : [gstbase_dep, gstvideo_dep, gstpbutils_dep, gstallocators_dep, gstcodecparsers_dep, mfx_dep, msdk_deps],
install : true, install : true,