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

deinterlace: Enable x86 assembly with nasm on MSVC

Browse source 
We need to remove x86inc.asm from the list of compiled assembly files
because it is not supposed to be compiled separately. It is directly
included by yadif.asm, and it exports no symbols.

The object file was getting ignored on all platforms except on msvc
where it was causing a linker hang when building with debugging
enabled because the object file had no debug symbols (or similar).
We've seen this before in FFmpeg too, which uses nasm:
https://gitlab.freedesktop.org/gstreamer/meson-ports/ffmpeg/-/merge_requests/46

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/825>
This commit is contained in:
Nirbheek Chauhan 2020-11-24 22:11:50 +05:30
parent 9d14ae4740
commit 552da8569b
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gst/deinterlace/meson.build
View file

@ -65,8 +65,7 @@ if have_nasm and host_cpu == 'x86_64'
else
asm_outformat = 'elf64'
endif
asm_x = files('x86/yadif.asm',
'x86/x86inc.asm')
asm_x = files('x86/yadif.asm')
asm_stackalign_def = '-DSTACK_ALIGNMENT=64'
asm_incdir = 'x86'

4
meson.build
View file

@ -373,9 +373,7 @@ have_nasm = false
# FIXME: nasm path needs testing on non-Linux, esp. Windows
host_cpu = host_machine.cpu_family()
if host_cpu == 'x86_64'
if cc.get_id() == 'msvc'
message('Nasm disabled on MSVC')
elif cc.get_define('__ILP32__') == '1'
if cc.get_define('__ILP32__') == '1'
message('Nasm disabled on x32')
else
asm_option = get_option('asm')