libusb 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a323911f22d29001f0bdaed5089d90534b903af
-  data.tar.gz: 624b66bef86b1b8e24ecd758b342d7b46ad07833
+  metadata.gz: a70a49c54714bfac3447b6dea8c1d93e6921985c
+  data.tar.gz: 54d453912040ca5b2c65e1b6aa129ce9b2b559c6
 SHA512:
-  metadata.gz: 62d1be44bfc72a157ed62e5bc8dc8cf3f7cfbff46452e9b226d0ef20ec131956457e401d6559d74af24887cbaea4816d5ec7f26e19524c89f58ecdf35b8fd450
-  data.tar.gz: 602b8d7783e54b93e09aa99ea17416e4b27247aec33d4875311b4be5a6b053d623f25e66de8426fde949934c62c4b17dc83cdfef7f9a80abc952f27f659ef363
+  metadata.gz: 3a0e00959b7d17f590d8ffc8708f6cf5da93d365efb922a668135047650a8278f77dcb8484066def32af7237dc90a02a24d1d1b9cb280cbb9d21f3d7399f2be4
+  data.tar.gz: d4518a07a200486947377e19a69a4710bc83dae8d088d1ba4fe336f0d917876eb5c4d9560decef13b1aac9f8d6efc961faf58a57f9a1c6f51f0559f9b755e7ac

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
+sudo: false
 rvm:
   - "1.8.7"
   - "1.9.3"

data/History.md

@@ -1,3 +1,11 @@
+0.5.1 / 2015-09-29
+------------------
+* Add ability to force use of the system or builtin libusb-1.0 library.
+    Use: gem install libusb -- --enable-system-libusb / --disable-system-libusb
+* Update to libusb-1.0.20.
+* Build Windows binary gems per rake-compiler-dock.
+* Fix memory leak in Context#pollfds and use libusb_free_pollfds() if available.
+
 0.5.0 / 2015-01-08
 ------------------
 * Add support for BOS describtors of libusb-1.0.16

data/README.md

@@ -1,6 +1,6 @@
 <!-- -*- coding: utf-8 -*- -->
 
-[![Build Status](https://travis-ci.org/larskanis/libusb.png?branch=debug_travis)](https://travis-ci.org/larskanis/libusb)
+[![Build Status](https://travis-ci.org/larskanis/libusb.svg)](https://travis-ci.org/larskanis/libusb)
 
 Access USB devices from Ruby
 ============================
@@ -89,6 +89,7 @@ If none could be found, a bundled libusb version is built and used, instead.
 Latest code can be used in this way:
 
     $ git clone git://github.com/larskanis/libusb.git
+    $ bundle
     $ rake install_gem
 
 Device hotplug support
@@ -117,21 +118,10 @@ systems.
 Cross compiling for Windows
 ---------------------------
 
-Libusb-gem can be build on a linux or darwin host for the win32 platform,
-using the mingw cross compiler collection. Libusb is downloaded from source
-git repo, cross compiled and included in the generated libusb.gem.
+Libusb-gem can be cross built for the win32 platform, using the [rake-compiler-dock](https://github.com/larskanis/rake-compiler-dock) .
+Just run:
 
-Install mingw32. On a debian based system this should work:
-
-    $ apt-get install mingw32
-
-On MacOS X, if you have MacPorts installed:
-
-    $ port install i386-mingw32-gcc
-
-Download and cross compile libusb for win32:
-
-    $ rake cross gem
+    $ rake gem:windows
 
 If everything works, there should be `libusb-VERSION-x86-mingw32.gem` in the pkg
 directory.

data/Rakefile

@@ -7,25 +7,32 @@ require 'pathname'
 require 'uri'
 require 'ostruct'
 require 'rake/clean'
+require 'rake_compiler_dock'
 
 task :gem => :build
 task :compile do
   sh "ruby ext/extconf.rb"
 end
+
 task :test=>:compile do
   sh "ruby -w -W2 -I. -Ilib -e \"#{Dir["test/test_*.rb"].map{|f| "require '#{f}';"}.join}\" -- -v"
 end
+
 travis_tests = %w[test_libusb_capability.rb test_libusb_structs.rb test_libusb_version.rb]
 task :travis=>:compile do
   sh "ruby -w -W2 -I. -Ilib -e \"#{travis_tests.map{|f| "require 'test/#{f}';"}.join}\" -- -v"
 end
 task :default => :test
 
+task 'gem:windows' do
+  RakeCompilerDock.sh "bundle && rake cross gem"
+end
+
 COMPILE_HOME               = Pathname( "./tmp" ).expand_path
 STATIC_SOURCESDIR          = COMPILE_HOME + 'sources'
 
 # Fetch tarball from sourceforge
-LIBUSB_VERSION            = ENV['LIBUSB_VERSION'] || '1.0.19'
+LIBUSB_VERSION            = ENV['LIBUSB_VERSION'] || '1.0.20'
 LIBUSB_SOURCE_URI         = URI( "http://downloads.sourceforge.net/project/libusb/libusb-1.0/libusb-#{LIBUSB_VERSION}/libusb-#{LIBUSB_VERSION}.tar.bz2" )
 LIBUSB_TARBALL            = STATIC_SOURCESDIR + File.basename( LIBUSB_SOURCE_URI.path )
 

data/ext/extconf.rb

@@ -7,27 +7,58 @@ if RUBY_PLATFORM =~ /java/
   # JRuby's C extension support is disabled by default, so we can not easily test
   # for udev availability and therefore suppose to have none.
   have_udev = false
+
+  # Implement very simple verions of mkmf-helpers used below
+  def enable_config(name, default=nil)
+    if ARGV.include?("--enable-#{name}")
+      true
+    elsif ARGV.include?("--disable-#{name}")
+      false
+    else
+      default
+    end
+  end
+
+  def arg_config(name)
+    ARGV.include?(name)
+  end
 else
   require 'mkmf'
   have_udev = true
 end
 
+def do_help
+  print <<HELP
+usage: ruby #{$0} [options]
+
+    --enable-system-libusb / --disable-system-libusb
+      Force use of system or builtin libusb library.
+      Default is to prefer system libraries and fallback to builtin.
+HELP
+  exit! 0
+end
+
+do_help if arg_config('--help')
 
-begin
-  module LibTest
-    extend FFI::Library
+def libusb_usable?
+  begin
+    Module.new do
+      extend FFI::Library
 
-    root_path = File.expand_path("../..", __FILE__)
-    ext = FFI::Platform::LIBSUFFIX
-    prefix = FFI::Platform::LIBPREFIX.empty? ? 'lib' : FFI::Platform::LIBPREFIX
-    bundled_dll = File.join(root_path, "lib/#{prefix}usb-1.0.#{ext}")
-    bundled_dll_cygwin = File.join(root_path, "bin/#{prefix}usb-1.0.#{ext}")
-    ffi_lib(["#{prefix}usb-1.0", bundled_dll, bundled_dll_cygwin])
+      root_path = File.expand_path("../..", __FILE__)
+      ext = FFI::Platform::LIBSUFFIX
+      prefix = FFI::Platform::LIBPREFIX.empty? ? 'lib' : FFI::Platform::LIBPREFIX
+      bundled_dll = File.join(root_path, "lib/#{prefix}usb-1.0.#{ext}")
+      bundled_dll_cygwin = File.join(root_path, "bin/#{prefix}usb-1.0.#{ext}")
+      ffi_lib(["#{prefix}usb-1.0", bundled_dll, bundled_dll_cygwin])
+    end
+    true
+  rescue LoadError
+    false
   end
-rescue LoadError
-  # Unable to load libusb library on this system,
-  # so we build our bundled version:
+end
 
+def build_bundled_libusb(have_udev)
   libusb_dir = Dir[File.expand_path('../../ext/libusb-*', __FILE__)].first
   root_dir = File.expand_path('../..', __FILE__)
   raise "could not find embedded libusb sources" unless libusb_dir
@@ -47,6 +78,12 @@ rescue LoadError
   Dir.chdir old_dir
 end
 
+unless enable_config('system-libusb', libusb_usable?)
+  # Unable to load libusb library on this system,
+  # so we build our bundled version:
+  build_bundled_libusb(have_udev)
+end
+
 File.open("Makefile", "w") do |mf|
   mf.puts "# Dummy makefile since libusb-1.0 is usable on this system"
   mf.puts "all install::\n"

data/ext/{libusb-1.0.19 → libusb-1.0.20}/AUTHORS

@@ -8,20 +8,22 @@ Copyright © 2010-2012 Michael Plante <michael.plante@gmail.com>
 Copyright © 2011-2013 Hans de Goede <hdegoede@redhat.com>
 Copyright © 2012-2013 Martin Pieuchot <mpi@openbsd.org>
 Copyright © 2012-2013 Toby Gray <toby.gray@realvnc.com>
+Copyright © 2013-2015 Chris Dickens <christopher.a.dickens@gmail.com>
 
 Other contributors:
+Akshay Jaggi
 Alan Ott
 Alan Stern
 Alex Vatchenko
 Andrew Fernandes
 Anthony Clay
+Antonio Ospite
 Artem Egorkine
 Aurelien Jarno
 Bastien Nocera
 Bei Zhang
 Benjamin Dobell
 Carl Karsten
-Chris Dickens
 Colin Walters
 Dave Camarillo
 David Engraf
@@ -32,6 +34,7 @@ Felipe Balbi
 Florian Albrechtskirchinger
 Francesco Montorsi
 Francisco Facioni
+Gaurav Gupta
 Graeme Gill
 Gustavo Zacarias
 Hans Ulrich Niedermann
@@ -48,7 +51,9 @@ Kuangye Guo
 Lars Kanis
 Lars Wirzenius
 Luca Longinotti
+Marcus Meissner
 Markus Heidelberg
+Martin Ettl
 Martin Koegler
 Matthias Bolte
 Mike Frysinger
@@ -64,15 +69,21 @@ Rob Walker
 Sean McBride
 Sebastian Pipping
 Simon Haggett
+Simon Newton
 Thomas Röfer
+Tim Hutt
 Tim Roberts
+Tobias Klauser
 Toby Peterson
+Tormod Volden
 Trygve Laugstøl
 Uri Lublin
 Vasily Khoruzhick
 Vegard Storheil Eriksen
+Venkatesh Shukla
 Vitali Lovich
 Xiaofan Chen
 Zoltán Kovács
 Роман Донченко
+parafin
 xantares

data/ext/{libusb-1.0.19 → libusb-1.0.20}/ChangeLog

@@ -1,14 +1,30 @@
 For detailed information about the changes below, please see the git log or
 visit: http://log.libusb.info
 
+2015-09-13: v1.0.20
+* Add Haiku support
+* Fix multiple memory and resource leaks (#16, #52, #76, #81)
+* Fix possible deadlock when executing transfer callback
+* New libusb_free_pollfds() API
+* Darwin: Fix devices not being detected on OS X 10.8 (#48)
+* Linux: Allow larger isochronous transfer submission (#23)
+* Windows: Fix broken builds Cygwin/MinGW builds and compiler warnings
+* Windows: Fix broken bus number lookup
+* Windows: Improve submission of control requests for composite devices
+* Examples: Add two-stage load support to fxload (#12)
+* Correctly report cancellations due to timeouts
+* Improve efficiency of event handling
+* Improve speed of transfer submission in multi-threaded environments
+* Various other bug fixes and improvements
+The (#xx) numbers are libusb issue numbers, see ie:
+https://github.com/libusb/libusb/issues/16
+
 2014-05-30: v1.0.19
 * Add support for USB bulk streams on Linux and Mac OS X (#11)
 * Windows: Add AMD and Intel USB-3.0 root hub support
 * Windows: Fix USB 3.0 speed detection on Windows 8 or later (#10)
 * Added Russian translation for libusb_strerror strings
 * All: Various small fixes and cleanups
-The (#xx) numbers are libusb issue numbers, see ie:
-https://github.com/libusb/libusb/issues/11
 
 2014-01-25: v1.0.18
 * Fix multiple memory leaks

data/ext/{libusb-1.0.19 → libusb-1.0.20}/Makefile.in

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -81,12 +91,6 @@ host_triplet = @host@
 @BUILD_EXAMPLES_TRUE@am__append_1 = examples
 @BUILD_TESTS_TRUE@am__append_2 = tests
 subdir = .
-DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
-	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) \
-	$(srcdir)/config.h.in $(srcdir)/libusb-1.0.pc.in COPYING TODO \
-	compile config.guess config.sub depcomp install-sh missing \
-	ltmain.sh
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -94,6 +98,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/libusb/version.h $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(am__DIST_COMMON)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
@@ -186,6 +192,10 @@ ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
 DIST_SUBDIRS = libusb doc examples tests
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+	$(srcdir)/libusb-1.0.pc.in AUTHORS COPYING ChangeLog INSTALL \
+	NEWS README TODO compile config.guess config.sub depcomp \
+	install-sh ltmain.sh missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -278,6 +288,7 @@ NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OS_DARWIN = @OS_DARWIN@
+OS_HAIKU = @OS_HAIKU@
 OS_LINUX = @OS_LINUX@
 OS_NETBSD = @OS_NETBSD@
 OS_OPENBSD = @OS_OPENBSD@
@@ -347,6 +358,7 @@ psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
+subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
@@ -382,7 +394,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -635,15 +646,15 @@ dist-xz: distdir
 	$(am__post_remove_distdir)
 
 dist-tarZ: distdir
-	@echo WARNING: "Support for shar distribution archives is" \
-	               "deprecated." >&2
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__post_remove_distdir)
 
 dist-shar: distdir
-	@echo WARNING: "Support for distribution archives compressed with" \
-		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)
@@ -679,17 +690,17 @@ distcheck: dist
 	esac
 	chmod -R a-w $(distdir)
 	chmod u+w $(distdir)
-	mkdir $(distdir)/_build $(distdir)/_inst
+	mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
-	  && $(am__cd) $(distdir)/_build \
-	  && ../configure \
+	  && $(am__cd) $(distdir)/_build/sub \
+	  && ../../configure \
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	    --srcdir=.. --prefix="$$dc_install_base" \
+	    --srcdir=../.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
@@ -870,6 +881,8 @@ uninstall-am: uninstall-pkgconfigDATA
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
 	uninstall-am uninstall-pkgconfigDATA
 
+.PRECIOUS: Makefile
+
 
 .PHONY: dist-up
 dist-up: dist

data/ext/{libusb-1.0.19 → libusb-1.0.20}/README

@@ -2,9 +2,10 @@ libusb
 ======
 
 libusb is a library for USB device access from Linux, Mac OS X,
-Windows and OpenBSD/NetBSD userspace.
-It is written in C and licensed under the GNU Lesser General Public
-License version 2.1 or, at your option, any later version (see COPYING).
+Windows, OpenBSD/NetBSD and Haiku userspace.
+It is written in C (Haiku backend in C++) and licensed under the GNU
+Lesser General Public License version 2.1 or, at your option, any later
+version (see COPYING).
 
 libusb is abstracted internally in such a way that it can hopefully
 be ported to other operating systems. Please see the PORTING file
@@ -24,4 +25,5 @@ http://mailing-list.libusb.info
 - Xiaofan Chen <xiaofanc@gmail.com>
 - Ludovic Rousseau <ludovic.rousseau@gmail.com>
 - Nathan Hjelm <hjelmn@users.sourceforge.net>
+- Chris Dickens <christopher.a.dickens@gmail.com>
 (Please use the mailing list rather than mailing developers directly)