libusb, cups compatability...

[idunham@lavabit.com]

[-- Attachment #1: Type: text/plain, Size: 608 bytes --]

I've been needing to set up printing, so I went ahead and compiled libusb
1.0.9 and cups 1.5.3.
libusb needs the  TIMESPEC_TO_TIMEVAL macro; for the time being, I added
the definition to libusb (diff attached for Gregor's sake).
It probably should go in sys/time.h with gnu | bsd visibility instead.
Other than that, libusb compiles.

CUPS builds for the most part; in ppdc, genstrings segfaults (haven't
built gdb, can't say what the issue is). make || make would finish,
though...
It _partly_ passes make -i test; I attached the logs it generated. CUPS
wants -D_BSD_SOURCE (some implicit definitions).





[-- Attachment #2: libusb-timespec.diff --]
[-- Type: text/plain, Size: 416 bytes --]

--- libusb-1.0.9/libusb/io.c
+++ libusb-1.0.9-musl/libusb/io.c
@@ -36,6 +36,17 @@
 
 #include "libusbi.h"
 
+/*
+ * Android and musl, at least, don't provide this macro
+ */
+#ifndef TIMESPEC_TO_TIMEVAL
+#define TIMESPEC_TO_TIMEVAL(tv, ts)		\
+do {						\
+	(tv)->tv_sec = (ts)->tv_sec;		\
+	(tv)->tv_usec = (ts)->tv_nsec /	1000;	\
+} while (0)
+#endif
+
 /**
  * \page io Synchronous and asynchronous device I/O
  *

[-- Attachment #3: cups-log.htm --]
[-- Type: text/html, Size: 106224 bytes --]