mirrors/libfprint
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libfprint/libfprint.git synced 2025-11-15 07:38:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

meson: Bump requirements to 0.56 and adapt deprecated functions

Browse Source
This commit is contained in:
Marco Trevisan (Treviño)
2023-06-23 13:26:04 -04:00
parent 4d96a3efaa
commit 5e0bf2446b
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/meson.build
View File

@@ -25,7 +25,7 @@ docpath = join_paths(get_option('datadir'), 'gtk-doc', 'html')
gnome.gtkdoc(versioned_libname, gnome.gtkdoc(versioned_libname,
main_xml: 'libfprint-docs.xml', main_xml: 'libfprint-docs.xml',
src_dir: join_paths(meson.source_root(), 'libfprint'), src_dir: join_paths(meson.project_source_root(), 'libfprint'),
include_directories: include_directories('../libfprint'), include_directories: include_directories('../libfprint'),
dependencies: libfprint_dep, dependencies: libfprint_dep,
content_files: content_files, content_files: content_files,

4
libfprint/meson.build
View File

@@ -263,7 +263,7 @@ libfprint_drivers = static_library('fprint-drivers',
install: false) install: false)
mapfile = files('libfprint.ver') mapfile = files('libfprint.ver')
vflag = '-Wl,--version-script,@0@/@1@'.format(meson.source_root(), mapfile[0]) vflag = '-Wl,--version-script,@0@/@1@'.format(meson.project_source_root(), mapfile[0])
libfprint = shared_library(versioned_libname.split('lib')[1], libfprint = shared_library(versioned_libname.split('lib')[1],
sources: [ sources: [
@@ -339,7 +339,7 @@ sync_udev_udb = custom_target('sync-udev-hwdb',
command: [ command: [
'cp', '-v', 'cp', '-v',
udev_hwdb_generator.full_path(), udev_hwdb_generator.full_path(),
meson.source_root() / 'data' meson.project_source_root() / 'data'
] ]
) )

2
meson.build
View File

@@ -6,7 +6,7 @@ project('libfprint', [ 'c', 'cpp' ],
'warning_level=1', 'warning_level=1',
'c_std=gnu99', 'c_std=gnu99',
], ],
meson_version: '>= 0.49.0') meson_version: '>= 0.56.0')
gnome = import('gnome') gnome = import('gnome')

22
tests/meson.build
View File

@@ -4,9 +4,9 @@ envs.set('G_DEBUG', 'fatal-warnings')
envs.set('G_MESSAGES_DEBUG', 'all') envs.set('G_MESSAGES_DEBUG', 'all')
# Setup paths # Setup paths
envs.set('MESON_SOURCE_ROOT', meson.source_root()) envs.set('MESON_SOURCE_ROOT', meson.project_source_root())
envs.set('MESON_BUILD_ROOT', meson.build_root()) envs.set('MESON_BUILD_ROOT', meson.project_build_root())
envs.prepend('LD_LIBRARY_PATH', join_paths(meson.build_root(), 'libfprint')) envs.prepend('LD_LIBRARY_PATH', meson.project_build_root() / 'libfprint')
# Set FP_DEVICE_EMULATION so that drivers can adapt (e.g. to use fixed # Set FP_DEVICE_EMULATION so that drivers can adapt (e.g. to use fixed
# random numbers rather than proper ones) # random numbers rather than proper ones)
@@ -45,15 +45,15 @@ drivers_tests = [
if get_option('introspection') if get_option('introspection')
conf = configuration_data() conf = configuration_data()
conf.set('SRCDIR', meson.source_root()) conf.set('SRCDIR', meson.project_source_root())
conf.set('BUILDDIR', meson.build_root()) conf.set('BUILDDIR', meson.project_build_root())
configure_file(configuration: conf, configure_file(configuration: conf,
input: 'create-driver-test.py.in', input: 'create-driver-test.py.in',
output: 'create-driver-test.py') output: 'create-driver-test.py')
endif endif
if get_option('introspection') if get_option('introspection')
envs.prepend('GI_TYPELIB_PATH', join_paths(meson.build_root(), 'libfprint')) envs.prepend('GI_TYPELIB_PATH', meson.project_build_root() / 'libfprint')
virtual_devices_tests = [ virtual_devices_tests = [
'virtual-image', 'virtual-image',
'virtual-device', 'virtual-device',
@@ -165,7 +165,7 @@ endif
unit_tests_deps = { 'fpi-assembling' : [cairo_dep] } unit_tests_deps = { 'fpi-assembling' : [cairo_dep] }
test_config = configuration_data() test_config = configuration_data()
test_config.set_quoted('SOURCE_ROOT', meson.source_root()) test_config.set_quoted('SOURCE_ROOT', meson.project_source_root())
test_config_h = configure_file(output: 'test-config.h', configuration: test_config) test_config_h = configure_file(output: 'test-config.h', configuration: test_config)
foreach test_name: unit_tests foreach test_name: unit_tests
@@ -218,7 +218,7 @@ test('udev-hwdb',
gdb = find_program('gdb', required: false) gdb = find_program('gdb', required: false)
if gdb.found() if gdb.found()
libfprint_wrapper = [ libfprint_wrapper = [
gdb.path(), gdb.full_path(),
'-batch', '-batch',
'-ex', 'run', '-ex', 'run',
'--args', '--args',
@@ -235,12 +235,12 @@ valgrind = find_program('valgrind', required: false)
if valgrind.found() if valgrind.found()
glib_share = glib_dep.get_pkgconfig_variable('prefix') / 'share' / glib_dep.name() glib_share = glib_dep.get_pkgconfig_variable('prefix') / 'share' / glib_dep.name()
glib_suppressions = glib_share + '/valgrind/glib.supp' glib_suppressions = glib_share + '/valgrind/glib.supp'
libfprint_suppressions = '@0@/@1@'.format(meson.source_root(), libfprint_suppressions = '@0@/@1@'.format(meson.project_source_root(),
files('libfprint.supp')[0]) files('libfprint.supp')[0])
python_suppressions = '@0@/@1@'.format(meson.source_root(), python_suppressions = '@0@/@1@'.format(meson.project_source_root(),
files('valgrind-python.supp')[0]) files('valgrind-python.supp')[0])
libfprint_wrapper = [ libfprint_wrapper = [
valgrind.path(), valgrind.full_path(),
'--tool=memcheck', '--tool=memcheck',
'--leak-check=full', '--leak-check=full',
'--leak-resolution=high', '--leak-resolution=high',