Clean up build scaffolding for libsfdo and add the creation and

destruction of an sfdo data structure associated with a sway server with
a view to future use of icon themes in places such as titlebars
This commit is contained in:
myrslint 2025-04-16 20:50:42 +00:00
parent d9a6bdb85e
commit 3a21b8c6f1
4 changed files with 147 additions and 29 deletions

View file

@ -37,34 +37,6 @@ if is_freebsd
add_project_arguments('-D_C11_SOURCE', language: 'c')
endif
# Check for (currrently) optional libsfdo
sfdo_basedir = dependency(
'libsfdo-basedir',
default_options: ['default_library=static', 'examples=false', 'tests=false'],
version: '>=0.1.3',
required: get_option('sfdo'),
)
sfdo_desktop = dependency(
'libsfdo-desktop',
default_options: ['default_library=static', 'examples=false', 'tests=false'],
version: '>=0.1.3',
required: get_option('sfdo'),
)
sfdo_desktop_file = dependency(
'libsfdo-desktop-file',
default_options: ['default_library=static', 'examples=false', 'tests=false'],
version: '>=0.1.3',
required: get_option('sfdo'),
)
sfdo_icon = dependency(
'libsfdo-icon',
default_options: ['default_library=static', 'examples=false', 'tests=false'],
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()
# Execute the wlroots subproject, if any
wlroots_version = ['>=0.19.0', '<0.20.0']
subproject(
@ -87,6 +59,34 @@ 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()
)
jsonc = dependency('json-c', version: '>=0.13')
pcre2 = dependency('libpcre2-8')
wayland_server = dependency('wayland-server', version: '>=1.21.0')