deinterlace: Fix build on x32
authorNirbheek Chauhan <nirbheek@centricular.com>
Wed, 1 Jul 2020 12:49:09 +0000 (18:19 +0530)
committerGStreamer Merge Bot <gitlab-merge-bot@gstreamer-foundation.org>
Wed, 1 Jul 2020 19:43:41 +0000 (19:43 +0000)
Need to pass `-f elfx32` to nasm in that case.

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

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/657>

gst/deinterlace/meson.build

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