mirror of
https://gitlab.freedesktop.org/pipewire/pipewire.git
synced 2025-10-29 05:40:27 -04:00
the epoll shim should only be used by the system library.
All other places should use the system library to get the right fds.
This commit is contained in:
parent
2720df0175
commit
ac24743b2e
11 changed files with 13 additions and 13 deletions
|
|
@ -7,5 +7,5 @@ endif
|
|||
|
||||
executable('example-control', 'example-control.c',
|
||||
include_directories : [spa_inc ],
|
||||
dependencies : [dl_lib, pthread_lib, mathlib, epoll_shim_dep],
|
||||
dependencies : [dl_lib, pthread_lib, mathlib],
|
||||
install : false)
|
||||
|
|
|
|||
|
|
@ -10,6 +10,6 @@ spa_alsa_sources = ['alsa.c',
|
|||
spa_alsa = shared_library('spa-alsa',
|
||||
spa_alsa_sources,
|
||||
include_directories : [spa_inc],
|
||||
dependencies : [ alsa_dep, libudev_dep, mathlib, epoll_shim_dep ],
|
||||
dependencies : [ alsa_dep, libudev_dep, mathlib, ],
|
||||
install : true,
|
||||
install_dir : '@0@/spa/alsa'.format(get_option('libdir')))
|
||||
|
|
|
|||
|
|
@ -3,6 +3,6 @@ audiotestsrc_sources = ['audiotestsrc.c', 'plugin.c']
|
|||
audiotestsrclib = shared_library('spa-audiotestsrc',
|
||||
audiotestsrc_sources,
|
||||
include_directories : [spa_inc],
|
||||
dependencies : [mathlib, epoll_shim_dep],
|
||||
dependencies : [mathlib, ],
|
||||
install : true,
|
||||
install_dir : '@0@/spa/audiotestsrc'.format(get_option('libdir')))
|
||||
|
|
|
|||
|
|
@ -35,6 +35,6 @@ spa_dbus_sources = ['dbus.c']
|
|||
spa_dbus_lib = shared_library('spa-dbus',
|
||||
spa_dbus_sources,
|
||||
include_directories : [ spa_inc],
|
||||
dependencies : [dbus_dep, epoll_shim_dep],
|
||||
dependencies : [dbus_dep, ],
|
||||
install : true,
|
||||
install_dir : '@0@/spa/support'.format(get_option('libdir')))
|
||||
|
|
|
|||
|
|
@ -3,6 +3,6 @@ test_sources = ['fakesrc.c', 'fakesink.c', 'plugin.c']
|
|||
testlib = shared_library('spa-test',
|
||||
test_sources,
|
||||
include_directories : [ spa_inc],
|
||||
dependencies : [pthread_lib, epoll_shim_dep],
|
||||
dependencies : [pthread_lib, ],
|
||||
install : true,
|
||||
install_dir : '@0@/spa/test'.format(get_option('libdir')))
|
||||
|
|
|
|||
|
|
@ -6,6 +6,6 @@ v4l2_sources = ['v4l2.c',
|
|||
v4l2lib = shared_library('spa-v4l2',
|
||||
v4l2_sources,
|
||||
include_directories : [ spa_inc ],
|
||||
dependencies : [ libudev_dep, epoll_shim_dep ],
|
||||
dependencies : [ libudev_dep, ],
|
||||
install : true,
|
||||
install_dir : '@0@/spa/v4l2'.format(get_option('libdir')))
|
||||
|
|
|
|||
|
|
@ -3,6 +3,6 @@ videotestsrc_sources = ['videotestsrc.c', 'plugin.c']
|
|||
videotestsrclib = shared_library('spa-videotestsrc',
|
||||
videotestsrc_sources,
|
||||
include_directories : [ spa_inc],
|
||||
dependencies : [pthread_lib, epoll_shim_dep],
|
||||
dependencies : [pthread_lib, ],
|
||||
install : true,
|
||||
install_dir : '@0@/spa/videotestsrc'.format(get_option('libdir')))
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ endforeach
|
|||
if have_cpp
|
||||
test_cpp = executable('spa-test-cpp', 'test-cpp.cpp',
|
||||
include_directories : [spa_inc ],
|
||||
dependencies : [epoll_shim_dep],
|
||||
dependencies : [],
|
||||
install : false)
|
||||
test('spa-test-cpp', test_cpp)
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
executable('spa-inspect', 'spa-inspect.c',
|
||||
include_directories : [spa_inc],
|
||||
dependencies : [dl_lib, epoll_shim_dep],
|
||||
dependencies : [dl_lib, ],
|
||||
install : true)
|
||||
|
||||
executable('spa-monitor', 'spa-monitor.c',
|
||||
include_directories : [spa_inc],
|
||||
dependencies : [dl_lib, epoll_shim_dep],
|
||||
dependencies : [dl_lib, ],
|
||||
install : true)
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ executable('pipewire',
|
|||
install: true,
|
||||
c_args : pipewire_c_args,
|
||||
include_directories : [configinc, spa_inc],
|
||||
dependencies : [pipewire_dep, epoll_shim_dep],
|
||||
dependencies : [pipewire_dep, ],
|
||||
)
|
||||
|
||||
if get_option('systemd') and systemd.found()
|
||||
|
|
|
|||
|
|
@ -91,12 +91,12 @@ libpipewire = shared_library(libpipewire_name, pipewire_sources,
|
|||
c_args : libpipewire_c_args,
|
||||
include_directories : [pipewire_inc, configinc, spa_inc],
|
||||
install : true,
|
||||
dependencies : [dl_lib, mathlib, pthread_lib, epoll_shim_dep],
|
||||
dependencies : [dl_lib, mathlib, pthread_lib, ],
|
||||
)
|
||||
|
||||
pipewire_dep = declare_dependency(link_with : libpipewire,
|
||||
include_directories : [pipewire_inc, configinc, spa_inc],
|
||||
dependencies : [pthread_lib, epoll_shim_dep],
|
||||
dependencies : [pthread_lib, ],
|
||||
)
|
||||
|
||||
pkgconfig.generate(filebase : 'lib@0@'.format(libpipewire_name),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue