From ac24743b2e41ed964867388aa8a1053504fa8797 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 19 Nov 2019 15:16:18 +0100 Subject: [PATCH] the epoll shim should only be used by the system library. All other places should use the system library to get the right fds. --- spa/examples/meson.build | 2 +- spa/plugins/alsa/meson.build | 2 +- spa/plugins/audiotestsrc/meson.build | 2 +- spa/plugins/support/meson.build | 2 +- spa/plugins/test/meson.build | 2 +- spa/plugins/v4l2/meson.build | 2 +- spa/plugins/videotestsrc/meson.build | 2 +- spa/tests/meson.build | 2 +- spa/tools/meson.build | 4 ++-- src/daemon/meson.build | 2 +- src/pipewire/meson.build | 4 ++-- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/spa/examples/meson.build b/spa/examples/meson.build index 9accaef40..55ddbe45c 100644 --- a/spa/examples/meson.build +++ b/spa/examples/meson.build @@ -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) diff --git a/spa/plugins/alsa/meson.build b/spa/plugins/alsa/meson.build index b31690366..8442e645e 100644 --- a/spa/plugins/alsa/meson.build +++ b/spa/plugins/alsa/meson.build @@ -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'))) diff --git a/spa/plugins/audiotestsrc/meson.build b/spa/plugins/audiotestsrc/meson.build index 4c313d83e..d4ffc9de9 100644 --- a/spa/plugins/audiotestsrc/meson.build +++ b/spa/plugins/audiotestsrc/meson.build @@ -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'))) diff --git a/spa/plugins/support/meson.build b/spa/plugins/support/meson.build index 084625675..c6179ca96 100644 --- a/spa/plugins/support/meson.build +++ b/spa/plugins/support/meson.build @@ -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'))) diff --git a/spa/plugins/test/meson.build b/spa/plugins/test/meson.build index ec10a5e19..463a529c2 100644 --- a/spa/plugins/test/meson.build +++ b/spa/plugins/test/meson.build @@ -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'))) diff --git a/spa/plugins/v4l2/meson.build b/spa/plugins/v4l2/meson.build index bd95f2586..6cec23898 100644 --- a/spa/plugins/v4l2/meson.build +++ b/spa/plugins/v4l2/meson.build @@ -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'))) diff --git a/spa/plugins/videotestsrc/meson.build b/spa/plugins/videotestsrc/meson.build index 8207a8a53..1644c550d 100644 --- a/spa/plugins/videotestsrc/meson.build +++ b/spa/plugins/videotestsrc/meson.build @@ -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'))) diff --git a/spa/tests/meson.build b/spa/tests/meson.build index e108836a2..e6f9c68d0 100644 --- a/spa/tests/meson.build +++ b/spa/tests/meson.build @@ -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 diff --git a/spa/tools/meson.build b/spa/tools/meson.build index 8a18ca8f8..7c2e412f7 100644 --- a/spa/tools/meson.build +++ b/spa/tools/meson.build @@ -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) diff --git a/src/daemon/meson.build b/src/daemon/meson.build index 451009b9a..228d4d119 100644 --- a/src/daemon/meson.build +++ b/src/daemon/meson.build @@ -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() diff --git a/src/pipewire/meson.build b/src/pipewire/meson.build index 2c3cf1909..357531b25 100644 --- a/src/pipewire/meson.build +++ b/src/pipewire/meson.build @@ -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),