Update libusb 1.0.9 to libusbx 1.0.16

third_party/libusb/libusb.gyp

Index: third_party/libusb/libusb.gyp
diff --git a/third_party/libusb/libusb.gyp b/third_party/libusb/libusb.gyp
index 46e9e6f7ae98d3f092865dd21d8d4dd951a6eb05..f769ff13259190769dc42d44ac9b9e9779937ce9 100644
--- a/third_party/libusb/libusb.gyp
+++ b/third_party/libusb/libusb.gyp
@@ -9,15 +9,18 @@
       'type': 'static_library',
       'sources': [
         'src/config.h',
-        'src/libusb/libusb.h',
-        'src/libusb/libusbi.h',
         'src/libusb/core.c',
         'src/libusb/descriptor.c',
+        'src/libusb/hotplug.c',
+        'src/libusb/hotplug.h',
+        'src/libusb/interrupt.c',
+        'src/libusb/interrupt.h',
         'src/libusb/io.c',
+        'src/libusb/libusb.h',
+        'src/libusb/libusbi.h',
         'src/libusb/sync.c',
         'src/libusb/version.h',
-        'src/libusb/interrupt.c',

[pfeldman, 2013/07/19 06:47:23]

There is no interrupt neither in libusb 1.0.9 not in libusbx 1.0.16

[pfeldman, 2013/07/19 08:32:15]

Oh, I now see that you've already landed it. lgtm then.

-        'src/libusb/interrupt.h',
+        'src/libusb/version_nano.h',
       ],
       'include_dirs': [
         'src',
@@ -30,10 +33,9 @@
         ],
       },
       'conditions': [
-        [ 'OS == "linux" or OS == "android"', {
+        [ 'OS == "linux" or OS == "android" or OS == "mac"', {
           'sources': [
-            'src/libusb/os/linux_usbfs.c',
-            'src/libusb/os/linux_usbfs.h',
+            'src/libusb/os/poll_posix.c',
             'src/libusb/os/poll_posix.h',
             'src/libusb/os/threads_posix.c',
             'src/libusb/os/threads_posix.h',
@@ -43,19 +45,40 @@
             'HAVE_GETTIMEOFDAY=1',
             'HAVE_POLL_H=1',
             'HAVE_SYS_TIME_H=1',
-            'LIBUSB_DESCRIBE="1.0.9"',
-            'OS_LINUX=1',
+            'LIBUSB_DESCRIBE="1.0.16"',
             'POLL_NFDS_TYPE=nfds_t',
             'THREADS_POSIX=1',
+          ],
+        }],
+        [ 'OS == "linux" or OS == "android"', {
+          'sources': [
+            'src/libusb/os/linux_udev.c',
+            'src/libusb/os/linux_usbfs.c',
+            'src/libusb/os/linux_usbfs.h',
+          ],
+          'defines': [
+            'HAVE_LIBUDEV=1',
+            'OS_LINUX=1',
+            'USE_UDEV=1',
             '_GNU_SOURCE=1',
           ],
         }],
-        ['OS == "win"', {
+        [ 'OS == "mac"', {
+          'sources': [
+            'src/libusb/os/darwin_usb.c',
+            'src/libusb/os/darwin_usb.h',
+          ],
+          'defines': [
+            'OS_DARWIN=1',
+          ],
+        }],
+        [ 'OS == "win"', {
           'sources': [
             'src/libusb/os/poll_windows.c',
             'src/libusb/os/poll_windows.h',
             'src/libusb/os/threads_windows.c',
             'src/libusb/os/threads_windows.h',
+            'src/libusb/os/windows_common.h',
             'src/libusb/os/windows_usb.c',
             'src/libusb/os/windows_usb.h',
             'src/msvc/config.h',
@@ -67,31 +90,8 @@
           ],
           'include_dirs': [
             'src/msvc',
-          ],
-          'defines': [
-            'DDKBUILD=1',
           ]
         }],
-        ['OS == "mac"', {
-          'sources': [
-            'src/libusb/os/darwin_usb.c',
-            'src/libusb/os/darwin_usb.h',
-            'src/libusb/os/poll_posix.h',
-            'src/libusb/os/threads_posix.c',
-            'src/libusb/os/threads_posix.h',
-          ],
-          'defines': [
-            'DEFAULT_VISIBILITY=',
-            'HAVE_GETTIMEOFDAY=1',
-            'HAVE_POLL_H=1',
-            'HAVE_SYS_TIME_H=1',
-            'LIBUSB_DESCRIBE="1.0.9"',
-            'OS_DARWIN=1',
-            'POLL_NFDS_TYPE=nfds_t',
-            'THREADS_POSIX=1',
-            '_GNU_SOURCE=1',
-          ],
-        }],
       ],
     },
   ],