split dependency installation scripts, use official glfw3 .deb packages

Author: floe

.gitignore

@@ -7,6 +7,7 @@ examples/protonect/build
 
 # Dependency folders
 depends/*/
+depends/*.deb
 
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.

README.md

@@ -131,16 +131,11 @@ git clone https://github.com/OpenKinect/libfreenect2.git
 1. Install a bunch of dependencies
 
     ```
-sudo apt-get install -y build-essential libturbojpeg libtool autoconf libudev-dev cmake mesa-common-dev freeglut3-dev libxrandr-dev doxygen libxi-dev libopencv-dev automake
+sudo apt-get install build-essential libjpeg-turbo8-dev libtool autoconf libudev-dev cmake mesa-common-dev freeglut3-dev libxrandr-dev doxygen libxi-dev libopencv-dev automake
 
 cd libfreenect2/depends
 sh install_ubuntu.sh
-```
-
-1. Fix libturbojpeg if needed:
-
-    ```
-sudo ln -s /usr/lib/x86_64-linux-gnu/libturbojpeg.so.0.0.0 /usr/lib/x86_64-linux-gnu/libturbojpeg.so
+sudo dpkg -i libglfw3*_3.0.4-1_*.deb
 ```
 
 1. Build the actual protonect executable

depends/install_glfw.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+set -e
+
+cd `dirname $0`
+DEPENDS_DIR=`pwd`
+
+# glfw
+GLFW_SOURCE_DIR=$DEPENDS_DIR/glfw_src
+GLFW_INSTALL_DIR=$DEPENDS_DIR/glfw
+
+rm -rf $GLFW_SOURCE_DIR $GLFW_INSTALL_DIR
+
+git clone https://github.com/glfw/glfw.git $GLFW_SOURCE_DIR
+cd $GLFW_SOURCE_DIR
+git checkout 3.0.4
+mkdir build
+cd build
+cmake -DCMAKE_INSTALL_PREFIX=$GLFW_INSTALL_DIR -DBUILD_SHARED_LIBS=TRUE ..
+make && make install
+
+cd $DEPENDS_DIR

depends/install_deps.sh depends/install_libusb.shdepends/install_deps.sh renamed to depends/install_libusb.sh

@@ -20,18 +20,3 @@ make && make install
 
 cd $DEPENDS_DIR
 
-# glfw
-GLFW_SOURCE_DIR=$DEPENDS_DIR/glfw_src
-GLFW_INSTALL_DIR=$DEPENDS_DIR/glfw
-
-rm -rf $GLFW_SOURCE_DIR $GLFW_INSTALL_DIR
-
-git clone https://github.com/glfw/glfw.git $GLFW_SOURCE_DIR
-cd $GLFW_SOURCE_DIR
-git checkout 3.0.4
-mkdir build
-cd build
-cmake -DCMAKE_INSTALL_PREFIX=$GLFW_INSTALL_DIR -DBUILD_SHARED_LIBS=TRUE ..
-make && make install
-
-cd $DEPENDS_DIR

depends/install_mac.sh

@@ -3,7 +3,8 @@
 cd `dirname $0`
 DEPENDS_DIR=`pwd`
 
-sh ./install_deps.sh
+sh ./install_libusb.sh
+sh ./install_glfw.sh
 
 #get the missing cl.hpp from Khronos.org
 cd /System/Library/Frameworks/OpenCL.framework/Versions/A/Headers/ 

depends/install_ubuntu.sh

@@ -3,4 +3,21 @@
 cd `dirname $0`
 DEPENDS_DIR=`pwd`
 
-sh ./install_deps.sh
+ARCH="$(uname -m | grep -q 64 && echo 'amd64' || echo 'i386')"
+
+# download standalone packages for 14.04 LTS
+wget -N http://archive.ubuntu.com/ubuntu/pool/universe/g/glfw3/libglfw3_3.0.4-1_${ARCH}.deb
+wget -N http://archive.ubuntu.com/ubuntu/pool/universe/g/glfw3/libglfw3-dev_3.0.4-1_${ARCH}.deb
+wget -N http://archive.ubuntu.com/ubuntu/pool/universe/g/glfw3/libglfw3-doc_3.0.4-1_all.deb
+
+sh ./install_libusb.sh
+
+cat <<-EOT
+
+	Execute the following commands to install the remaining dependencies (if you have not already done so):
+
+	sudo dpkg -i libglfw3*_3.0.4-1_*.deb
+	sudo apt-get install build-essential libjpeg-turbo8-dev libtool autoconf libudev-dev cmake mesa-common-dev freeglut3-dev libxrandr-dev doxygen libxi-dev libopencv-dev automake
+
+EOT
+

examples/protonect/CMakeLists.txt

@@ -14,6 +14,7 @@ PROJECT(libfreenect2)
 SET(CMAKE_BUILD_TYPE RelWithDebInfo)
 
 SET(MY_DIR ${libfreenect2_SOURCE_DIR})
+SET(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${MY_DIR}../../depends/libusb/lib/:${MY_DIR}../../depends/glfw/lib/" )
 
 OPTION(ENABLE_CXX11 "Enable C++11 support" OFF)
 OPTION(ENABLE_OPENCL "Enable OpenCL support" ON)