From 926caef244c5ed71b5335608df858221efb9b4b1 Mon Sep 17 00:00:00 2001 From: Kate Hsuan Date: Fri, 28 Mar 2025 17:25:27 +0800 Subject: [PATCH] Update to upstream version 1.94.9 Update to upstream version 1.94.9 Resolves: RHEL-84649 RHEL-55259 --- .gitignore | 1 + ...naptics-Add-new-PID-0x0107-and-0x108.patch | 92 ------------------- libfprint.spec | 5 +- sources | 2 +- 4 files changed, 5 insertions(+), 95 deletions(-) delete mode 100644 0001-synaptics-Add-new-PID-0x0107-and-0x108.patch diff --git a/.gitignore b/.gitignore index ec74db3..720c744 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ libfprint-0.3.0.tar.bz2 /libfprint-v1.94.5.tar.gz /libfprint-v1.94.6.tar.gz /libfprint-v1.94.8.tar.gz +/libfprint-v1.94.9.tar.gz diff --git a/0001-synaptics-Add-new-PID-0x0107-and-0x108.patch b/0001-synaptics-Add-new-PID-0x0107-and-0x108.patch deleted file mode 100644 index 9cab3f3..0000000 --- a/0001-synaptics-Add-new-PID-0x0107-and-0x108.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 09ec6e66e31d5627c55d4ffefe5a31b471ac8222 Mon Sep 17 00:00:00 2001 -From: Aris Lin -Date: Mon, 18 Nov 2024 11:18:29 +0800 -Subject: [PATCH] synaptics: Add new PID 0x0107 and 0x108, also fine tune PID - sequence - ---- - data/autosuspend.hwdb | 16 +++++++++------- - libfprint/drivers/synaptics/synaptics.c | 16 +++++++++------- - 2 files changed, 18 insertions(+), 14 deletions(-) - -diff --git a/data/autosuspend.hwdb b/data/autosuspend.hwdb -index c3137710..41a150c3 100644 ---- a/data/autosuspend.hwdb -+++ b/data/autosuspend.hwdb -@@ -234,25 +234,27 @@ usb:v0BDAp5816* - - # Supported by libfprint driver synaptics - usb:v06CBp00BD* -+usb:v06CBp00C2* -+usb:v06CBp00C4* -+usb:v06CBp00C6* - usb:v06CBp00DF* -+usb:v06CBp00F0* - usb:v06CBp00F9* - usb:v06CBp00FC* --usb:v06CBp00C2* --usb:v06CBp00C4* - usb:v06CBp0100* --usb:v06CBp00F0* - usb:v06CBp0103* -+usb:v06CBp0104* -+usb:v06CBp0106* -+usb:v06CBp0107* -+usb:v06CBp0108* - usb:v06CBp0123* - usb:v06CBp0124* - usb:v06CBp0126* - usb:v06CBp0129* --usb:v06CBp0168* - usb:v06CBp015F* --usb:v06CBp0104* -+usb:v06CBp0168* - usb:v06CBp0173* --usb:v06CBp0106* - usb:v06CBp019D* --usb:v06CBp00C6* - ID_AUTOSUSPEND=1 - ID_PERSIST=0 - -diff --git a/libfprint/drivers/synaptics/synaptics.c b/libfprint/drivers/synaptics/synaptics.c -index c82e337e..1d76efbe 100644 ---- a/libfprint/drivers/synaptics/synaptics.c -+++ b/libfprint/drivers/synaptics/synaptics.c -@@ -32,25 +32,27 @@ static void compose_and_send_identify_msg (FpDevice *device); - - static const FpIdEntry id_table[] = { - { .vid = SYNAPTICS_VENDOR_ID, .pid = 0x00BD, }, -+ { .vid = SYNAPTICS_VENDOR_ID, .pid = 0x00C2, }, -+ { .vid = SYNAPTICS_VENDOR_ID, .pid = 0x00C4, }, -+ { .vid = SYNAPTICS_VENDOR_ID, .pid = 0x00C6, }, - { .vid = SYNAPTICS_VENDOR_ID, .pid = 0x00DF, }, -+ { .vid = SYNAPTICS_VENDOR_ID, .pid = 0x00F0, }, - { .vid = SYNAPTICS_VENDOR_ID, .pid = 0x00F9, }, - { .vid = SYNAPTICS_VENDOR_ID, .pid = 0x00FC, }, -- { .vid = SYNAPTICS_VENDOR_ID, .pid = 0x00C2, }, -- { .vid = SYNAPTICS_VENDOR_ID, .pid = 0x00C4, }, - { .vid = SYNAPTICS_VENDOR_ID, .pid = 0x0100, }, -- { .vid = SYNAPTICS_VENDOR_ID, .pid = 0x00F0, }, - { .vid = SYNAPTICS_VENDOR_ID, .pid = 0x0103, }, -+ { .vid = SYNAPTICS_VENDOR_ID, .pid = 0x0104, }, -+ { .vid = SYNAPTICS_VENDOR_ID, .pid = 0x0106, }, -+ { .vid = SYNAPTICS_VENDOR_ID, .pid = 0x0107, }, -+ { .vid = SYNAPTICS_VENDOR_ID, .pid = 0x0108, }, - { .vid = SYNAPTICS_VENDOR_ID, .pid = 0x0123, }, - { .vid = SYNAPTICS_VENDOR_ID, .pid = 0x0124, }, - { .vid = SYNAPTICS_VENDOR_ID, .pid = 0x0126, }, - { .vid = SYNAPTICS_VENDOR_ID, .pid = 0x0129, }, -- { .vid = SYNAPTICS_VENDOR_ID, .pid = 0x0168, }, - { .vid = SYNAPTICS_VENDOR_ID, .pid = 0x015F, }, -- { .vid = SYNAPTICS_VENDOR_ID, .pid = 0x0104, }, -+ { .vid = SYNAPTICS_VENDOR_ID, .pid = 0x0168, }, - { .vid = SYNAPTICS_VENDOR_ID, .pid = 0x0173, }, -- { .vid = SYNAPTICS_VENDOR_ID, .pid = 0x0106, }, - { .vid = SYNAPTICS_VENDOR_ID, .pid = 0x019D, }, -- { .vid = SYNAPTICS_VENDOR_ID, .pid = 0x00C6, }, - { .vid = 0, .pid = 0, .driver_data = 0 }, /* terminating entry */ - }; - --- -GitLab - diff --git a/libfprint.spec b/libfprint.spec index 4d66446..4c20d7e 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -1,6 +1,6 @@ Name: libfprint -Version: 1.94.8 +Version: 1.94.9 Release: %autorelease Summary: Toolkit for fingerprint scanner @@ -13,6 +13,7 @@ BuildRequires: meson BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: git +BuildRequires: openssl-devel BuildRequires: pkgconfig(glib-2.0) >= 2.50 BuildRequires: pkgconfig(gio-2.0) >= 2.44.0 BuildRequires: pkgconfig(gusb) >= 0.3.0 @@ -27,7 +28,6 @@ BuildRequires: gobject-introspection-devel BuildRequires: python3-cairo python3-gobject cairo-devel BuildRequires: umockdev >= 0.13.2 -Patch0001: 0001-synaptics-Add-new-PID-0x0107-and-0x108.patch %description libfprint offers support for consumer fingerprint reader devices. @@ -63,6 +63,7 @@ developing applications that use %{name}. %{_libdir}/girepository-1.0/*.typelib %{_udevhwdbdir}/60-autosuspend-libfprint-2.hwdb %{_udevrulesdir}/70-libfprint-2.rules +%{_datadir}/metainfo/org.freedesktop.libfprint.metainfo.xml %files devel %doc HACKING.md diff --git a/sources b/sources index f377002..4920c59 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfprint-v1.94.8.tar.gz) = 4d72764dff7e8aeb343c51fce90fcab11cf3aab20c0796e03ae5e1d89c7223af16234fa410bc20513bf56d7de60d71bfcf29ec624373be7294e66f306f99edbd +SHA512 (libfprint-v1.94.9.tar.gz) = f8debcc1277e6112ed450c04a40cf6113afd7b38377b3fd259bedb1f553b29db758f3519491940bf9cd4ade0f8e70b68040d5bef4c8dbf5f7c2afc1802086397