mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-06-26 09:50:39 +00:00
Code Issues 1 Projects Releases Wiki Activity

cuda: Link libatomic if needed

Browse source 
Looks like C++ does not pull it automatically

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3997>
This commit is contained in:
Seungha Yang 2023-02-19 20:51:37 +09:00 committed by GStreamer Marge Bot
parent 2beda0fcaf
commit 319f5f0760
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
subprojects/gst-plugins-bad/gst-libs/gst/cuda/meson.build
View file

@ -26,10 +26,21 @@ gstcuda_stub_dep = declare_dependency(
include_directories: cuda_stubinc
)
gstcuda_platform_dep = []
if host_system not in ['windows', 'linux']
subdir_done()
endif
# Linux ARM would need -latomic for std::atomic<int64_t>
if host_system == 'linux' and host_machine.cpu_family() not in ['x86', 'x86_64']
libatomic_dep = cxx.find_library('atomic', required: false)
if not libatomic_dep.found()
subdir_done()
endif
gstcuda_platform_dep += [libatomic_dep]
endif
cuda_win32_headers = [
'initguid.h',
'd3d11.h',
@ -72,7 +83,7 @@ gstcuda= library('gstcuda-' + api_version,
version : libversion,
soversion : soversion,
install : true,
dependencies : [gstbase_dep, gmodule_dep, gstvideo_dep, gstglproto_dep, gstd3d11_dep]
dependencies : [gstbase_dep, gmodule_dep, gstvideo_dep, gstglproto_dep, gstd3d11_dep, gstcuda_platform_dep]
)
gen_sources = []
@ -118,7 +129,7 @@ endif
gst_libraries += [[pkg_name, library_def]]
pkgconfig.generate(gstcuda,
libraries : [gstbase_dep, gmodule_dep, gstvideo_dep, gstglproto_dep],
libraries : [gstbase_dep, gmodule_dep, gstvideo_dep, gstglproto_dep, gstcuda_platform_dep],
variables : pkgconfig_variables,
subdirs : pkgconfig_subdirs,
name : pkg_name,
@ -128,7 +139,7 @@ pkgconfig.generate(gstcuda,
install_headers(cuda_headers + ['cuda-gst.h', 'gstcuda.h'], subdir : 'gstreamer-1.0/gst/cuda')
gstcuda_dep = declare_dependency(link_with : gstcuda,
include_directories : [libsinc],
dependencies : [gstbase_dep, gmodule_dep, gstvideo_dep, gstglproto_dep],
dependencies : [gstbase_dep, gmodule_dep, gstvideo_dep, gstglproto_dep, gstcuda_platform_dep],
sources: gen_sources)
meson.override_dependency(pkg_name, gstcuda_dep)