mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-06 15:38:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

deinterlace: Disable nasm support on x32

Browse source 
The assembly assumes pointers are 64-bit, so just disable it.

Closes https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/issues/757

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/660>
This commit is contained in:
Nirbheek Chauhan 2020-07-02 07:53:14 +05:30
parent 3fe4626e3c
commit c7f8c8d4ef
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst/deinterlace/meson.build
View file

@ -61,13 +61,9 @@ if have_nasm and host_cpu == 'x86_64'
asm_outformat = 'macho64' asm_outformat = 'macho64'
elif host_system.endswith('bsd') elif host_system.endswith('bsd')
asm_outformat = 'aoutb' asm_outformat = 'aoutb'
else
if cc.get_define('__ILP32__') == '1'
asm_outformat = 'elfx32'
else else
asm_outformat = 'elf64' asm_outformat = 'elf64'
endif endif
endif
asm_x = files('x86/yadif.asm', asm_x = files('x86/yadif.asm',
'x86/x86inc.asm') 'x86/x86inc.asm')

2
meson.build
View file

@ -341,6 +341,8 @@ host_cpu = host_machine.cpu_family()
if host_cpu == 'x86_64' if host_cpu == 'x86_64'
if cc.get_id() == 'msvc' if cc.get_id() == 'msvc'
message('Nasm disabled on MSVC') message('Nasm disabled on MSVC')
elif cc.get_define('__ILP32__') == '1'
message('Nasm disabled on x32')
else else
asm_option = get_option('asm') asm_option = get_option('asm')
nasm = find_program('nasm', native: true, required: asm_option) nasm = find_program('nasm', native: true, required: asm_option)