mirror of
https://gitlab.freedesktop.org/libfprint/libfprint.git
synced 2026-06-11 02:28:05 +00:00
Merge tag 'v1.94.7' into tod
2024-02-20: v1.94.7 release Highlights: * synaptics: fix enroll identify problem after user reset database. * synaptics: New PIDs 0x0173, 0x0106, 0x0124. * goodixmoc: New PID 0x6582. * build: Do not require bash to build, only posix sh. * fp-image: Simplify minutiae detection tasks. * GLib 2.68 is now required to build libfprint. New drivers: * realtek (PID 0x5813). * focaltech_moc (PIDs 0x9E48, 0xD979, 0xA959). * egismoc (PIDs 0x0582, 0x05a1). Git-EVTag-v0-SHA512: 17cc50269368e861ea751af2a3ff957329191ca66832033bb71995e8e9e56f86af955559b147217a19f218af5b1eec0fd2bce5dd2b4f4381be48ef3d6610003d
This commit is contained in:
+7
-3
@@ -15,7 +15,7 @@ envs.prepend('LD_LIBRARY_PATH', meson.project_build_root() / 'libfprint')
|
||||
envs.set('FP_DEVICE_EMULATION', '1')
|
||||
|
||||
# Set a colon-separated list of native drivers we enable in tests
|
||||
envs.set('FP_DRIVERS_WHITELIST', ':'.join([
|
||||
envs.set('FP_DRIVERS_ALLOWLIST', ':'.join([
|
||||
'virtual_image',
|
||||
'virtual_device',
|
||||
'virtual_device_storage',
|
||||
@@ -51,7 +51,11 @@ drivers_tests = [
|
||||
'goodixmoc',
|
||||
'nb1010',
|
||||
'egis0570',
|
||||
'egismoc',
|
||||
'egismoc-05a1',
|
||||
'fpcmoc',
|
||||
'realtek',
|
||||
'focaltech_moc',
|
||||
]
|
||||
|
||||
if get_option('introspection')
|
||||
@@ -157,7 +161,7 @@ if get_option('introspection')
|
||||
foreach driver_test: drivers_tests
|
||||
driver_name = driver_test.split('-')[0]
|
||||
driver_envs = envs
|
||||
driver_envs.set('FP_DRIVERS_WHITELIST', driver_name)
|
||||
driver_envs.set('FP_DRIVERS_ALLOWLIST', driver_name)
|
||||
|
||||
if (driver_name in supported_drivers and
|
||||
gusb_dep.version().version_compare('>= 0.3.0'))
|
||||
@@ -335,7 +339,7 @@ endif
|
||||
|
||||
valgrind = find_program('valgrind', required: false)
|
||||
if valgrind.found()
|
||||
glib_share = glib_dep.get_pkgconfig_variable('prefix') / 'share' / glib_dep.name()
|
||||
glib_share = glib_dep.get_variable(pkgconfig: 'prefix') / 'share' / glib_dep.name()
|
||||
glib_suppressions = glib_share + '/valgrind/glib.supp'
|
||||
libfprint_suppressions = '@0@/@1@'.format(meson.project_source_root(),
|
||||
files('libfprint.supp')[0])
|
||||
|
||||
Reference in New Issue
Block a user