mirror of
https://gitlab.freedesktop.org/libfprint/libfprint.git
synced 2026-06-11 18:38:07 +00:00
Drop d/patches/kFreeBSD_FTBFS_add_ETIME_definition.patch and d/patches/use-non-versionned-libusbh-path.patch, not needed anymore
This commit is contained in:
Vendored
+2
@@ -3,6 +3,8 @@ libfprint (1:1.90.0-1) UNRELEASED; urgency=medium
|
|||||||
* New upstream release
|
* New upstream release
|
||||||
- Replace libusb-1.0 build-dependency by gusb and add libgusb-doc to the
|
- Replace libusb-1.0 build-dependency by gusb and add libgusb-doc to the
|
||||||
Build-Depends-Indep
|
Build-Depends-Indep
|
||||||
|
- Drop d/patches/kFreeBSD_FTBFS_add_ETIME_definition.patch and
|
||||||
|
d/patches/use-non-versionned-libusbh-path.patch, not needed anymore
|
||||||
|
|
||||||
-- Laurent Bigonville <bigon@debian.org> Fri, 10 Jan 2020 02:26:09 +0100
|
-- Laurent Bigonville <bigon@debian.org> Fri, 10 Jan 2020 02:26:09 +0100
|
||||||
|
|
||||||
|
|||||||
@@ -1,60 +0,0 @@
|
|||||||
Description: Add missing ETIME definition for kFreeBSD flavours.
|
|
||||||
Author: Steven Chamberlain <steven@pyro.eu.org>
|
|
||||||
Bug-Debian: http://bugs.debian.org/673704
|
|
||||||
Forwarded: not-yet
|
|
||||||
Reviewed-by: Didier Raboud <odyx@debian.org>
|
|
||||||
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 */
|
|
||||||
--- a/libfprint/drivers/elan.c
|
|
||||||
+++ b/libfprint/drivers/elan.c
|
|
||||||
@@ -49,6 +49,10 @@
|
|
||||||
else if (len > 2) \
|
|
||||||
fp_dbg("%04x... (%d bytes)", buf[0] << 8 | buf[1], len)
|
|
||||||
|
|
||||||
+#ifndef ETIME
|
|
||||||
+#define ETIME ETIMEDOUT /* For kFreeBSD */
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
unsigned char elan_get_pixel(struct fpi_frame_asmbl_ctx *ctx,
|
|
||||||
struct fpi_frame *frame, unsigned int x,
|
|
||||||
unsigned int y)
|
|
||||||
Vendored
-2
@@ -1,6 +1,4 @@
|
|||||||
# Upstream backports
|
# Upstream backports
|
||||||
|
|
||||||
# Debian specifics
|
# Debian specifics
|
||||||
kFreeBSD_FTBFS_add_ETIME_definition.patch
|
|
||||||
udev-rules-creation-add-Debian-specifics.patch
|
udev-rules-creation-add-Debian-specifics.patch
|
||||||
use-non-versionned-libusbh-path.patch
|
|
||||||
|
|||||||
@@ -1,17 +0,0 @@
|
|||||||
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 <odyx@debian.org>
|
|
||||||
Last-Update: 2013-03-03
|
|
||||||
--- a/libfprint/drivers/vfs301_proto.h
|
|
||||||
+++ b/libfprint/drivers/vfs301_proto.h
|
|
||||||
@@ -18,7 +18,7 @@
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
|
||||||
-#include <libusb-1.0/libusb.h>
|
|
||||||
+#include <libusb.h>
|
|
||||||
|
|
||||||
enum {
|
|
||||||
VFS301_DEFAULT_WAIT_TIMEOUT = 300,
|
|
||||||
Reference in New Issue
Block a user