usb 2.0.0-alpha.1 → 2.0.3

package/libusb/android/README

@@ -24,8 +24,10 @@ The libusb library, examples and tests can then be found in:
 Where $ARCH is one of:
     armeabi
     armeabi-v7a
+    mips
+    mips64
     x86
-
+    x86_64
 
 Installing:
 -----------
@@ -62,7 +64,7 @@ image of a running device:
     # Install libusb
     adb push obj/local/armeabi/libusb1.0.so /sdcard/
     adb shell su -c "cat > /system/lib/libusb1.0.so < /sdcard/libusb1.0.so"
-    adb shell rm /system/lib/libusb1.0.so
+    adb shell rm /sdcard/libusb1.0.so
 
     # Install the samples and tests
     for B in listdevs fxload xusb sam3u_benchmark hotplugtest stress

package/libusb/android/config.h

@@ -26,9 +26,6 @@
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #define HAVE_DLFCN_H 1
 
-/* Define to 1 if you have the `gettimeofday' function. */
-#define HAVE_GETTIMEOFDAY 1
-
 /* Define to 1 if you have the <inttypes.h> header file. */
 #define HAVE_INTTYPES_H 1
 
@@ -53,9 +50,6 @@
 /* Define to 1 if you have the <poll.h> header file. */
 #define HAVE_POLL_H 1
 
-/* Define to 1 if you have the <signal.h> header file. */
-#define HAVE_SIGNAL_H 1
-
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #define HAVE_SYS_STAT_H 1
 

package/libusb/appveyor.yml

@@ -0,0 +1,41 @@
+version: 1.0.{build}
+configuration:
+- Debug
+- Release
+platform:
+- x64
+- Win32
+build:
+  project: msvc\libusb_2013.sln
+  parallel: true
+  verbosity: detailed
+environment:
+  matrix:
+  - libusb_2015: msvc\libusb_2015.sln
+    libusb_2013: msvc\libusb_2013.sln
+    libusb_2012: msvc\libusb_2012.sln
+    libusb_2010: msvc\libusb_2010.sln
+install:
+
+- cmd: >-
+    rem Copying libusb to cygwin home directory
+
+    xcopy /S C:\projects\libusb C:\cygwin\home\appveyor\
+
+    rem Copying libusb to MinGW home directory
+
+    xcopy /S C:\projects\libusb C:\msys64\home\appveyor\
+
+build_script:
+- cmd: >-
+    msbuild %libusb_2015% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+
+    msbuild %libusb_2013% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+
+    msbuild %libusb_2012% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+
+    msvc/appveyor.bat
+
+    appveyor_minGW.bat
+
+    appveyor_cygwin.bat

package/libusb/appveyor_cygwin.bat

@@ -0,0 +1,11 @@
+echo on
+SetLocal EnableDelayedExpansion
+
+if [%Configuration%] NEQ [Release] exit 0
+if [%Platform%] NEQ [Win32] exit 0
+
+C:\cygwin\bin\bash -e -l -c "./bootstrap.sh" || exit /B
+C:\cygwin\bin\bash -e -l -c "mkdir build-Win32-cygwin" || exit /B
+C:\cygwin\bin\bash -e -l -c "cd build-Win32-cygwin && ../configure --enable-examples-build --enable-tests-build" || exit /B
+C:\cygwin\bin\bash -e -l -c "cd build-Win32-cygwin && make -j4" || exit /B
+C:\cygwin\bin\bash -e -l -c "cd build-Win32-cygwin && make install" || exit /B

package/libusb/appveyor_minGW.bat

@@ -0,0 +1,19 @@
+echo on
+SetLocal EnableDelayedExpansion
+
+if [%Configuration%] NEQ [Release] exit 0
+
+if [%Platform%] NEQ [x64] goto Win32
+C:\msys64\usr\bin\bash -e -l -c "./bootstrap.sh" || exit /B
+C:\msys64\usr\bin\bash -e -l -c "mkdir build-x64" || exit /B
+C:\msys64\usr\bin\bash -e -l -c "cd build-x64 && ../configure --prefix=/mingw64 --build=x86_64-w64-mingw32 --host=x86_64-w64-mingw32" || exit /B
+C:\msys64\usr\bin\bash -e -l -c "cd build-x64 && make -j4" || exit /B
+C:\msys64\usr\bin\bash -e -l -c "cd build-x64 && make install" || exit /B
+
+:Win32
+if [%Platform%] NEQ [Win32] exit 0
+C:\msys64\usr\bin\bash -e -l -c "./bootstrap.sh" || exit /B
+C:\msys64\usr\bin\bash -e -l -c "mkdir build-Win32" || exit /B
+C:\msys64\usr\bin\bash -e -l -c "cd build-Win32 && ../configure --prefix=/mingw32 --build=i686-w64-mingw32 --host=i686-w64-mingw32" || exit /B
+C:\msys64\usr\bin\bash -e -l -c "cd build-Win32 && make -j4" || exit /B
+C:\msys64\usr\bin\bash -e -l -c "cd build-Win32 && make install" || exit /B

package/libusb/autogen.sh

@@ -4,5 +4,5 @@ set -e
 
 ./bootstrap.sh
 if test -z "$NOCONFIGURE"; then
-    exec ./configure --enable-maintainer-mode --enable-examples-build --enable-tests-build "$@"
+    exec ./configure --enable-examples-build --enable-tests-build "$@"
 fi

package/libusb/bootstrap.sh

@@ -1,19 +1,6 @@
 #!/bin/sh
 
-set -e
-
-# use libtoolize if available, otherwise look for glibtoolize (darwin)
-if (libtoolize --version) < /dev/null > /dev/null 2>&1; then
-  LIBTOOLIZE=libtoolize
-elif (glibtoolize --version) < /dev/null > /dev/null 2>&1; then
-  LIBTOOLIZE=glibtoolize
-else
-  echo "libtoolize or glibtoolize was not found! Please install libtool." 1>&2
-  exit 1
+if ! test -d m4 ; then
+    mkdir m4
 fi
-
-$LIBTOOLIZE --copy --force || exit 1
-aclocal || exit 1
-autoheader || exit 1
-autoconf || exit 1
-automake -a -c || exit 1
+autoreconf -ivf || exit 1

package/libusb/configure.ac

@@ -21,21 +21,21 @@ AC_INIT([libusb],[LIBUSB_MAJOR[.]LIBUSB_MINOR[.]LIBUSB_MICRO[]LIBUSB_RC],[libusb
 # These numbers should be tweaked on every release. Read carefully:
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
 # http://sourceware.org/autobook/autobook/autobook_91.html
-lt_current="1"
-lt_revision="0"
-lt_age="1"
+lt_current=2
+lt_revision=0
+lt_age=2
 LTLDFLAGS="-version-info ${lt_current}:${lt_revision}:${lt_age}"
 
 AM_INIT_AUTOMAKE
-AM_MAINTAINER_MODE
 
 AC_CONFIG_SRCDIR([libusb/core.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
-AC_PREREQ([2.50])
+AC_PREREQ([2.69])
 AC_PROG_CC
+AC_PROG_CXX
 LT_INIT
 LT_LANG([Windows Resource])
 AC_C_INLINE
@@ -50,87 +50,87 @@ dnl on linux-android platform, some functions are in different places
 case $host in
 *-linux-android*)
 	AC_MSG_RESULT([This is a Linux-Android system])
-	is_backend_android="yes"
+	is_backend_android=yes
 	;;
 *)
-	is_backend_android="no"
+	is_backend_android=no
 esac
 
 case $host in
 *-linux* | *-uclinux*)
 	AC_MSG_RESULT([Linux])
-	backend="linux"
-	threads="posix"
+	backend=linux
+	threads=posix
 	;;
 *-darwin*)
 	AC_MSG_RESULT([Darwin/Mac OS X])
-	backend="darwin"
-	threads="posix"
+	backend=darwin
+	threads=posix
 	;;
 *-openbsd*)
 	AC_MSG_RESULT([OpenBSD])
-	backend="openbsd"
-	threads="posix"
+	backend=openbsd
+	threads=posix
 	;;
 *-netbsd*)
 	AC_MSG_RESULT([NetBSD])
-	backend="netbsd"
-	threads="posix"
+	backend=netbsd
+	threads=posix
 	;;
-*-mingw*)
+*-mingw* | *msys*)
 	AC_MSG_RESULT([Windows])
-	backend="windows"
-	threads="windows"
-	create_import_lib="yes"
+	backend=windows
+	threads=windows
+	create_import_lib=yes
 	AM_CFLAGS="${AM_CFLAGS} -fno-omit-frame-pointer"
 	;;
 *-cygwin*)
 	AC_MSG_RESULT([Cygwin (using Windows backend)])
-	backend="windows"
-	threads="posix"
+	backend=windows
+	threads=posix
+	;;
+*-haiku*)
+	AC_MSG_RESULT([Haiku])
+	backend=haiku
+	threads=posix
+	;;
+*-solaris*)
+	AC_MSG_RESULT([SunOS])
+	backend=sunos
+	threads=posix
 	;;
 *)
-	AC_MSG_ERROR([unsupported operating system])
+	AC_MSG_ERROR([unsupported operating system $host])
 esac
 
 case $backend in
 linux)
 	AC_DEFINE(OS_LINUX, 1, [Linux backend])
 	AC_SUBST(OS_LINUX)
-	AC_SEARCH_LIBS(clock_gettime, rt, [], [], -pthread)
+	AC_SEARCH_LIBS([clock_gettime], [rt], [], [], [-pthread])
 	AC_ARG_ENABLE([udev],
 		[AC_HELP_STRING([--enable-udev], [use udev for device enumeration and hotplug support (recommended) [default=yes]])],
-		[], [enable_udev="yes"])
-		if test "x$enable_udev" = "xyes" ; then
+		[], [enable_udev=yes])
+		if test "x$enable_udev" = xyes ; then
 			# system has udev. use it or fail!
-			AC_CHECK_HEADERS([libudev.h],[],[AC_ERROR(["udev support requested but libudev not installed"])])
-			AC_CHECK_LIB([udev], [udev_new], [], [AC_ERROR(["udev support requested but libudev not installed"])])
+			AC_CHECK_HEADERS([libudev.h], [], [AC_MSG_ERROR([udev support requested but libudev header not installed])])
+			AC_CHECK_LIB([udev], [udev_new], [], [AC_MSG_ERROR([udev support requested but libudev not installed])])
 			AC_DEFINE(USE_UDEV, 1, [Use udev for device enumeration/hotplug])
 		else
-			AC_CHECK_HEADERS([asm/types.h sys/socket.h], [], [])
-			AC_CHECK_HEADERS([linux/netlink.h linux/filter.h], [], [AC_ERROR(["Linux netlink headers not found"])], [
+			AC_CHECK_HEADERS([asm/types.h], [], [])
+			AC_CHECK_HEADERS([sys/socket.h linux/netlink.h], [], [AC_MSG_ERROR([Linux netlink headers not found])], [
 #ifdef HAVE_ASM_TYPES_H
 #include <asm/types.h>
 #endif
-#ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
-#endif
 ])
 		fi
 		AC_SUBST(USE_UDEV)
 
-case $is_backend_android in
-yes)
-	dnl some pthread functions is in libc
-	THREAD_CFLAGS="-c"
-	LIBS="${LIBS} -c"
-	dnl there are gettimeofday function but configure doesn't seem to be able to find it.
-	AC_DEFINE([HAVE_GETTIMEOFDAY], [1], [Define if you have gettimeofday])
-	;;
-*)
-	THREAD_CFLAGS="-pthread"
-	LIBS="${LIBS} -pthread"
-esac
+	if test "x$is_backend_android" != xyes; then
+		THREAD_CFLAGS="-pthread"
+		LIBS="${LIBS} -pthread"
+	fi
 
 	AC_CHECK_HEADERS([poll.h])
 	AC_DEFINE([POLL_NFDS_TYPE],[nfds_t],[type of second poll() argument])
@@ -154,6 +154,14 @@ openbsd)
 	AC_CHECK_HEADERS([poll.h])
 	AC_DEFINE([POLL_NFDS_TYPE],[nfds_t],[type of second poll() argument])
 	;;
+sunos)
+	AC_DEFINE(OS_SUNOS, 1, [SunOS backend])
+	AC_SUBST(OS_SUNOS)
+	THREAD_CFLAGS="-pthread"
+	LIBS="-pthread -ldevinfo"
+	AC_CHECK_HEADERS([poll.h])
+	AC_DEFINE([POLL_NFDS_TYPE],[nfds_t],[type of second poll() argument])
+	;;
 netbsd)
 	AC_DEFINE(OS_NETBSD, 1, [NetBSD backend])
 	AC_SUBST(OS_NETBSD)
@@ -169,6 +177,14 @@ windows)
 	LTLDFLAGS="${LTLDFLAGS} -avoid-version -Wl,--add-stdcall-alias"
 	AC_DEFINE([POLL_NFDS_TYPE],[unsigned int],[type of second poll() argument])
 	AC_DEFINE([WINVER], 0x0501, [Oldest Windows version supported])
+	AC_DEFINE([_WIN32_WINNT], 0x0501, [Oldest Windows version supported])
+	;;
+haiku)
+	AC_DEFINE(OS_HAIKU, 1, [Haiku backend])
+	AC_SUBST(OS_HAIKU)
+	LIBS="${LIBS} -lbe"
+	AC_CHECK_HEADERS([poll.h])
+	AC_DEFINE([POLL_NFDS_TYPE],[nfds_t],[type of second poll() argument])
 	;;
 esac
 
@@ -177,12 +193,14 @@ AC_SUBST(LIBS)
 AM_CONDITIONAL(OS_LINUX, test "x$backend" = xlinux)
 AM_CONDITIONAL(OS_DARWIN, test "x$backend" = xdarwin)
 AM_CONDITIONAL(OS_OPENBSD, test "x$backend" = xopenbsd)
+AM_CONDITIONAL(OS_SUNOS, test "x$backend" = xsunos)
 AM_CONDITIONAL(OS_NETBSD, test "x$backend" = xnetbsd)
 AM_CONDITIONAL(OS_WINDOWS, test "x$backend" = xwindows)
+AM_CONDITIONAL(OS_HAIKU, test "x$backend" = xhaiku)
 AM_CONDITIONAL(THREADS_POSIX, test "x$threads" = xposix)
-AM_CONDITIONAL(CREATE_IMPORT_LIB, test "x$create_import_lib" = "xyes")
+AM_CONDITIONAL(CREATE_IMPORT_LIB, test "x$create_import_lib" = xyes)
 AM_CONDITIONAL(USE_UDEV, test "x$enable_udev" = xyes)
-if test "$threads" = posix; then
+if test "x$threads" = xposix; then
 	AC_DEFINE(THREADS_POSIX, 1, [Use POSIX Threads])
 fi
 
@@ -191,22 +209,22 @@ AC_CHECK_HEADER([sys/timerfd.h], [timerfd_h=1], [timerfd_h=0])
 AC_ARG_ENABLE([timerfd],
 	[AS_HELP_STRING([--enable-timerfd],
 		[use timerfd for timing [default=auto]])],
-	[use_timerfd=$enableval], [use_timerfd='auto'])
+	[use_timerfd=$enableval], [use_timerfd=auto])
 
-if test "x$use_timerfd" = "xyes" -a "x$timerfd_h" = "x0"; then
+if test "x$use_timerfd" = xyes -a "x$timerfd_h" = x0; then
 	AC_MSG_ERROR([timerfd header not available; glibc 2.9+ required])
 fi
 
-AC_CHECK_DECL([TFD_NONBLOCK], [tfd_hdr_ok=yes], [tfd_hdr_ok=no], [#include <sys/timerfd.h>])
-if test "x$use_timerfd" = "xyes" -a "x$tfd_hdr_ok" = "xno"; then
+AC_CHECK_DECLS([TFD_NONBLOCK, TFD_CLOEXEC], [tfd_hdr_ok=yes], [tfd_hdr_ok=no], [#include <sys/timerfd.h>])
+if test "x$use_timerfd" = xyes -a "x$tfd_hdr_ok" = xno; then
 	AC_MSG_ERROR([timerfd header not usable; glibc 2.9+ required])
 fi
 
 AC_MSG_CHECKING([whether to use timerfd for timing])
-if test "x$use_timerfd" = "xno"; then
+if test "x$use_timerfd" = xno; then
 	AC_MSG_RESULT([no (disabled by user)])
 else
-	if test "x$timerfd_h" = "x1" -a "x$tfd_hdr_ok" = "xyes"; then
+	if test "x$timerfd_h" = x1 -a "x$tfd_hdr_ok" = xyes; then
 		AC_MSG_RESULT([yes])
 		AC_DEFINE(USBI_TIMERFD_AVAILABLE, 1, [timerfd headers available])
 	else
@@ -214,52 +232,60 @@ else
 	fi
 fi
 
-AC_CHECK_TYPES(struct timespec)
+AC_CHECK_FUNCS([pipe2])
+AC_CHECK_TYPES([struct timespec])
 
 # Message logging
 AC_ARG_ENABLE([log], [AS_HELP_STRING([--disable-log], [disable all logging])],
 	[log_enabled=$enableval],
-	[log_enabled='yes'])
-if test "x$log_enabled" != "xno"; then
+	[log_enabled=yes])
+if test "x$log_enabled" != xno; then
 	AC_DEFINE([ENABLE_LOGGING], 1, [Message logging])
 fi
 
 AC_ARG_ENABLE([debug-log], [AS_HELP_STRING([--enable-debug-log],
 	[start with debug message logging enabled [default=no]])],
 	[debug_log_enabled=$enableval],
-	[debug_log_enabled='no'])
-if test "x$debug_log_enabled" != "xno"; then
+	[debug_log_enabled=no])
+if test "x$debug_log_enabled" != xno; then
 	AC_DEFINE([ENABLE_DEBUG_LOGGING], 1, [Start with debug message logging enabled])
 fi
 
 AC_ARG_ENABLE([system-log], [AS_HELP_STRING([--enable-system-log],
 	[output logging messages to system wide log, if supported by the OS [default=no]])],
 	[system_log_enabled=$enableval],
-	[system_log_enabled='no'])
-if test "x$system_log_enabled" != "xno"; then
+	[system_log_enabled=no])
+if test "x$system_log_enabled" != xno; then
 	AC_DEFINE([USE_SYSTEM_LOGGING_FACILITY], 1, [Enable output to system log])
-fi
 
-# Check if syslog is available in standard C library
-AC_CHECK_HEADERS(syslog.h)
-AC_CHECK_FUNC([syslog], [have_syslog=yes], [have_syslog=no])
-if test "x$have_syslog" != "xno"; then
-	AC_DEFINE([HAVE_SYSLOG_FUNC], 1, [syslog() function available])
+	# Check if syslog is available in standard C library
+	AC_CHECK_HEADERS(syslog.h)
+	AC_CHECK_FUNC([syslog], [have_syslog=yes], [have_syslog=no])
+	if test "x$have_syslog" != xno; then
+		AC_DEFINE([HAVE_SYSLOG_FUNC], 1, [syslog() function available])
+	fi
 fi
 
 # Examples build
 AC_ARG_ENABLE([examples-build], [AS_HELP_STRING([--enable-examples-build],
 	[build example applications [default=no]])],
 	[build_examples=$enableval],
-	[build_examples='no'])
-AM_CONDITIONAL([BUILD_EXAMPLES], [test "x$build_examples" != "xno"])
+	[build_examples=no])
+AM_CONDITIONAL(BUILD_EXAMPLES, test "x$build_examples" != xno)
 
 # Tests build
 AC_ARG_ENABLE([tests-build], [AS_HELP_STRING([--enable-tests-build],
 	[build test applications [default=no]])],
 	[build_tests=$enableval],
-	[build_tests='no'])
-AM_CONDITIONAL([BUILD_TESTS], [test "x$build_tests" != "xno"])
+	[build_tests=no])
+AM_CONDITIONAL(BUILD_TESTS, test "x$build_tests" != xno)
+
+# headers not available on all platforms but required on others
+AC_CHECK_HEADERS([sys/time.h])
+
+# sigaction not available on MinGW
+AC_CHECK_FUNC([sigaction], [have_sigaction=yes], [have_sigaction=no])
+AM_CONDITIONAL(HAVE_SIGACTION, test "x$have_sigaction" = xyes)
 
 # check for -fvisibility=hidden compiler support (GCC >= 3.4)
 saved_cflags="$CFLAGS"
@@ -267,9 +293,9 @@ saved_cflags="$CFLAGS"
 CFLAGS="$CFLAGS -Werror -fvisibility=hidden"
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
 	[VISIBILITY_CFLAGS="-fvisibility=hidden"
-	 AC_DEFINE([DEFAULT_VISIBILITY], [__attribute__((visibility("default")))], [Default visibility]) ],
-	[ VISIBILITY_CFLAGS=""
-	 AC_DEFINE([DEFAULT_VISIBILITY], [], [Default visibility]) ],
+	 AC_DEFINE([DEFAULT_VISIBILITY], [__attribute__((visibility("default")))], [Default visibility])],
+	[VISIBILITY_CFLAGS=""
+	 AC_DEFINE([DEFAULT_VISIBILITY], [], [Default visibility])],
 	])
 CFLAGS="$saved_cflags"
 
@@ -280,16 +306,18 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
 	nopointersign_cflags="-Wno-pointer-sign", nopointersign_cflags="")
 CFLAGS="$saved_cflags"
 
-# sigaction not available on MinGW
-AC_CHECK_FUNC([sigaction], [have_sigaction=yes], [have_sigaction=no])
-AM_CONDITIONAL([HAVE_SIGACTION], [test "x$have_sigaction" = "xyes"])
-
-# headers not available on all platforms but required on others
-AC_CHECK_HEADERS([sys/time.h])
-AC_CHECK_FUNCS(gettimeofday)
-AC_CHECK_HEADERS([signal.h])
+# check for -std=gnu99 compiler support
+saved_cflags="$CFLAGS"
+CFLAGS="-std=gnu99"
+AC_MSG_CHECKING([whether CC supports -std=gnu99])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
+    [AC_MSG_RESULT([yes])]
+    [AM_CFLAGS="${AM_CFLAGS} -std=gnu99"],
+    [AC_MSG_RESULT([no])]
+)
+CFLAGS="$saved_cflags"
 
-AM_CFLAGS="${AM_CFLAGS} -std=gnu99 -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration $nopointersign_cflags -Wshadow ${THREAD_CFLAGS} ${VISIBILITY_CFLAGS}"
+AM_CFLAGS="${AM_CFLAGS} -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration $nopointersign_cflags -Wshadow ${THREAD_CFLAGS} ${VISIBILITY_CFLAGS}"
 
 AC_SUBST(AM_CFLAGS)
 AC_SUBST(LTLDFLAGS)