deinterlace: Disable nasm support on x32

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>

diff --git a/gst/deinterlace/meson.build b/gst/deinterlace/meson.build
index 5557e3d..7ba4e2a 100644 (file)
--- a/gst/deinterlace/meson.build
+++ b/gst/deinterlace/meson.build
@@ -62,11 +62,7 @@ if have_nasm and host_cpu == 'x86_64'
   elif host_system.endswith('bsd')
     asm_outformat = 'aoutb'
   else
-    if cc.get_define('__ILP32__') == '1'
-      asm_outformat = 'elfx32'
-    else
-      asm_outformat = 'elf64'
-    endif
+    asm_outformat = 'elf64'
   endif
   asm_x = files('x86/yadif.asm',
                 'x86/x86inc.asm')

diff --git a/meson.build b/meson.build
index 8822de5..509fb8c 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -341,6 +341,8 @@ 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'
+    message('Nasm disabled on x32')
   else
     asm_option = get_option('asm')
     nasm = find_program('nasm', native: true, required: asm_option)