Skip to content

Commit a6c5dd0

Browse files
committed
Removed libusb patch already merged upstream
Signed-off-by: Benn Snyder <[email protected]>
1 parent d1d19df commit a6c5dd0

File tree

4 files changed

+8
-186
lines changed

4 files changed

+8
-186
lines changed

README.asciidoc

Lines changed: 6 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ http://twitter.com/openkinect
4343

4444
For the driver, you'll need
4545

46-
- libusb-1.0 >= 1.0.3 (*nix and OS X)
46+
- libusb-1.0 >= 1.0.9 (*nix and OS X)
4747
- libusb-win32 (Windows)
4848
- Cmake >= 2.6 (All platforms)
4949

@@ -73,33 +73,9 @@ To use CMake:
7373

7474
==== OS X
7575

76-
NOTE: AS OF 2010-11-16, WE HAVE UPDATED THIS PATCH. IF YOU HAVE
77-
ALREADY PATCHED, PLEASE REPATCH AND REINSTALL LIBUSB TO GET OS X
78-
WORKING AT FULL 30FPS.
79-
80-
You will need to pull the matching version of libusb for this
81-
patch. This is NOT v1.0.8, this is a change based off the repo head as
82-
of 2010-10-16. To get a tar.gz with the snapshot of the repo at this
83-
point, hit the link below.
84-
85-
http://git.libusb.org/?p=libusb.git;a=snapshot;h=7da756e09fd97efad2b35b5cee0e2b2550aac2cb;sf=tgz;js=1
86-
87-
Once you've gotten that tarball and unziped it somewhere, patch using
88-
the files in platform/osx/. Just go to the root directory of the
89-
libusb source and run
90-
91-
patch -p1 < [path_to_OpenKinectRepo]/platform/osx/libusb-osx-kinect.diff
92-
93-
You need to tell configure to include some necessary frameworks:
94-
./configure LDFLAGS='-framework IOKit -framework CoreFoundation'
95-
96-
Recompile libusb and put it wherever CMake will look (/usr/local/lib,
97-
/usr/lib, etc...). If you're using a package manager like fink,
98-
macports, or homebrew, I'm going to expect you know what your doing
99-
and can deal with this. If not, see IRC channel.
100-
101-
OpenGL and GLUT come as prebuilt frameworks with OS X, so that should
102-
do it for requirements.
76+
libusb is available through various package managers
77+
including homebrew and Macports.
78+
OpenGL and GLUT come as prebuilt frameworks.
10379

10480
==== Linux
10581

@@ -128,9 +104,10 @@ libfreenect has interface to several languages. Look in the wrappers/
128104
directory for them:
129105

130106
- C (using a synchronous API)
107+
- C++
108+
- C#
131109
- python
132110
- actionscript
133-
- C#
134111
- Java (JNA)
135112

136113
=== Licensing

platform/osx/homebrew/libfreenect.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ class Libfreenect <Formula
66
homepage 'http://openkinect.org'
77
md5 ''
88

9-
depends_on 'libusb-freenect'
10-
depends_on 'cmake'
9+
depends_on 'libusb'
10+
depends_on 'cmake' => :build
1111

1212
def install
1313
mkdir "build"

platform/osx/homebrew/libusb-freenect.rb

Lines changed: 0 additions & 23 deletions
This file was deleted.

platform/osx/libusb-osx-kinect.diff

Lines changed: 0 additions & 132 deletions
This file was deleted.

0 commit comments

Comments
 (0)