Skip to content

Commit 76f4c21

Browse files
committed
Use external turbojpeg
Issue #184 reported turbojpeg built from source produces corrupted output. Use pre-built binary from homebrew for now.
1 parent 60fcb0e commit 76f4c21

File tree

2 files changed

+2
-18
lines changed

2 files changed

+2
-18
lines changed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ You can go back and forth between the SDK driver and the libusbK driver very qui
8787
```
8888
brew update
8989
brew tap homebrew/science
90-
brew install opencv git nasm wget
90+
brew install opencv git nasm wget jpeg-turbo
9191
```
9292

9393
1. Download the libfreenect2 repository
@@ -100,6 +100,7 @@ git clone [email protected]:OpenKinect/libfreenect2.git
100100

101101
```
102102
cd ./libfreenect2
103+
ln -s /usr/local/opt/jpeg-turbo depends/libjpeg_turbo
103104
sh ./depends/install_mac.sh
104105
```
105106

depends/install_mac.sh

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,6 @@ DEPENDS_DIR=`pwd`
55

66
sh ./install_deps.sh
77

8-
9-
# libjpeg
10-
LIBJPEG_SOURCE_DIR=$DEPENDS_DIR/libjpeg_turbo_src
11-
LIBJPEG_INSTALL_DIR=$DEPENDS_DIR/libjpeg_turbo
12-
LIBJPEG_VERSION=1.3.1
13-
14-
wget https://downloads.sourceforge.net/project/libjpeg-turbo/$LIBJPEG_VERSION/libjpeg-turbo-$LIBJPEG_VERSION.tar.gz
15-
tar xvf libjpeg-turbo-$LIBJPEG_VERSION.tar.gz
16-
mv libjpeg-turbo-$LIBJPEG_VERSION $LIBJPEG_SOURCE_DIR
17-
cd $LIBJPEG_SOURCE_DIR
18-
19-
# libjpeg-turbo is missing some files config files (config.guess and config.sub)
20-
cp $LIBUSB_SOURCE_DIR/config.guess ./
21-
cp $LIBUSB_SOURCE_DIR/config.sub ./
22-
./configure --disable-dependency-tracking --host x86_64-apple-darwin --with-jpeg8 --prefix=$LIBJPEG_INSTALL_DIR
23-
make && make install
24-
258
#get the missing cl.hpp from Khronos.org
269
cd /System/Library/Frameworks/OpenCL.framework/Versions/A/Headers/
2710
[ -f cl.hpp ] || sudo wget http://www.khronos.org/registry/cl/api/1.2/cl.hpp

0 commit comments

Comments
 (0)