Merge "subparse: Remove gst_event_unref when not support byte seek" into tizen

[platform/upstream/gst-plugins-base.git] / meson.build

diff --git a/meson.build b/meson.build
index 3a5cc36..767f98f 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('gst-plugins-base', 'c',
-  version : '1.15.2.1',
+  version : '1.16.2',
   meson_version : '>= 0.47',
   default_options : [ 'warning_level=1',
                       'buildtype=debugoptimized' ])
@@ -250,8 +250,11 @@ glib_deps = [dependency('glib-2.0', version : glib_req, fallback: ['glib', 'libg
              dependency('gobject-2.0', fallback: ['glib', 'libgobject_dep'])]
 # GIO is used by the GIO plugin, and by the TCP, SDP, and RTSP plugins
 gio_dep = dependency('gio-2.0', fallback: ['glib', 'libgio_dep'])
-giounix_dep = dependency('gio-unix-2.0', version : glib_req, required : host_system != 'windows',
-                         fallback: ['glib', 'libgiounix_dep'])
+giounix_dep = dependency('', required: false)
+if host_system != 'windows'
+  giounix_dep = dependency('gio-unix-2.0', version : glib_req,
+                           fallback: ['glib', 'libgiounix_dep'])
+endif
 gmodule_dep = dependency('gmodule-no-export-2.0',
                          fallback: ['glib', 'libgmodule_dep'])
 
@@ -330,6 +333,18 @@ have_sse = cc.has_argument(sse_args)
 have_sse2 = cc.has_argument(sse2_args)
 have_sse41 = cc.has_argument(sse41_args)
 
+if host_machine.cpu_family() == 'arm'
+  if cc.compiles('''
+#include <arm_neon.h>
+int32x4_t testfunc(int16_t *a, int16_t *b) {
+  asm volatile ("vmull.s16 q0, d0, d0" : : : "q0");
+  return vmull_s16(vld1_s16(a), vld1_s16(b));
+}
+''', name : 'NEON support')
+    core_conf.set('HAVE_ARM_NEON', true)
+  endif
+endif
+
 if gst_dep.type_name() == 'internal'
     gst_proj = subproject('gstreamer')