Add patches to fix CMake issues with GTK and libusb (Closes: #738391).

debian/patches/0004-visp-config-should-rely-on-pkg-config-information.patch

@@ -15,17 +15,17 @@ index e797f26..88504df 100755
 --- a/CMakeModules/visp-config.install.in
 +++ b/CMakeModules/visp-config.install.in
 @@ -48,20 +48,14 @@ relpath=`(cd $relpath/..; pwd)`
-
+ 
  PREFIX=$relpath
-
+ 
 -CFLAGS="${VISP_CONFIG_CFLAGS_SCRIPT}"
 +CFLAGS_CMD=`pkg-config --cflags visp`
 +CFLAGS=$CFLAGS_CMD
-
+ 
 -LIBS="${VISP_CONFIG_LIBS_SCRIPT}"
 +LIBS_CMD=`pkg-config --libs visp`
 +LIBS=$LIBS_CMD
-
+ 
 -VERSION="${VISP_VERSION}"
 -
 -#CFLAGS_CMD=`pkg-config --cflags visp`
@@ -38,6 +38,6 @@ index e797f26..88504df 100755
 -#VERSION=$VERSION_CMD
 +VERSION_CMD=`pkg-config --modversion visp`
 +VERSION=$VERSION_CMD
-
+ 
  NO_NEWLINE_CHARACTER="${VISP_ECHO_NO_NEWLINE_CHARACTER}"
  NO_NEWLINE_OPTION="${VISP_ECHO_NO_NEWLINE_OPTION}"

debian/patches/0005-Fix-warnings-in-FindMyGTK2.cmake.patch

+From: Thomas Moulard <thomas.moulard@gmail.com>
+Date: Thu, 20 Feb 2014 11:02:53 +0900
+Subject: Fix warnings in FindMyGTK2.cmake
+
+Author: Fabien Spindler <fabien.spindler@inria.fr>
+Forwarded: yes
+---
+ CMakeModules/FindMyGTK2.cmake | 28 ++++++++++++++--------------
+ 1 file changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/CMakeModules/FindMyGTK2.cmake b/CMakeModules/FindMyGTK2.cmake
+index a6c95b0..90bb7d7 100644
+--- a/CMakeModules/FindMyGTK2.cmake
++++ b/CMakeModules/FindMyGTK2.cmake
+@@ -52,7 +52,7 @@ IF(UNIX OR WIN32)
+     /usr/include/gtk-2.0
+     /usr/local/include/gtk-2.0
+     /opt/gnome/include/gtk-2.0
+-    "C:/GTK/include/gtk-2.0"
++    C:/GTK/include/gtk-2.0
+     /sw/include/gtk-2.0
+   )
+ 
+@@ -69,7 +69,7 @@ IF(UNIX OR WIN32)
+     /usr/lib/i386-linux-gnu/glib-2.0/include
+     /usr/lib/x86_64-linux-gnu/glib-2.0/include
+     /opt/gnome/lib/glib-2.0/include
+-    "C:/GTK/lib/glib-2.0/include"glib
++    C:/GTK/lib/glib-2.0/include
+     /sw/lib/glib-2.0/include
+   )
+ 
+@@ -78,7 +78,7 @@ IF(UNIX OR WIN32)
+     $ENV{GTK2_HOME}/include/glib-2.0
+     /usr/include/glib-2.0
+     /opt/gnome/include/glib-2.0
+-    "C:/GTK/include/glib-2.0"
++    C:/GTK/include/glib-2.0
+     /sw/include/glib-2.0
+   )
+ 
+@@ -87,7 +87,7 @@ IF(UNIX OR WIN32)
+     $ENV{GTK2_HOME}/include/pango-1.0
+     /usr/include/pango-1.0
+     /opt/gnome/include/pango-1.0
+-    "C:/GTK/include/pango-1.0"
++    C:/GTK/include/pango-1.0
+     /sw/include/pango-1.0
+   )
+ 
+@@ -96,7 +96,7 @@ IF(UNIX OR WIN32)
+     $ENV{GTK2_HOME}/include/cairo
+     /usr/include/cairo
+     /opt/gnome/include/cairo
+-    "C:/GTK/include/cairo"
++    C:/GTK/include/cairo
+     /sw/include/cairo
+   )
+ 
+@@ -106,7 +106,7 @@ IF(UNIX OR WIN32)
+     /usr/lib/gtk-2.0/include
+     /usr/lib64/gtk-2.0/include
+     /opt/gnome/lib/gtk-2.0/include
+-    "C:/GTK/lib/gtk-2.0/include"
++    C:/GTK/lib/gtk-2.0/include
+     /sw/lib/gtk-2.0/include
+     /usr/lib/i386-linux-gnu/gtk-2.0/include
+     /usr/lib/x86_64-linux-gnu/gtk-2.0/include
+@@ -117,7 +117,7 @@ IF(UNIX OR WIN32)
+     $ENV{GTK2_HOME}/gdk-pixbuf-2.0
+     /usr/include/gdk-pixbuf-2.0
+     /usr/include/gtk-2.0
+-    "C:/GTK/include/gtk-2.0"
++    C:/GTK/include/gtk-2.0
+     /sw/include/gtk-2.0
+   )
+ 
+@@ -128,7 +128,7 @@ IF(UNIX OR WIN32)
+     $ENV{GTK2_HOME}/include/atk-1.0
+     /usr/include/atk-1.0
+     /opt/gnome/include/atk-1.0
+-    "C:/GTK/include/atk-1.0"
++    C:/GTK/include/atk-1.0
+     /sw/include/atk-1.0
+   )
+ 
+@@ -141,7 +141,7 @@ IF(UNIX OR WIN32)
+           /usr/openwin/lib
+           /usr/X11R6/lib
+           /opt/gnome/lib
+-          "C:/GTK/lib"
++          C:/GTK/lib
+ 	  /sw/lib
+   )
+ 
+@@ -154,7 +154,7 @@ IF(UNIX OR WIN32)
+            /usr/openwin/lib
+            /usr/X11R6/lib
+            /opt/gnome/lib
+-           "C:/GTK/lib"
++           C:/GTK/lib
+ 	   /sw/lib
+   )
+ 
+@@ -167,7 +167,7 @@ IF(UNIX OR WIN32)
+            /usr/openwin/lib
+            /usr/X11R6/lib
+            /opt/gnome/lib
+-           "C:/GTK/lib"
++           C:/GTK/lib
+ 	   /sw/lib
+   )
+ 
+@@ -180,7 +180,7 @@ IF(UNIX OR WIN32)
+            /usr/openwin/lib
+            /usr/X11R6/lib
+            /opt/gnome/lib
+-           "C:/GTK/lib"
++           C:/GTK/lib
+ 	   /sw/lib
+   )
+ 
+@@ -193,7 +193,7 @@ IF(UNIX OR WIN32)
+            /usr/openwin/lib
+            /usr/X11R6/lib
+            /opt/gnome/lib
+-           "C:/GTK/lib"
++           C:/GTK/lib
+ 	   /sw/lib
+   )
+ 
+@@ -203,7 +203,7 @@ IF(UNIX OR WIN32)
+     PATHS  $ENV{GTK2_HOME}/lib
+            /usr/lib
+            /opt/gnome/lib
+-           "C:/GTK/lib"
++           C:/GTK/lib
+ 	   /sw/lib
+   )
+ 

debian/patches/0006-Fix-libusb-CMake-macro-detection.patch

+From: Thomas Moulard <thomas.moulard@gmail.com>
+Date: Thu, 20 Feb 2014 11:03:01 +0900
+Subject: Fix libusb CMake macro detection
+
+Author: Fabien Spindler <fabien.spindler@inria.fr>
+Forwarded: yes
+---
+ CMakeLists.txt                  |  3 ++-
+ CMakeModules/FindLIBUSB-1.cmake | 12 +++++++++++-
+ 2 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 18764c4..ab7409c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1073,6 +1073,7 @@ IF(USE_LIBUSB_1)
+  
+     MESSAGE(STATUS "libusb-1.0 found")
+  
++    LIST(APPEND VISP_EXTERN_INCLUDE_DIRS ${LIBUSB_1_INCLUDE_DIRS})
+     LIST(APPEND VISP_EXTERN_LIBRARIES ${LIBUSB_1_LIBRARIES})
+   ELSE()
+     MESSAGE(STATUS "libusb-1.0 not found")
+@@ -1089,7 +1090,7 @@ IF(USE_LIBFREENECT AND USE_LIBUSB_1 AND USE_PTHREAD)
+     # The material is found. Check if libfreenect is an old version
+     include(CheckCXXSourceCompiles)
+     SET(CMAKE_REQUIRED_LIBRARIES ${LIBFREENECT_LIBRARIES} ${PTHREAD_LIBRARIES} ${LIBUSB_1_LIBRARIES})
+-    SET(CMAKE_REQUIRED_INCLUDES ${LIBFREENECT_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIRS})
++    SET(CMAKE_REQUIRED_INCLUDES ${LIBFREENECT_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIRS} ${LIBUSB_1_INCLUDE_DIRS})
+     CHECK_CXX_SOURCE_COMPILES("
+       #include <libfreenect.hpp>
+ 
+diff --git a/CMakeModules/FindLIBUSB-1.cmake b/CMakeModules/FindLIBUSB-1.cmake
+index 79d57a4..9e1108e 100644
+--- a/CMakeModules/FindLIBUSB-1.cmake
++++ b/CMakeModules/FindLIBUSB-1.cmake
+@@ -35,6 +35,7 @@
+ #
+ # LIBUSB_1_FOUND
+ # LIBUSB_1_LIBRARIES
++# LIBUSB_1_INCLUDE_DIRS
+ #
+ # Authors:
+ # Celine Teuliere
+@@ -55,11 +56,18 @@ ELSE(WIN32)
+     /usr/lib
+     /usr/local/lib
+     )
++  FIND_PATH(LIBUSB_1_INCLUDE_DIR libusb.h
++    $ENV{LIBUSB_1_HOME}/include/libusb-1.0
++    $ENV{LIBUSB_1_HOME}/build/include/libusb-1.0
++    /usr/include/libusb-1.0
++    /usr/local/include/libusb-1.0
++    )
+ ENDIF(WIN32)
+ 
+ ## --------------------------------
+ 
+-IF(LIBUSB_1_LIBRARY)
++IF(LIBUSB_1_LIBRARY AND LIBUSB_1_INCLUDE_DIR)
++  SET(LIBUSB_1_INCLUDE_DIRS ${LIBUSB_1_INCLUDE_DIR})
+   SET(LIBUSB_1_LIBRARIES ${LIBUSB_1_LIBRARY})
+   SET(LIBUSB_1_FOUND TRUE)
+ ELSE()
+@@ -67,6 +75,8 @@ ELSE()
+ ENDIF()
+ 
+ MARK_AS_ADVANCED(
++  LIBUSB_1_INCLUDE_DIRS
++  LIBUSB_1_INCLUDE_DIR
+   LIBUSB_1_LIBRARIES
+   LIBUSB_1_LIBRARY
+   )

debian/patches/series

@@ -2,3 +2,5 @@
 0002-Fix-vpLex.c-portability-issue.patch
 0003-Fix-compilation-issue-with-Ogre-1.9.patch
 0004-visp-config-should-rely-on-pkg-config-information.patch
+0005-Fix-warnings-in-FindMyGTK2.cmake.patch
+0006-Fix-libusb-CMake-macro-detection.patch