diff --git a/debian/patches/kFreeBSD_FTBFS_add_ETIME_definition.patch b/debian/patches/kFreeBSD_FTBFS_add_ETIME_definition.patch index 0d7c2a1..674a9a6 100644 --- a/debian/patches/kFreeBSD_FTBFS_add_ETIME_definition.patch +++ b/debian/patches/kFreeBSD_FTBFS_add_ETIME_definition.patch @@ -1,50 +1,22 @@ -Description: Add missing ETIME definition for kFreeBSD flavours. -Author: Steven Chamberlain +From: Steven Chamberlain +Date: Tue, 7 Jun 2022 06:20:31 +0000 +Subject: Add missing ETIME definition for kFreeBSD flavours. + Bug-Debian: http://bugs.debian.org/673704 Forwarded: not-yet Reviewed-by: Didier Raboud +Last-Update: 2013-03-03 + Last-Update: 2013-03-03 --- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/libfprint/drivers/uru4000.c -+++ b/libfprint/drivers/uru4000.c -@@ -25,6 +25,10 @@ - - #include "drivers_api.h" - -+#ifndef ETIME -+#define ETIME ETIMEDOUT /* For kFreeBSD */ -+#endif -+ - #define EP_INTR (1 | LIBUSB_ENDPOINT_IN) - #define EP_DATA (2 | LIBUSB_ENDPOINT_IN) - #define USB_RQ 0x04 ---- a/libfprint/drivers/vfs101.c -+++ b/libfprint/drivers/vfs101.c -@@ -21,6 +21,10 @@ - - #include "drivers_api.h" - -+#ifndef ETIME -+#define ETIME ETIMEDOUT /* For kFreeBSD */ -+#endif -+ - /* Input-Output usb endpoint */ - #define EP_IN(n) (n | LIBUSB_ENDPOINT_IN) - #define EP_OUT(n) (n | LIBUSB_ENDPOINT_OUT) ---- a/libfprint/drivers/vfs301.c -+++ b/libfprint/drivers/vfs301.c -@@ -24,6 +24,10 @@ - #include "drivers_api.h" - #include "vfs301_proto.h" - -+#ifndef ETIME -+#define ETIME ETIMEDOUT /* For kFreeBSD */ -+#endif -+ - /************************** GENERIC STUFF *************************************/ - - /* Submit asynchronous sleep */ + libfprint/drivers/elan.c | 4 ++++ + libfprint/drivers/uru4000.c | 4 ++++ + libfprint/drivers/vfs101.c | 4 ++++ + libfprint/drivers/vfs301.c | 4 ++++ + 4 files changed, 16 insertions(+) + +diff --git a/libfprint/drivers/elan.c b/libfprint/drivers/elan.c +index e9dad43..0026b01 100644 --- a/libfprint/drivers/elan.c +++ b/libfprint/drivers/elan.c @@ -49,6 +49,10 @@ @@ -58,3 +30,48 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ unsigned char elan_get_pixel(struct fpi_frame_asmbl_ctx *ctx, struct fpi_frame *frame, unsigned int x, unsigned int y) +diff --git a/libfprint/drivers/uru4000.c b/libfprint/drivers/uru4000.c +index 79c48c5..08b91b1 100644 +--- a/libfprint/drivers/uru4000.c ++++ b/libfprint/drivers/uru4000.c +@@ -25,6 +25,10 @@ + + #include "drivers_api.h" + ++#ifndef ETIME ++#define ETIME ETIMEDOUT /* For kFreeBSD */ ++#endif ++ + #define EP_INTR (1 | LIBUSB_ENDPOINT_IN) + #define EP_DATA (2 | LIBUSB_ENDPOINT_IN) + #define USB_RQ 0x04 +diff --git a/libfprint/drivers/vfs101.c b/libfprint/drivers/vfs101.c +index 60f0a81..b4776df 100644 +--- a/libfprint/drivers/vfs101.c ++++ b/libfprint/drivers/vfs101.c +@@ -21,6 +21,10 @@ + + #include "drivers_api.h" + ++#ifndef ETIME ++#define ETIME ETIMEDOUT /* For kFreeBSD */ ++#endif ++ + /* Input-Output usb endpoint */ + #define EP_IN(n) (n | LIBUSB_ENDPOINT_IN) + #define EP_OUT(n) (n | LIBUSB_ENDPOINT_OUT) +diff --git a/libfprint/drivers/vfs301.c b/libfprint/drivers/vfs301.c +index 94837de..3b7060d 100644 +--- a/libfprint/drivers/vfs301.c ++++ b/libfprint/drivers/vfs301.c +@@ -24,6 +24,10 @@ + #include "drivers_api.h" + #include "vfs301_proto.h" + ++#ifndef ETIME ++#define ETIME ETIMEDOUT /* For kFreeBSD */ ++#endif ++ + /************************** GENERIC STUFF *************************************/ + + /* Submit asynchronous sleep */ diff --git a/debian/patches/series b/debian/patches/series index 15f33bb..08f8345 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,3 @@ -# Upstream backports - -# Debian specifics kFreeBSD_FTBFS_add_ETIME_definition.patch udev-rules-creation-add-Debian-specifics.patch use-non-versionned-libusbh-path.patch diff --git a/debian/patches/udev-rules-creation-add-Debian-specifics.patch b/debian/patches/udev-rules-creation-add-Debian-specifics.patch index 4eedc22..11fffc3 100644 --- a/debian/patches/udev-rules-creation-add-Debian-specifics.patch +++ b/debian/patches/udev-rules-creation-add-Debian-specifics.patch @@ -1,13 +1,21 @@ -Description: Tweak the udev rules creator for Debian usage - List all devices; automatic power/control only for the non-blacklisted - ones; mode and group to all. -Author: Didier Raboud +From: Didier Raboud +Date: Tue, 7 Jun 2022 06:20:31 +0000 +Subject: Tweak the udev rules creator for Debian usage + Origin: vendor Last-Update: 2015-03-03 +List all devices; automatic power/control only for the non-blacklisted +ones; mode and group to all. +--- + libfprint/fprint-list-udev-rules.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/libfprint/fprint-list-udev-rules.c b/libfprint/fprint-list-udev-rules.c +index de291f1..428bf53 100644 --- a/libfprint/fprint-list-udev-rules.c +++ b/libfprint/fprint-list-udev-rules.c -@@ -63,9 +63,6 @@ static void print_driver (struct fp_driv +@@ -63,9 +63,6 @@ static void print_driver (struct fp_driver *driver) break; } } @@ -17,7 +25,7 @@ Last-Update: 2015-03-03 key = g_strdup_printf ("%04x:%04x", driver->id_table[i].vendor, driver->id_table[i].product); if (g_hash_table_lookup (printed, key) != NULL) { -@@ -78,7 +75,10 @@ static void print_driver (struct fp_driv +@@ -78,7 +75,10 @@ static void print_driver (struct fp_driver *driver) if (num_printed == 0) printf ("# %s\n", driver->full_name); diff --git a/debian/patches/use-non-versionned-libusbh-path.patch b/debian/patches/use-non-versionned-libusbh-path.patch index 121ef7b..e47bf50 100644 --- a/debian/patches/use-non-versionned-libusbh-path.patch +++ b/debian/patches/use-non-versionned-libusbh-path.patch @@ -1,9 +1,18 @@ -Description: Use non-versionned libusb.h path - Reference: http://thread.gmane.org/gmane.comp.lib.libusb.devel.general/11611 - . - Hopefully fixes the kFreeBSD FTBFS. -Author: Didier Raboud +From: Didier Raboud +Date: Tue, 7 Jun 2022 06:20:31 +0000 +Subject: Use non-versionned libusb.h path + Last-Update: 2013-03-03 + +Reference: http://thread.gmane.org/gmane.comp.lib.libusb.devel.general/11611 + +Hopefully fixes the kFreeBSD FTBFS. +--- + libfprint/drivers/vfs301_proto.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libfprint/drivers/vfs301_proto.h b/libfprint/drivers/vfs301_proto.h +index 2ae587a..2995135 100644 --- a/libfprint/drivers/vfs301_proto.h +++ b/libfprint/drivers/vfs301_proto.h @@ -18,7 +18,7 @@