1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
Description: Fix cmake libusb search and fix libusb include
Adjust cmake test for libusb library so that the compatible libusb for
freebsd is found. Since freebsd's libusb header are located differently
than libusb-1.0, the includes in the source code must be adjusted using
#include <libusb.h>. Actually those new include statements are those that
libusb-1.0 really expects to be used (see libusb-1.0.pc cflags to verify
this).
Origin: vendor
Forwarded: yes
Applied-Upstream: commit:8219750df3a13501626a7f7f54d24afb8e64ec3f
Author: nicolas bourdaud <nicolas.bourdaud@gmail.com>
Last-Update: 2012-02-06
--- a/cmake_modules/Findlibusb-1.0.cmake
+++ b/cmake_modules/Findlibusb-1.0.cmake
@@ -49,7 +49,7 @@
else (LIBUSB_1_LIBRARIES AND LIBUSB_1_INCLUDE_DIRS)
find_path(LIBUSB_1_INCLUDE_DIR
NAMES
- libusb-1.0/libusb.h
+ libusb.h
PATHS
/usr/include
/usr/local/include
@@ -61,7 +61,7 @@
find_library(LIBUSB_1_LIBRARY
NAMES
- usb-1.0
+ usb-1.0 usb
PATHS
/usr/lib
/usr/local/lib
@@ -95,4 +95,4 @@
# show the LIBUSB_1_INCLUDE_DIRS and LIBUSB_1_LIBRARIES variables only in the advanced view
mark_as_advanced(LIBUSB_1_INCLUDE_DIRS LIBUSB_1_LIBRARIES)
-endif (LIBUSB_1_LIBRARIES AND LIBUSB_1_INCLUDE_DIRS)
\ No newline at end of file
+endif (LIBUSB_1_LIBRARIES AND LIBUSB_1_INCLUDE_DIRS)
--- a/src/usb_libusb10.c
+++ b/src/usb_libusb10.c
@@ -29,7 +29,7 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <libusb-1.0/libusb.h>
+#include <libusb.h>
#include "freenect_internal.h"
#include "loader.h"
--- a/src/usb_libusb10.h
+++ b/src/usb_libusb10.h
@@ -28,7 +28,7 @@
#define USB_LIBUSB10
#include "libfreenect.h"
-#include <libusb-1.0/libusb.h>
+#include <libusb.h>
#if defined(__APPLE__)
/*
|
