mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2026-01-02 11:08:48 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

port to meson

Browse source
This commit is contained in:
Wim Taymans 2016-09-26 12:15:52 +02:00
parent 924824d0a3
commit 67dd3adb87
69 changed files with 1056 additions and 999 deletions
Download patch file Download diff file Expand all files Collapse all files

7
spa/include/spa/control.h
View file

@ -130,9 +130,10 @@ typedef struct {
/* SPA_CONTROL_CMD_SET_FORMAT */
typedef struct {
uint32_t seq;
uint32_t port_id;
SpaFormat *format;
uint32_t seq;
uint32_t port_id;
SpaPortFormatFlags flags;
SpaFormat *format;
} SpaControlCmdSetFormat;
/* SPA_CONTROL_CMD_SET_PROPERTY */

30
spa/include/spa/meson.build
View file

@ -1,8 +1,22 @@
install_headers('buffer.h',
'command.h',
'defs.h',
'event.h',
'node.h',
'plugin.h',
'port.h',
'props.h')
spa_headers = [
'buffer.h',
'clock.h',
'control.h',
'debug.h',
'defs.h',
'dict.h',
'format.h',
'memory.h',
'monitor.h',
'node-command.h',
'node-event.h',
'node.h',
'plugin.h',
'poll.h',
'port.h',
'props.h',
'queue.h',
'ringbuffer.h'
]
install_headers(spa_headers, subdir : 'spa')

14
spa/lib/meson.build
View file

@ -10,9 +10,13 @@ spalib_sources = ['audio-raw.c',
spalib = shared_library('spa-lib',
spalib_sources,
include_directories : inc,
install : true)
spalibs = static_library('spa-lib',
spalib_sources,
include_directories : inc,
include_directories : spa_inc,
install : true)
#spalibs = static_library('spa-lib',
# spalib_sources,
# include_directories : spa_inc,
# install : true)
spalib_dep = declare_dependency(link_with : spalib,
include_directories : spa_inc,
)

4
spa/meson.build
View file

@ -1,4 +1,4 @@
project('spa', 'c')
#project('spa', 'c')
alsa_dep = dependency('alsa')
v4l2_dep = dependency('libv4l2')
@ -16,7 +16,7 @@ cc = meson.get_compiler('c')
dl_lib = cc.find_library('dl', required : true)
pthread_lib = cc.find_library('pthread', required : true)
inc = include_directories('include')
spa_inc = include_directories('include')
subdir('include')
subdir('lib')

2
spa/plugins/alsa/alsa-monitor.c
View file

@ -255,7 +255,7 @@ spa_alsa_monitor_set_event_callback (SpaMonitor *monitor,
return SPA_RESULT_ERROR;
udev_monitor_filter_add_match_subsystem_devtype (this->umonitor,
"video4linux",
"sound",
NULL);
udev_monitor_enable_receiving (this->umonitor);

15
spa/plugins/alsa/meson.build
View file

@ -1,12 +1,13 @@
alsa_sources = ['alsa.c',
spa_alsa_sources = ['alsa.c',
'alsa-monitor.c',
'alsa-sink.c',
'alsa-source.c',
'alsa-utils.c']
alsalib = shared_library('spa-alsa',
alsa_sources,
include_directories : inc,
dependencies : [ alsa_dep, libudev_dep ],
link_with : spalib,
install : true)
spa_alsa = shared_library('spa-alsa',
spa_alsa_sources,
include_directories : spa_inc,
dependencies : [ alsa_dep, libudev_dep ],
link_with : spalib,
install : true,
install_dir : '@0@/spa'.format(get_option('libdir')))

5
spa/plugins/audiomixer/meson.build
View file

@ -2,6 +2,7 @@ audiomixer_sources = ['audiomixer.c', 'plugin.c']
audiomixerlib = shared_library('spa-audiomixer',
audiomixer_sources,
include_directories : inc,
include_directories : spa_inc,
link_with : spalib,
install : true)
install : true,
install_dir : '@0@/spa'.format(get_option('libdir')))

5
spa/plugins/audiotestsrc/meson.build
View file

@ -2,6 +2,7 @@ audiotestsrc_sources = ['audiotestsrc.c', 'plugin.c']
audiotestsrclib = shared_library('spa-audiotestsrc',
audiotestsrc_sources,
include_directories : inc,
include_directories : spa_inc,
link_with : spalib,
install : true)
install : true,
install_dir : '@0@/spa'.format(get_option('libdir')))

5
spa/plugins/ffmpeg/meson.build
View file

@ -4,7 +4,8 @@ ffmpeg_sources = ['ffmpeg.c',
ffmpeglib = shared_library('spa-ffmpeg',
ffmpeg_sources,
include_directories : inc,
include_directories : spa_inc,
dependencies : [ avcodec_dep, avformat_dep ],
link_with : spalib,
install : true)
install : true,
install_dir : '@0@/spa'.format(get_option('libdir')))

3
spa/plugins/libva/meson.build
View file

@ -7,4 +7,5 @@ libvalib = shared_library('spa-libva',
include_directories : inc,
dependencies : libva_dep,
link_with : spalib,
install : true)
install : true,
install_dir : '@0@/spa'.format(get_option('libdir')))

5
spa/plugins/remote/meson.build
View file

@ -2,6 +2,7 @@ remote_sources = ['proxy.c', 'plugin.c']
remotelib = shared_library('spa-remote',
remote_sources,
include_directories : inc,
include_directories : spa_inc,
link_with : spalib,
install : true)
install : true,
install_dir : '@0@/spa'.format(get_option('libdir')))

1
spa/plugins/remote/proxy.c
View file

@ -496,6 +496,7 @@ spa_proxy_node_port_set_format (SpaNode *node,
spa_control_builder_init_into (&builder, buf, sizeof (buf), NULL, 0);
sf.seq = this->seq++;
sf.port_id = port_id;
sf.flags = flags;
sf.format = (SpaFormat *) format;
spa_control_builder_add_cmd (&builder, SPA_CONTROL_CMD_SET_FORMAT, &sf);
spa_control_builder_end (&builder, &control);

5
spa/plugins/v4l2/meson.build
View file

@ -4,7 +4,8 @@ v4l2_sources = ['v4l2.c',
v4l2lib = shared_library('spa-v4l2',
v4l2_sources,
include_directories : inc,
include_directories : spa_inc,
dependencies : [ v4l2_dep, libudev_dep ],
link_with : spalib,
install : true)
install : true,
install_dir : '@0@/spa'.format(get_option('libdir')))

5
spa/plugins/videotestsrc/meson.build
View file

@ -2,7 +2,8 @@ videotestsrc_sources = ['videotestsrc.c', 'plugin.c']
videotestsrclib = shared_library('spa-videotestsrc',
videotestsrc_sources,
include_directories : inc,
include_directories : spa_inc,
dependencies : threads_dep,
link_with : spalib,
install : true)
install : true,
install_dir : '@0@/spa'.format(get_option('libdir')))

5
spa/plugins/volume/meson.build
View file

@ -2,6 +2,7 @@ volume_sources = ['volume.c', 'plugin.c']
volumelib = shared_library('spa-volume',
volume_sources,
include_directories : inc,
include_directories : spa_inc,
link_with : spalib,
install : true)
install : true,
install_dir : '@0@/spa'.format(get_option('libdir')))

5
spa/plugins/xv/meson.build
View file

@ -3,7 +3,8 @@ xv_sources = ['xv.c',
xvlib = shared_library('spa-xv',
xv_sources,
include_directories : inc,
include_directories : spa_inc,
dependencies : xv_dep,
link_with : spalib,
install : true)
install : true,
install_dir : '@0@/spa'.format(get_option('libdir')))

4
spa/tests/meson.build
View file

@ -1,11 +1,11 @@
executable('test-mixer', 'test-mixer.c',
include_directories : inc,
include_directories : spa_inc,
dependencies : [dl_lib, pthread_lib],
link_with : spalib,
install : false)
executable('test-v4l2', 'test-v4l2.c',
include_directories : inc,
include_directories : spa_inc,
dependencies : [dl_lib, sdl_dep, pthread_lib],
link_with : spalib,
install : false)

4
spa/tools/meson.build
View file

@ -1,11 +1,11 @@
executable('spa-inspect', 'spa-inspect.c',
include_directories : inc,
include_directories : spa_inc,
dependencies : [dl_lib],
link_with : spalib,
install : true)
executable('spa-monitor', 'spa-monitor.c',
include_directories : inc,
include_directories : spa_inc,
dependencies : [dl_lib],
link_with : spalib,
install : true)