mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-16 08:21:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make libsfdo a hard dependency.

Browse source
This commit is contained in:
myrslint 2025-07-02 21:10:01 +00:00
parent c8cc27c49e
commit 0872673472
3 changed files with 12 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

34
meson.build
View file

@ -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)

13
sway/meson.build
View file

@ -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,

13
swaybar/meson.build
View file

@ -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',