mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 14:56:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

meson: Enable Orc in build

Browse source 
Top-level meson.build code updated from gst-plugins-good.
This commit is contained in:
Arun Raghavan 2016-10-03 10:58:09 +05:30 committed by Arun Raghavan
parent d00aa0c1ad
commit 4de66632d7
6 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst-libs/gst/audio/meson.build
View file

@ -92,7 +92,7 @@ gstaudio = library('gstaudio-@0@'.format(api_version),
version : libversion, version : libversion,
soversion : soversion, soversion : soversion,
install : true, 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', vs_module_defs: vs_module_defs_dir + 'libgstaudio.def',
) )
# TODO: generate gir # TODO: generate gir

2
gst-libs/gst/video/meson.build
View file

@ -123,7 +123,7 @@ gstvideo = library('gstvideo-@0@'.format(api_version),
version : libversion, version : libversion,
soversion : soversion, soversion : soversion,
install : true, install : true,
dependencies : [gst_base_dep, libm], dependencies : [gst_base_dep, orc_dep, libm],
vs_module_defs: vs_module_defs_dir + 'libgstvideo.def', vs_module_defs: vs_module_defs_dir + 'libgstvideo.def',
) )
# TODO: generate gir # TODO: generate gir

2
gst/adder/meson.build
View file

@ -21,7 +21,7 @@ adder = library('gstadder',
'gstadder.c', orc_c, orc_h, 'gstadder.c', orc_c, orc_h,
c_args: gst_plugins_base_args, c_args: gst_plugins_base_args,
include_directories: [configinc, libsinc], include_directories: [configinc, libsinc],
dependencies : [audio_dep], dependencies : [audio_dep, orc_dep],
install : true, install : true,
install_dir : plugins_install_dir, install_dir : plugins_install_dir,
) )

2
gst/videotestsrc/meson.build
View file

@ -21,7 +21,7 @@ gstvideotestsrc = library('gstvideotestsrc',
'gstvideotestsrc.c', 'videotestsrc.c', orc_c, orc_h, 'gstvideotestsrc.c', 'videotestsrc.c', orc_c, orc_h,
c_args : gst_plugins_base_args, c_args : gst_plugins_base_args,
include_directories: [configinc, libsinc], 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 : true,
install_dir : plugins_install_dir, install_dir : plugins_install_dir,
) )

2
gst/volume/meson.build
View file

@ -20,7 +20,7 @@ endif
gstvolume = library('gstvolume', 'gstvolume.c', orc_c, orc_h, gstvolume = library('gstvolume', 'gstvolume.c', orc_c, orc_h,
c_args : gst_plugins_base_args, c_args : gst_plugins_base_args,
include_directories: [configinc, libsinc], 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 : true,
install_dir : plugins_install_dir, install_dir : plugins_install_dir,
) )

8
meson.build
View file

@ -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_INSTALL_PLUGINS_HELPER', '"/FIXME"')
core_conf.set('GST_DATADIR', '"/FIXME"') core_conf.set('GST_DATADIR', '"/FIXME"')
core_conf.set('GST_LICENSE', '"LGPL"') core_conf.set('GST_LICENSE', '"LGPL"')
core_conf.set('DISABLE_ORC', 1)
# FIXME: These should be configure options # FIXME: These should be configure options
core_conf.set('DEFAULT_VIDEOSINK', '"autovideosink"') core_conf.set('DEFAULT_VIDEOSINK', '"autovideosink"')
core_conf.set('DEFAULT_AUDIOSINK', '"autoaudiosink"') core_conf.set('DEFAULT_AUDIOSINK', '"autoaudiosink"')
@ -162,13 +161,18 @@ orcc_args = []
if get_option('use_orc') != 'no' if get_option('use_orc') != 'no'
need_orc = get_option('use_orc') == 'yes' need_orc = get_option('use_orc') == 'yes'
# Used by various libraries/elements that use Orc code # 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) orcc = find_program('orcc', required : need_orc)
if orcc.found() if orc_dep.found() and orcc.found()
have_orcc = true have_orcc = true
orcc_args = [orcc, '--include', 'glib.h'] orcc_args = [orcc, '--include', 'glib.h']
core_conf.set('HAVE_ORC', 1)
else else
message('Orc Compiler not found, will use backup C code') message('Orc Compiler not found, will use backup C code')
core_conf.set('DISABLE_ORC', 1)
endif endif
else
core_conf.set('DISABLE_ORC', 1)
endif endif
subdir('gst-libs') subdir('gst-libs')