OpenNI2-system-libs.patch

   1 --- OpenNI2-2.2-beta2/Source/Core/Makefile.orig 2013-11-12 15:12:23.000000000 +0100
   2 +++ OpenNI2-2.2-beta2/Source/Core/Makefile      2014-07-27 18:11:46.955853790 +0200
   3 @@ -5,14 +5,12 @@
   4  INC_DIRS = \
   5         ../../Include \
   6         ../../ThirdParty/PSCommon/XnLib/Include \
   7 -       ../Drivers/OniFile/Formats \
   8 -       ../../ThirdParty/LibJPEG
   9 +       ../Drivers/OniFile/Formats
  10
  11  SRC_FILES = \
  12         *.cpp \
  13         ../Drivers/OniFile/Formats/XnCodec.cpp \
  14 -       ../Drivers/OniFile/Formats/XnStreamCompression.cpp \
  15 -       ../../ThirdParty/LibJPEG/*.c \
  16 +       ../Drivers/OniFile/Formats/XnStreamCompression.cpp
  17
  18  ifeq ("$(OSTYPE)","Darwin")
  19         INC_DIRS += /opt/local/include
  20 @@ -23,7 +21,7 @@
  21  LIB_NAME = OpenNI2
  22
  23  LIB_DIRS = ../../ThirdParty/PSCommon/XnLib/Bin/$(PLATFORM)-$(CFG)
  24 -USED_LIBS = XnLib dl pthread
  25 +USED_LIBS = XnLib jpeg dl pthread
  26  ifneq ("$(OSTYPE)","Darwin")
  27          USED_LIBS += rt
  28  endif
  29 --- OpenNI2-2.2-beta2/Source/Drivers/OniFile/Makefile.orig      2013-11-12 15:12:23.000000000 +0100
  30 +++ OpenNI2-2.2-beta2/Source/Drivers/OniFile/Makefile   2014-07-27 18:12:32.599185209 +0200
  31 @@ -6,14 +6,12 @@
  32         . \
  33         ../../../Include \
  34         ../../../ThirdParty/PSCommon/XnLib/Include \
  35 -       ../../../ThirdParty/LibJPEG \
  36         Formats
  37
  38  SRC_FILES = \
  39         *.cpp \
  40         Formats/*.cpp \
  41 -       XnLibExtensions/*.cpp \
  42 -       ../../../ThirdParty/LibJPEG/*.c
  43 +       XnLibExtensions/*.cpp
  44
  45
  46  ifeq ("$(OSTYPE)","Darwin")
  47 @@ -25,7 +23,7 @@
  48  LIB_NAME = OniFile
  49
  50  LIB_DIRS = ../../../ThirdParty/PSCommon/XnLib/Bin/$(PLATFORM)-$(CFG)
  51 -USED_LIBS = XnLib pthread
  52 +USED_LIBS = XnLib jpeg pthread
  53  ifneq ("$(OSTYPE)","Darwin")
  54          USED_LIBS += rt
  55  endif
  56 --- OpenNI2-2.2-beta2/Source/Drivers/PS1080/Makefile.orig       2013-11-12 15:12:23.000000000 +0100
  57 +++ OpenNI2-2.2-beta2/Source/Drivers/PS1080/Makefile    2014-07-27 18:12:55.702517573 +0200
  58 @@ -7,7 +7,6 @@
  59         Include \
  60         ../../../Include \
  61         ../../../ThirdParty/PSCommon/XnLib/Include \
  62 -       ../../../ThirdParty/LibJPEG \
  63         ../../DepthUtils
  64
  65  SRC_FILES = \
  66 @@ -16,8 +15,7 @@
  67         DriverImpl/*.cpp\
  68         Formats/*.cpp   \
  69         Include/*.cpp   \
  70 -       Sensor/*.cpp    \
  71 -       ../../../ThirdParty/LibJPEG/*.c
  72 +       Sensor/*.cpp
  73
  74
  75  ifeq ("$(OSTYPE)","Darwin")
  76 @@ -30,7 +28,7 @@
  77
  78  LIB_DIRS += ../../../ThirdParty/PSCommon/XnLib/Bin/$(PLATFORM)-$(CFG)
  79  LIB_DIRS += $(BIN_DIR)/$(PLATFORM)-$(CFG)
  80 -USED_LIBS = XnLib dl pthread DepthUtils
  81 +USED_LIBS = XnLib dl pthread DepthUtils jpeg
  82  ifneq ("$(OSTYPE)","Darwin")
  83          USED_LIBS += rt usb-1.0 udev
  84  else