diff --git a/meson.build b/meson.build index f22fa7be2..a8f3f6ad6 100644 --- a/meson.build +++ b/meson.build @@ -60,34 +60,10 @@ endforeach null_dep = dependency('', required: false) -# Check for (currrently) optional libsfdo -sfdo_basedir = dependency( - 'libsfdo-basedir', - version: '>=0.1.3', - required: get_option('sfdo') -) -sfdo_desktop = dependency( - 'libsfdo-desktop', - version: '>=0.1.3', - required: get_option('sfdo') -) -sfdo_desktop_file = dependency( - 'libsfdo-desktop-file', - version: '>=0.1.3', - required: get_option('sfdo') -) -sfdo_icon = dependency( - 'libsfdo-icon', - version: '>=0.1.3', - required: get_option('sfdo') -) -have_libsfdo = ( - sfdo_basedir.found() and - sfdo_desktop.found() and - sfdo_desktop_file.found() and - sfdo_icon.found() -) - +libsfdo_basedir = dependency('libsfdo-basedir', version: '>=0.1.3') +libsfdo_desktop = dependency('libsfdo-desktop', version: '>=0.1.3') +libsfdo_desktop_file = dependency('libsfdo-desktop-file', version: '>=0.1.3') +libsfdo_icon = dependency('libsfdo-icon', version: '>=0.1.3') jsonc = dependency('json-c', version: '>=0.13') pcre2 = dependency('libpcre2-8') wayland_server = dependency('wayland-server', version: '>=1.21.0') @@ -136,7 +112,6 @@ conf_data = configuration_data() conf_data.set10('HAVE_GDK_PIXBUF', gdk_pixbuf.found()) conf_data.set10('HAVE_LIBSYSTEMD', sdbus.found() and sdbus.name() == 'libsystemd') conf_data.set10('HAVE_LIBELOGIND', sdbus.found() and sdbus.name() == 'libelogind') -conf_data.set10('HAVE_LIBSFDO', have_libsfdo) conf_data.set10('HAVE_BASU', sdbus.found() and sdbus.name() == 'basu') conf_data.set10('HAVE_TRAY', have_tray) foreach sym : ['LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM', 'LIBINPUT_CONFIG_DRAG_LOCK_ENABLED_STICKY'] @@ -273,6 +248,5 @@ subdir('completions') summary({ 'gdk-pixbuf': gdk_pixbuf.found(), 'tray': have_tray, - 'libsfdo': have_libsfdo, 'man-pages': scdoc.found(), }, bool_yn: true) diff --git a/sway/meson.build b/sway/meson.build index 865049d82..9bc83e460 100644 --- a/sway/meson.build +++ b/sway/meson.build @@ -218,6 +218,10 @@ sway_sources = files( ) sway_deps = [ + libsfdo_basedir, + libsfdo_desktop, + libsfdo_desktop_file, + libsfdo_icon, cairo, drm, jsonc, @@ -244,15 +248,6 @@ if wlroots_features['libinput_backend'] sway_sources += 'input/libinput.c' endif -if have_libsfdo - sway_deps += [ - sfdo_basedir, - sfdo_desktop, - sfdo_desktop_file, - sfdo_icon - ] -endif - executable( 'sway', sway_sources + wl_protos_src, diff --git a/swaybar/meson.build b/swaybar/meson.build index 6a1d17461..f7b54ba7c 100644 --- a/swaybar/meson.build +++ b/swaybar/meson.build @@ -7,6 +7,10 @@ tray_files = have_tray ? [ ] : [] swaybar_deps = [ + libsfdo_basedir, + libsfdo_desktop, + libsfdo_desktop_file, + libsfdo_icon, cairo, gdk_pixbuf, jsonc, @@ -21,15 +25,6 @@ if have_tray swaybar_deps += sdbus endif -if have_libsfdo - swaybar_deps += [ - sfdo_basedir, - sfdo_desktop, - sfdo_desktop_file, - sfdo_icon - ] -endif - executable( 'swaybar', [ 'bar.c',