From 4de66632d79ef40cdc81701203c3e4c3cfb6371e Mon Sep 17 00:00:00 2001
From: Arun Raghavan <arun@osg.samsung.com>
Date: Mon, 3 Oct 2016 10:58:09 +0530
Subject: [PATCH] meson: Enable Orc in build

Top-level meson.build code updated from gst-plugins-good.
---
 gst-libs/gst/audio/meson.build | 2 +-
 gst-libs/gst/video/meson.build | 2 +-
 gst/adder/meson.build          | 2 +-
 gst/videotestsrc/meson.build   | 2 +-
 gst/volume/meson.build         | 2 +-
 meson.build                    | 8 ++++++--
 6 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/gst-libs/gst/audio/meson.build b/gst-libs/gst/audio/meson.build
index deb06c9..a2df57a 100644
--- a/gst-libs/gst/audio/meson.build
+++ b/gst-libs/gst/audio/meson.build
@@ -92,7 +92,7 @@ gstaudio = library('gstaudio-@0@'.format(api_version),
   version : libversion,
   soversion : soversion,
   install : true,
-  dependencies : [tag_dep, gst_base_dep, libm],
+  dependencies : [tag_dep, gst_base_dep, orc_dep, libm],
   vs_module_defs: vs_module_defs_dir + 'libgstaudio.def',
 )
 # TODO: generate gir
diff --git a/gst-libs/gst/video/meson.build b/gst-libs/gst/video/meson.build
index 5f1aa95..90e2e3e 100644
--- a/gst-libs/gst/video/meson.build
+++ b/gst-libs/gst/video/meson.build
@@ -123,7 +123,7 @@ gstvideo = library('gstvideo-@0@'.format(api_version),
   version : libversion,
   soversion : soversion,
   install : true,
-  dependencies : [gst_base_dep, libm],
+  dependencies : [gst_base_dep, orc_dep, libm],
   vs_module_defs: vs_module_defs_dir + 'libgstvideo.def',
 )
 # TODO: generate gir
diff --git a/gst/adder/meson.build b/gst/adder/meson.build
index dcd0c5f..53ec31d 100644
--- a/gst/adder/meson.build
+++ b/gst/adder/meson.build
@@ -21,7 +21,7 @@ adder = library('gstadder',
   'gstadder.c', orc_c, orc_h,
   c_args: gst_plugins_base_args,
   include_directories: [configinc, libsinc],
-  dependencies : [audio_dep],
+  dependencies : [audio_dep, orc_dep],
   install : true,
   install_dir : plugins_install_dir,
 )
diff --git a/gst/videotestsrc/meson.build b/gst/videotestsrc/meson.build
index d9fd400..65c36cd 100644
--- a/gst/videotestsrc/meson.build
+++ b/gst/videotestsrc/meson.build
@@ -21,7 +21,7 @@ gstvideotestsrc = library('gstvideotestsrc',
   'gstvideotestsrc.c', 'videotestsrc.c', orc_c, orc_h,
   c_args : gst_plugins_base_args,
   include_directories: [configinc, libsinc],
-  dependencies : glib_deps + [video_dep, gst_dep, gst_base_dep, libm],
+  dependencies : glib_deps + [video_dep, gst_dep, gst_base_dep, orc_dep, libm],
   install : true,
   install_dir : plugins_install_dir,
 )
diff --git a/gst/volume/meson.build b/gst/volume/meson.build
index e5bdd88..48ef7b3 100644
--- a/gst/volume/meson.build
+++ b/gst/volume/meson.build
@@ -20,7 +20,7 @@ endif
 gstvolume = library('gstvolume', 'gstvolume.c', orc_c, orc_h,
   c_args : gst_plugins_base_args,
   include_directories: [configinc, libsinc],
-  dependencies : glib_deps + [audio_dep, gst_dep, gst_base_dep],
+  dependencies : glib_deps + [audio_dep, gst_dep, gst_base_dep, orc_dep],
   install : true,
   install_dir : plugins_install_dir,
 )
diff --git a/meson.build b/meson.build
index d7d28f4..c47a8b4 100644
--- a/meson.build
+++ b/meson.build
@@ -97,7 +97,6 @@ core_conf.set('GST_API_VERSION', '"@0@"'.format(api_version))
 core_conf.set('GST_INSTALL_PLUGINS_HELPER', '"/FIXME"')
 core_conf.set('GST_DATADIR', '"/FIXME"')
 core_conf.set('GST_LICENSE', '"LGPL"')
-core_conf.set('DISABLE_ORC', 1)
 # FIXME: These should be configure options
 core_conf.set('DEFAULT_VIDEOSINK', '"autovideosink"')
 core_conf.set('DEFAULT_AUDIOSINK', '"autoaudiosink"')
@@ -162,13 +161,18 @@ orcc_args = []
 if get_option('use_orc') != 'no'
   need_orc = get_option('use_orc') == 'yes'
   # Used by various libraries/elements that use Orc code
+  orc_dep = dependency('orc-0.4', version : '>= 0.4.17', required : need_orc)
   orcc = find_program('orcc', required : need_orc)
-  if orcc.found()
+  if orc_dep.found() and orcc.found()
     have_orcc = true
     orcc_args = [orcc, '--include', 'glib.h']
+    core_conf.set('HAVE_ORC', 1)
   else
     message('Orc Compiler not found, will use backup C code')
+    core_conf.set('DISABLE_ORC', 1)
   endif
+else
+  core_conf.set('DISABLE_ORC', 1)
 endif
 
 subdir('gst-libs')
-- 
2.7.4