mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-30 05:31:15 +00:00
Code Issues 1 Projects Releases Wiki Activity

meson: Fix build when orc is disabled

Browse source 
Making sure not to use the orc_dep variable in case
orc has been explicitely disabled.
This commit is contained in:
Thibault Saunier 2016-11-14 16:28:42 -03:00
parent ff8d49a4c8
commit 5bdb38995f
5 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -67,8 +67,10 @@ gstaudio_c = custom_target('gstaudioenum_c',
command : [mkenums, glib_mkenums, '@OUTPUT@', '@INPUT@']) command : [mkenums, glib_mkenums, '@OUTPUT@', '@INPUT@'])
audio_gen_sources = [gstaudio_h] audio_gen_sources = [gstaudio_h]
gstaudio_deps = [tag_dep, gst_base_dep, libm]
orcsrc = 'gstaudiopack' orcsrc = 'gstaudiopack'
if have_orcc if have_orcc
gstaudio_deps += [orc_dep]
orc_h = custom_target(orcsrc + '.h', orc_h = custom_target(orcsrc + '.h',
input : orcsrc + '.orc', input : orcsrc + '.orc',
output : orcsrc + '.h', output : orcsrc + '.h',
@ -128,7 +130,6 @@ if have_sse41
simd_dependencies += audio_resampler_sse41 simd_dependencies += audio_resampler_sse41
endif endif
gstaudio_deps = [tag_dep, gst_base_dep, orc_dep, libm]
gstaudio = library('gstaudio-@0@'.format(api_version), gstaudio = library('gstaudio-@0@'.format(api_version),
audio_src, gstaudio_h, gstaudio_c, orc_c, orc_h, audio_src, gstaudio_h, gstaudio_c, orc_c, orc_h,
c_args : gst_plugins_base_args + simd_cargs, c_args : gst_plugins_base_args + simd_cargs,

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

@ -99,7 +99,9 @@ gstvideo_c = custom_target('gstvideoenum_c',
video_gen_sources = [gstvideo_h] video_gen_sources = [gstvideo_h]
orcsrc = 'video-orc' orcsrc = 'video-orc'
gstvideo_deps = [gst_base_dep, libm]
if have_orcc if have_orcc
gstvideo_deps += [orc_dep]
orc_h = custom_target(orcsrc + '.h', orc_h = custom_target(orcsrc + '.h',
input : orcsrc + '.orc', input : orcsrc + '.orc',
output : orcsrc + '.h', output : orcsrc + '.h',
@ -117,7 +119,6 @@ else
configuration : configuration_data()) configuration : configuration_data())
endif endif
gstvideo_deps = [gst_base_dep, orc_dep, libm]
gstvideo = library('gstvideo-@0@'.format(api_version), gstvideo = library('gstvideo-@0@'.format(api_version),
video_sources, gstvideo_h, gstvideo_c, orc_c, orc_h, video_sources, gstvideo_h, gstvideo_c, orc_c, orc_h,
c_args : gst_plugins_base_args, c_args : gst_plugins_base_args,

4
gst/adder/meson.build
View file

@ -1,5 +1,7 @@
adder_deps = [audio_dep]
orcsrc = 'gstadderorc' orcsrc = 'gstadderorc'
if have_orcc if have_orcc
adder_deps += [orc_dep]
orc_h = custom_target(orcsrc + '.h', orc_h = custom_target(orcsrc + '.h',
input : orcsrc + '.orc', input : orcsrc + '.orc',
output : orcsrc + '.h', output : orcsrc + '.h',
@ -21,7 +23,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, orc_dep], dependencies : adder_deps,
install : true, install : true,
install_dir : plugins_install_dir, install_dir : plugins_install_dir,
) )

4
gst/videotestsrc/meson.build
View file

@ -1,5 +1,7 @@
videotestsrc_deps = glib_deps + [video_dep, gst_dep, gst_base_dep, libm]
orcsrc = 'gstvideotestsrcorc' orcsrc = 'gstvideotestsrcorc'
if have_orcc if have_orcc
videotestsrc_deps += [orc_dep]
orc_h = custom_target(orcsrc + '.h', orc_h = custom_target(orcsrc + '.h',
input : orcsrc + '.orc', input : orcsrc + '.orc',
output : orcsrc + '.h', output : orcsrc + '.h',
@ -21,7 +23,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, orc_dep, libm], dependencies : videotestsrc_deps,
install : true, install : true,
install_dir : plugins_install_dir, install_dir : plugins_install_dir,
) )

4
gst/volume/meson.build
View file

@ -1,5 +1,7 @@
volume_deps = glib_deps + [audio_dep, gst_dep, gst_base_dep]
orcsrc = 'gstvolumeorc' orcsrc = 'gstvolumeorc'
if have_orcc if have_orcc
volume_deps += [orc_dep]
orc_h = custom_target(orcsrc + '.h', orc_h = custom_target(orcsrc + '.h',
input : orcsrc + '.orc', input : orcsrc + '.orc',
output : orcsrc + '.h', output : orcsrc + '.h',
@ -20,7 +22,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, orc_dep], dependencies : volume_deps,
install : true, install : true,
install_dir : plugins_install_dir, install_dir : plugins_install_dir,
) )