summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2016-07-05 22:20:47 -0700
committerMichael Forney <mforney@mforney.org>2016-07-05 22:20:47 -0700
commit9875c7b74f848734cdff95fa31f72839036c72d1 (patch)
tree1bc73d75b2fd2b4cec36d2c4a6ea189a6b4d46e0
parent1f2ec48c5ed889b95824913f62953c66937e42b4 (diff)
Add libusb 1.0.20
-rw-r--r--.gitmodules3
-rw-r--r--extra/gen.rc1
-rw-r--r--extra/libusb/.rev1
-rw-r--r--extra/libusb/config.h37
-rw-r--r--extra/libusb/gen.rc14
m---------extra/libusb/src0
6 files changed, 56 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index b7d9d76d..ed465d71 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -119,6 +119,9 @@
[submodule "extra/libnl/src"]
path = extra/libnl/src
url = https://github.com/thom311/libnl
+[submodule "extra/libusb/src"]
+ path = extra/libusb/src
+ url = https://github.com/libusb/libusb
[submodule "extra/msmtp/src"]
path = extra/msmtp/src
url = git://git.code.sf.net/p/msmtp/code
diff --git a/extra/gen.rc b/extra/gen.rc
index 9ab51afd..3e427067 100644
--- a/extra/gen.rc
+++ b/extra/gen.rc
@@ -4,6 +4,7 @@ subgen hostap
subgen libevent
subgen libfuse
subgen libnl
+subgen libusb
subgen msmtp
subgen pcre
subgen sshfs
diff --git a/extra/libusb/.rev b/extra/libusb/.rev
new file mode 100644
index 00000000..d00491fd
--- /dev/null
+++ b/extra/libusb/.rev
@@ -0,0 +1 @@
+1
diff --git a/extra/libusb/config.h b/extra/libusb/config.h
new file mode 100644
index 00000000..6d1b5963
--- /dev/null
+++ b/extra/libusb/config.h
@@ -0,0 +1,37 @@
+#include <config-posix.h>
+
+#define DEFAULT_VISIBILITY __attribute__((visibility("default")))
+/* #undef ENABLE_DEBUG_LOGGING */
+#define ENABLE_LOGGING 1
+#define HAVE_ASM_TYPES_H 1
+/* #undef HAVE_LIBUDEV */
+/* #undef HAVE_LIBUDEV_H */
+#define HAVE_LINUX_FILTER_H 1
+#define HAVE_LINUX_NETLINK_H 1
+#define HAVE_MEMORY_H 1
+#define HAVE_SYSLOG_FUNC 1
+#define LT_OBJDIR ".libs/"
+/* #undef OS_DARWIN */
+/* #undef OS_HAIKU */
+#define OS_LINUX 1
+/* #undef OS_NETBSD */
+/* #undef OS_OPENBSD */
+/* #undef OS_WINDOWS */
+#define PACKAGE "libusb"
+#define PACKAGE_BUGREPORT "libusb-devel@lists.sourceforge.net"
+#define PACKAGE_NAME "libusb"
+#define PACKAGE_STRING "libusb 1.0.20"
+#define PACKAGE_TARNAME "libusb"
+#define PACKAGE_URL "http://libusb.info"
+#define PACKAGE_VERSION "1.0.20"
+#define POLL_NFDS_TYPE nfds_t
+#define THREADS_POSIX 1
+#define USBI_TIMERFD_AVAILABLE 1
+/* #undef USE_SYSTEM_LOGGING_FACILITY */
+/* #undef USE_UDEV */
+#define VERSION "1.0.20"
+/* #undef WINVER */
+#define _GNU_SOURCE 1
+#ifndef __cplusplus
+/* #undef inline */
+#endif
diff --git a/extra/libusb/gen.rc b/extra/libusb/gen.rc
new file mode 100644
index 00000000..44dee5d3
--- /dev/null
+++ b/extra/libusb/gen.rc
@@ -0,0 +1,14 @@
+cflags\
+ -I include\
+ -I '$dir' \
+ -I '$srcdir'/libusb
+
+build '$outdir'/include/libusb.h copy '$srcdir'/libusb/libusb.h
+phony headers include/libusb.h
+
+lib libusb-1.0.a libusb/^(\
+ core.c descriptor.c hotplug.c io.c strerror.c sync.c\
+ os/^(poll_posix.c threads_posix.c linux_usbfs.c linux_netlink.c)\
+)
+
+fetch git
diff --git a/extra/libusb/src b/extra/libusb/src
new file mode 160000
+Subproject b5991a9e02e59a842a8ea2e0235cf319f2ec6cd