mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-01 22:58:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

pipewire: add enable/disable to meson for spa plugins

Browse source
This commit is contained in:
Tapasweni Pathak 2018-10-09 13:57:59 +05:30 • committed by Wim Taymans
parent 805240258b
commit 8d71d2dab8
11 changed files with 134 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

12
spa/meson.build
View file

@ -1,18 +1,18 @@
#project('spa', 'c')
alsa_dep = dependency('alsa')
v4l2_dep = dependency('libv4l2')
x11_dep = dependency('x11', required : false)
sdl_dep = dependency('sdl2', required : false)
libva_dep = dependency('libva', required : false)
sbc_dep = dependency('sbc', required : false)
avcodec_dep = dependency('libavcodec', required : false)
avformat_dep = dependency('libavformat', required : false)
avfilter_dep = dependency('libavfilter', required : false)
libva_dep = dependency('libva', required : false)
sbc_dep = dependency('sbc', required : false)
libudev_dep = dependency('libudev')
threads_dep = dependency('threads')
speexdsp_dep = dependency('speexdsp')
sdl_dep = dependency('sdl2', required : false)
#cc = meson.get_compiler('c')
#dl_lib = cc.find_library('dl', required : false)
@ -22,7 +22,11 @@ speexdsp_dep = dependency('speexdsp')
spa_inc = include_directories('include')
subdir('include')
subdir('plugins')
if get_option('spa-plugins')
subdir('plugins')
endif
subdir('tools')
subdir('tests')

2
spa/plugins/audioconvert/fmtconvert.c
View file

@ -615,8 +615,6 @@ impl_node_port_set_param(struct spa_node *node,
uint32_t id, uint32_t flags,
const struct spa_pod *param)
{
struct impl *this;
spa_return_val_if_fail(node != NULL, -EINVAL);
this = SPA_CONTAINER_OF(node, struct impl, node);

2
spa/plugins/ffmpeg/ffmpeg.c
View file

@ -84,7 +84,9 @@ int spa_handle_factory_enum(const struct spa_handle_factory **factory, uint32_t
static struct spa_handle_factory f;
static char name[128];
#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 9, 100)
av_register_all();
#endif
if (*index == 0) {
c = av_codec_next(NULL);

40
spa/plugins/meson.build
View file

@ -1,15 +1,33 @@
subdir('alsa')
subdir('audioconvert')
subdir('audiomixer')
subdir('audiotestsrc')
if sbc_dep.found()
if get_option('alsa')
subdir('alsa')
endif
if get_option('audioconvert')
subdir('audioconvert')
endif
if get_option('audiomixer')
subdir('audiomixer')
endif
if get_option('audiotestsrc')
subdir('audiotestsrc')
endif
if get_option('bluez5') and sbc_dep.found()
subdir('bluez5')
endif
if avcodec_dep.found()
if get_option('ffmpeg') and avcodec_dep.found()
subdir('ffmpeg')
endif
subdir('support')
subdir('test')
subdir('videotestsrc')
subdir('volume')
subdir('v4l2')
if get_option('support')
subdir('support')
endif
if get_option('test')
subdir('test')
endif
if get_option('videotestsrc')
subdir('videotestsrc')
endif
if get_option('volume')
subdir('volume')
endif
if get_option('v4l2')
subdir('v4l2')
endif