[SCM] openni/master: Updated patches to new upstream version
eighthave at users.alioth.debian.org
eighthave at users.alioth.debian.org
Mon May 20 03:25:52 UTC 2013
The following commit has been merged in the master branch:
commit a47ab2ffe05a505968fbed1940b50220c8113f8f
Author: Jochen Sprickerhof <jochen at sprickerhof.de>
Date: Wed Jul 11 10:37:53 2012 +0200
Updated patches to new upstream version
diff --git a/debian/patches/0003-Change-path-of-config-files-to-etc-openni.patch b/debian/patches/0003-Change-path-of-config-files-to-etc-openni.patch
index 5d8ae44..484736d 100644
--- a/debian/patches/0003-Change-path-of-config-files-to-etc-openni.patch
+++ b/debian/patches/0003-Change-path-of-config-files-to-etc-openni.patch
@@ -3,48 +3,49 @@ Date: Wed, 4 Jul 2012 17:40:33 +0200
Subject: Change path of config files to /etc/openni
---
- Samples/NiAudioSample/NiAudioSample.cpp | 2 +-
- Samples/NiCRead/NiCRead.c | 2 +-
- Samples/NiHandTracker/main.cpp | 2 +-
- Samples/NiRecordRaw/NiRecordRaw.cpp | 2 +-
- Samples/NiRecordSynthetic/NiRecordSynthetic.cpp | 2 +-
- Samples/NiSimpleRead/NiSimpleRead.cpp | 2 +-
- Samples/NiSimpleSkeleton/NiSimpleSkeleton.cpp | 2 +-
- Samples/NiSimpleViewer/NiSimpleViewer.cpp | 2 +-
- Samples/NiUserSelection/UserTracker.cpp | 2 +-
- Samples/NiUserTracker/main.cpp | 2 +-
- Samples/NiViewer/NiViewer.cpp | 2 +-
- Source/OpenNI/XnOpenNI.cpp | 2 +-
- 12 files changed, 12 insertions(+), 12 deletions(-)
+ Samples/NiAudioSample/NiAudioSample.cpp | 2 +-
+ Samples/NiCRead/NiCRead.c | 2 +-
+ Samples/NiHandTracker/main.cpp | 4 ++--
+ Samples/NiRecordRaw/NiRecordRaw.cpp | 2 +-
+ Samples/NiRecordSynthetic/NiRecordSynthetic.cpp | 2 +-
+ Samples/NiSimpleRead/NiSimpleRead.cpp | 2 +-
+ Samples/NiSimpleSkeleton/NiSimpleSkeleton.cpp | 2 +-
+ Samples/NiSimpleViewer/NiSimpleViewer.cpp | 2 +-
+ Samples/NiSkeletonBenchmark/NiSkeletonBenchmark.cpp | 2 +-
+ Samples/NiUserSelection/UserTracker.cpp | 2 +-
+ Samples/NiUserTracker/main.cpp | 2 +-
+ Samples/NiViewer/NiViewer.cpp | 2 +-
+ Source/OpenNI/XnOpenNI.cpp | 4 ++--
+ 13 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/Samples/NiAudioSample/NiAudioSample.cpp b/Samples/NiAudioSample/NiAudioSample.cpp
-index 2205b96..5e5213b 100644
+index a7acdf3..b57463b 100644
--- a/Samples/NiAudioSample/NiAudioSample.cpp
+++ b/Samples/NiAudioSample/NiAudioSample.cpp
-@@ -31,7 +31,7 @@
- //---------------------------------------------------------------------------
- // Defines
- //---------------------------------------------------------------------------
--#define SAMPLE_XML_PATH "../../../../Data/SamplesConfig.xml"
-+#define SAMPLE_XML_PATH "/etc/openni/SamplesConfig.xml"
-
- #define NUMBER_OF_AUDIO_BUFFERS 100
-
+@@ -33,7 +33,7 @@
+ //---------------------------------------------------------------------------
+ // Defines
+ //---------------------------------------------------------------------------
+-#define SAMPLE_XML_PATH "../../../../Data/SamplesConfig.xml"
++#define SAMPLE_XML_PATH "/etc/openni/SamplesConfig.xml"
+
+ #define NUMBER_OF_AUDIO_BUFFERS 100
+
diff --git a/Samples/NiCRead/NiCRead.c b/Samples/NiCRead/NiCRead.c
-index 89051ed..9967b10 100644
+index 8fe3584..bba0ab6 100644
--- a/Samples/NiCRead/NiCRead.c
+++ b/Samples/NiCRead/NiCRead.c
@@ -27,7 +27,7 @@
- //---------------------------------------------------------------------------
- // Defines
- //---------------------------------------------------------------------------
--#define SAMPLE_XML_PATH "../../../../Data/SamplesConfig.xml"
-+#define SAMPLE_XML_PATH "/etc/openni/SamplesConfig.xml"
-
- //---------------------------------------------------------------------------
- // Macros
+ //---------------------------------------------------------------------------
+ // Defines
+ //---------------------------------------------------------------------------
+-#define SAMPLE_XML_PATH "../../../../Data/SamplesConfig.xml"
++#define SAMPLE_XML_PATH "/etc/openni/SamplesConfig.xml"
+ #define SAMPLE_XML_PATH_LOCAL "SamplesConfig.xml"
+
+ //---------------------------------------------------------------------------
diff --git a/Samples/NiHandTracker/main.cpp b/Samples/NiHandTracker/main.cpp
-index d5ca19e..f80a8e6 100644
+index d5ca19e..de2f769 100644
--- a/Samples/NiHandTracker/main.cpp
+++ b/Samples/NiHandTracker/main.cpp
@@ -28,7 +28,7 @@
@@ -52,12 +53,19 @@ index d5ca19e..f80a8e6 100644
// Defines
//---------------------------------------------------------------------------
-#define SAMPLE_XML_PATH "../../../../Data/SamplesConfig.xml"
-+#define SAMPLE_XML_PATH "/etc/openni/SamplesConfig.xml"
++#define SAMPLE_XML_PATH "/etc/openni/SamplesConfig.xml"
//---------------------------------------------------------------------------
+@@ -75,4 +75,4 @@ int main(int argc, char* argv[])
+ }
+
+ return 0;
+-}
+\ No newline at end of file
++}
diff --git a/Samples/NiRecordRaw/NiRecordRaw.cpp b/Samples/NiRecordRaw/NiRecordRaw.cpp
-index bfa1a80..00a7713 100644
+index ec7b61b..d11d8c7 100644
--- a/Samples/NiRecordRaw/NiRecordRaw.cpp
+++ b/Samples/NiRecordRaw/NiRecordRaw.cpp
@@ -30,7 +30,7 @@
@@ -65,12 +73,12 @@ index bfa1a80..00a7713 100644
// Defines
//---------------------------------------------------------------------------
-#define SAMPLE_XML_PATH "../../../../Data/SamplesConfig.xml"
-+#define SAMPLE_XML_PATH "/etc/openni/SamplesConfig.xml"
++#define SAMPLE_XML_PATH "/etc/openni/SamplesConfig.xml"
#define RECORDING_FILE_NAME "recordingWithRaw.oni"
#define RAW_NODE_NAME "Raw1"
diff --git a/Samples/NiRecordSynthetic/NiRecordSynthetic.cpp b/Samples/NiRecordSynthetic/NiRecordSynthetic.cpp
-index 93579d3..f4caa2a 100644
+index 93579d3..fa910b3 100644
--- a/Samples/NiRecordSynthetic/NiRecordSynthetic.cpp
+++ b/Samples/NiRecordSynthetic/NiRecordSynthetic.cpp
@@ -30,7 +30,7 @@
@@ -78,98 +86,114 @@ index 93579d3..f4caa2a 100644
// Defines
//---------------------------------------------------------------------------
-#define SAMPLE_XML_PATH "../../../../Data/SamplesConfig.xml"
-+#define SAMPLE_XML_PATH "/etc/openni/SamplesConfig.xml"
++#define SAMPLE_XML_PATH "/etc/openni/SamplesConfig.xml"
//---------------------------------------------------------------------------
// Macros
diff --git a/Samples/NiSimpleRead/NiSimpleRead.cpp b/Samples/NiSimpleRead/NiSimpleRead.cpp
-index 44351a7..dd9e57b 100644
+index 37aed52..745b8f4 100644
--- a/Samples/NiSimpleRead/NiSimpleRead.cpp
+++ b/Samples/NiSimpleRead/NiSimpleRead.cpp
@@ -30,7 +30,7 @@
- //---------------------------------------------------------------------------
- // Defines
- //---------------------------------------------------------------------------
--#define SAMPLE_XML_PATH "../../../../Data/SamplesConfig.xml"
-+#define SAMPLE_XML_PATH "/etc/openni/SamplesConfig.xml"
- #define SAMPLE_XML_PATH_LOCAL "SamplesConfig.xml"
-
- //---------------------------------------------------------------------------
+ //---------------------------------------------------------------------------
+ // Defines
+ //---------------------------------------------------------------------------
+-#define SAMPLE_XML_PATH "../../../../Data/SamplesConfig.xml"
++#define SAMPLE_XML_PATH "/etc/openni/SamplesConfig.xml"
+ #define SAMPLE_XML_PATH_LOCAL "SamplesConfig.xml"
+
+ //---------------------------------------------------------------------------
diff --git a/Samples/NiSimpleSkeleton/NiSimpleSkeleton.cpp b/Samples/NiSimpleSkeleton/NiSimpleSkeleton.cpp
-index 2b8ee3c..21aeb10 100644
+index 443058a..f2093c7 100644
--- a/Samples/NiSimpleSkeleton/NiSimpleSkeleton.cpp
+++ b/Samples/NiSimpleSkeleton/NiSimpleSkeleton.cpp
@@ -27,7 +27,7 @@
- //---------------------------------------------------------------------------
- // Defines
- //---------------------------------------------------------------------------
--#define SAMPLE_XML_PATH "../../../../Data/SamplesConfig.xml"
-+#define SAMPLE_XML_PATH "/etc/openni/SamplesConfig.xml"
- #define SAMPLE_XML_PATH_LOCAL "SamplesConfig.xml"
-
- //---------------------------------------------------------------------------
+ //---------------------------------------------------------------------------
+ // Defines
+ //---------------------------------------------------------------------------
+-#define SAMPLE_XML_PATH "../../../../Data/SamplesConfig.xml"
++#define SAMPLE_XML_PATH "/etc/openni/SamplesConfig.xml"
+ #define SAMPLE_XML_PATH_LOCAL "SamplesConfig.xml"
+
+ //---------------------------------------------------------------------------
diff --git a/Samples/NiSimpleViewer/NiSimpleViewer.cpp b/Samples/NiSimpleViewer/NiSimpleViewer.cpp
-index 583cb9e..df98cdc 100644
+index dffb1c7..8f58195 100644
--- a/Samples/NiSimpleViewer/NiSimpleViewer.cpp
+++ b/Samples/NiSimpleViewer/NiSimpleViewer.cpp
@@ -36,7 +36,7 @@ using namespace xn;
+ //---------------------------------------------------------------------------
+ // Defines
+ //---------------------------------------------------------------------------
+-#define SAMPLE_XML_PATH "../../../../Data/SamplesConfig.xml"
++#define SAMPLE_XML_PATH "/etc/openni/SamplesConfig.xml"
+
+ #define GL_WIN_SIZE_X 1280
+ #define GL_WIN_SIZE_Y 1024
+diff --git a/Samples/NiSkeletonBenchmark/NiSkeletonBenchmark.cpp b/Samples/NiSkeletonBenchmark/NiSkeletonBenchmark.cpp
+index 9159875..66a8cc2 100644
+--- a/Samples/NiSkeletonBenchmark/NiSkeletonBenchmark.cpp
++++ b/Samples/NiSkeletonBenchmark/NiSkeletonBenchmark.cpp
+@@ -29,7 +29,7 @@
//---------------------------------------------------------------------------
// Defines
//---------------------------------------------------------------------------
-#define SAMPLE_XML_PATH "../../../../Data/SamplesConfig.xml"
+#define SAMPLE_XML_PATH "/etc/openni/SamplesConfig.xml"
-
- #define GL_WIN_SIZE_X 1280
- #define GL_WIN_SIZE_Y 1024
+ #define SAMPLE_XML_PATH_LOCAL "SamplesConfig.xml"
+ //printf tweaks
+ #define BRIGHT 1
diff --git a/Samples/NiUserSelection/UserTracker.cpp b/Samples/NiUserSelection/UserTracker.cpp
-index b22e17b..3bf5c8f 100644
+index 41983d0..e29d4b5 100644
--- a/Samples/NiUserSelection/UserTracker.cpp
+++ b/Samples/NiUserSelection/UserTracker.cpp
-@@ -31,7 +31,7 @@
- // the filename for saving/loading calibration.
- #define XN_CALIBRATION_FILE_NAME "UserCalibration.bin"
-
--#define SAMPLE_XML_PATH "../../../../Data/SamplesConfig.xml"
-+#define SAMPLE_XML_PATH "/etc/openni/SamplesConfig.xml"
-
-
- float *UserTracker::s_pDepthHist=NULL;
+@@ -28,7 +28,7 @@
+ // the filename for saving/loading calibration.
+ #define XN_CALIBRATION_FILE_NAME "UserCalibration.bin"
+
+-#define SAMPLE_XML_PATH "../../../../Data/SamplesConfig.xml"
++#define SAMPLE_XML_PATH "/etc/openni/SamplesConfig.xml"
+
+
+ float *UserTracker::s_pDepthHist=NULL;
diff --git a/Samples/NiUserTracker/main.cpp b/Samples/NiUserTracker/main.cpp
-index 491d140..c27cb7d 100644
+index ea1c4e2..2da08b3 100644
--- a/Samples/NiUserTracker/main.cpp
+++ b/Samples/NiUserTracker/main.cpp
-@@ -304,7 +304,7 @@ void glInit (int * pargc, char ** argv)
- }
- #endif // USE_GLES
-
--#define SAMPLE_XML_PATH "../../../../Data/SamplesConfig.xml"
-+#define SAMPLE_XML_PATH "/etc/openni/SamplesConfig.xml"
-
- #define CHECK_RC(nRetVal, what) \
- if (nRetVal != XN_STATUS_OK) \
+@@ -315,7 +315,7 @@ void glInit (int * pargc, char ** argv)
+ }
+ #endif // USE_GLES
+
+-#define SAMPLE_XML_PATH "../../../../Data/SamplesConfig.xml"
++#define SAMPLE_XML_PATH "/etc/openni/SamplesConfig.xml"
+
+ #define CHECK_RC(nRetVal, what) \
+ if (nRetVal != XN_STATUS_OK) \
diff --git a/Samples/NiViewer/NiViewer.cpp b/Samples/NiViewer/NiViewer.cpp
-index 3e3e342..41d0f1a 100644
+index 9e9d8f4..72f5dfb 100644
--- a/Samples/NiViewer/NiViewer.cpp
+++ b/Samples/NiViewer/NiViewer.cpp
-@@ -84,7 +84,7 @@ using namespace glh;
- // --------------------------------
- // Defines
- // --------------------------------
--#define SAMPLE_XML_PATH "../../../../Data/SamplesConfig.xml"
-+#define SAMPLE_XML_PATH "/etc/openni/SamplesConfig.xml"
-
- // --------------------------------
- // Types
+@@ -86,7 +86,7 @@ using namespace glh;
+ // --------------------------------
+ // Defines
+ // --------------------------------
+-#define SAMPLE_XML_PATH "../../../../Data/SamplesConfig.xml"
++#define SAMPLE_XML_PATH "/etc/openni/SamplesConfig.xml"
+
+ // --------------------------------
+ // Types
diff --git a/Source/OpenNI/XnOpenNI.cpp b/Source/OpenNI/XnOpenNI.cpp
-index 9600580..1678dc2 100644
+index 7bf268a..3ecb895 100644
--- a/Source/OpenNI/XnOpenNI.cpp
+++ b/Source/OpenNI/XnOpenNI.cpp
-@@ -6993,7 +6993,7 @@ XN_C_API XnStatus xnScriptNodeRun(XnNodeHandle hScript, XnEnumerationErrors* pEr
- #elif (CE4100)
- #define XN_OPEN_NI_FILES_LOCATION "/usr/etc/ni/"
- #elif (XN_PLATFORM == XN_PLATFORM_LINUX_X86 || XN_PLATFORM == XN_PLATFORM_LINUX_ARM || XN_PLATFORM == XN_PLATFORM_MACOSX)
-- #define XN_OPEN_NI_FILES_LOCATION "/var/lib/ni/"
-+ #define XN_OPEN_NI_FILES_LOCATION "/etc/openni/"
- #elif (XN_PLATFORM == XN_PLATFORM_ANDROID_ARM)
- #define XN_OPEN_NI_FILES_LOCATION "/data/ni/"
- #else
+@@ -7061,9 +7061,9 @@ XN_C_API XnStatus xnScriptNodeRun(XnNodeHandle hScript, XnEnumerationErrors* pEr
+ #if (XN_PLATFORM == XN_PLATFORM_WIN32)
+ #define XN_OPEN_NI_FILES_LOCATION "\\Data\\"
+ #elif (CE4100)
+- #define XN_OPEN_NI_FILES_LOCATION "/usr/etc/ni/"
++ #define XN_OPEN_NI_FILES_LOCATION "/etc/openni/"
+ #elif (XN_PLATFORM == XN_PLATFORM_LINUX_X86 || XN_PLATFORM == XN_PLATFORM_LINUX_ARM || XN_PLATFORM == XN_PLATFORM_MACOSX)
+- #define XN_OPEN_NI_FILES_LOCATION "/var/lib/ni/"
++ #define XN_OPEN_NI_FILES_LOCATION "/etc/openni/"
+ #elif (XN_PLATFORM == XN_PLATFORM_ANDROID_ARM)
+ #define XN_OPEN_NI_FILES_LOCATION "/data/ni/"
+ #else
diff --git a/debian/patches/0005-Silence-asserts.patch b/debian/patches/0005-Silence-asserts.patch
index de659d2..c49a128 100644
--- a/debian/patches/0005-Silence-asserts.patch
+++ b/debian/patches/0005-Silence-asserts.patch
@@ -7,15 +7,15 @@ Subject: Silence asserts
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Include/Linux-x86/XnPlatformLinux-x86.h b/Include/Linux-x86/XnPlatformLinux-x86.h
-index 835a396..d6dd983 100644
+index 6edecb0..4b4c73e 100644
--- a/Include/Linux-x86/XnPlatformLinux-x86.h
+++ b/Include/Linux-x86/XnPlatformLinux-x86.h
@@ -164,7 +164,7 @@ typedef size_t XnSizeT;
- #define XN_STRINGIFY_HELPER(n) #n
-
- /** Asserts an expression, only on Debug build. */
--#define XN_ASSERT(x)
-+#define XN_ASSERT(x) ((void)(x))
-
- //---------------------------------------------------------------------------
- // API Export/Import Macros
+ #define XN_STRINGIFY_HELPER(n) #n
+
+ /** Asserts an expression, only on Debug build. */
+-#define XN_ASSERT(x)
++#define XN_ASSERT(x) ((void)(x))
+
+ //---------------------------------------------------------------------------
+ // API Export/Import Macros
diff --git a/debian/patches/0006-Link-against-libGL.patch b/debian/patches/0006-Link-against-libGL.patch
deleted file mode 100644
index 2a9e228..0000000
--- a/debian/patches/0006-Link-against-libGL.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From: Jochen Sprickerhof <jochen at sprickerhof.de>
-Date: Wed, 4 Jul 2012 23:56:25 +0200
-Subject: Link against libGL
-
----
- Platform/Linux/Build/Samples/NiHandTracker/Makefile | 2 +-
- Platform/Linux/Build/Samples/NiSimpleViewer/Makefile | 2 +-
- Platform/Linux/Build/Samples/NiUserSelection/Makefile | 2 +-
- Platform/Linux/Build/Samples/NiUserTracker/Makefile | 2 +-
- Platform/Linux/Build/Samples/NiViewer/Makefile | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/Platform/Linux/Build/Samples/NiHandTracker/Makefile b/Platform/Linux/Build/Samples/NiHandTracker/Makefile
-index 042a57c..7dd8f08 100644
---- a/Platform/Linux/Build/Samples/NiHandTracker/Makefile
-+++ b/Platform/Linux/Build/Samples/NiHandTracker/Makefile
-@@ -11,7 +11,7 @@ SRC_FILES = ../../../../../Samples/NiHandTracker/*.cpp
- ifeq ("$(OSTYPE)","Darwin")
- LDFLAGS += -framework OpenGL -framework GLUT
- else
-- USED_LIBS += glut
-+ USED_LIBS += glut GL
- endif
-
- USED_LIBS += OpenNI
-diff --git a/Platform/Linux/Build/Samples/NiSimpleViewer/Makefile b/Platform/Linux/Build/Samples/NiSimpleViewer/Makefile
-index f216eb5..8896b3c 100644
---- a/Platform/Linux/Build/Samples/NiSimpleViewer/Makefile
-+++ b/Platform/Linux/Build/Samples/NiSimpleViewer/Makefile
-@@ -11,7 +11,7 @@ EXE_NAME = Sample-NiSimpleViewer
- ifeq ("$(OSTYPE)","Darwin")
- LDFLAGS += -framework OpenGL -framework GLUT
- else
-- USED_LIBS += glut
-+ USED_LIBS += glut GL
- endif
-
- USED_LIBS += OpenNI
-diff --git a/Platform/Linux/Build/Samples/NiUserSelection/Makefile b/Platform/Linux/Build/Samples/NiUserSelection/Makefile
-index 7c693bf..1737a43 100644
---- a/Platform/Linux/Build/Samples/NiUserSelection/Makefile
-+++ b/Platform/Linux/Build/Samples/NiUserSelection/Makefile
-@@ -12,7 +12,7 @@ ifeq "$(GLUT_SUPPORTED)" "1"
- ifeq ("$(OSTYPE)","Darwin")
- LDFLAGS += -framework OpenGL -framework GLUT
- else
-- USED_LIBS += glut
-+ USED_LIBS += glut GL
- endif
- else
- ifeq "$(GLES_SUPPORTED)" "1"
-diff --git a/Platform/Linux/Build/Samples/NiUserTracker/Makefile b/Platform/Linux/Build/Samples/NiUserTracker/Makefile
-index 35d9a88..73ca649 100644
---- a/Platform/Linux/Build/Samples/NiUserTracker/Makefile
-+++ b/Platform/Linux/Build/Samples/NiUserTracker/Makefile
-@@ -12,7 +12,7 @@ ifeq "$(GLUT_SUPPORTED)" "1"
- ifeq ("$(OSTYPE)","Darwin")
- LDFLAGS += -framework OpenGL -framework GLUT
- else
-- USED_LIBS += glut
-+ USED_LIBS += glut GL
- endif
- else
- ifeq "$(GLES_SUPPORTED)" "1"
-diff --git a/Platform/Linux/Build/Samples/NiViewer/Makefile b/Platform/Linux/Build/Samples/NiViewer/Makefile
-index bf1ed3a..6e107c3 100644
---- a/Platform/Linux/Build/Samples/NiViewer/Makefile
-+++ b/Platform/Linux/Build/Samples/NiViewer/Makefile
-@@ -11,7 +11,7 @@ SRC_FILES = ../../../../../Samples/NiViewer/*.cpp
- ifeq ("$(OSTYPE)","Darwin")
- LDFLAGS += -framework OpenGL -framework GLUT
- else
-- USED_LIBS += glut
-+ USED_LIBS += glut GL
- endif
-
- USED_LIBS += OpenNI
diff --git a/debian/patches/0007-Use-system-wide-libjpeg.patch b/debian/patches/0006-Use-system-wide-libjpeg.patch
similarity index 89%
rename from debian/patches/0007-Use-system-wide-libjpeg.patch
rename to debian/patches/0006-Use-system-wide-libjpeg.patch
index 5958fe0..d2f4bd4 100644
--- a/debian/patches/0007-Use-system-wide-libjpeg.patch
+++ b/debian/patches/0006-Use-system-wide-libjpeg.patch
@@ -7,7 +7,7 @@ Subject: Use system wide libjpeg
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/Platform/Linux/Build/Modules/nimCodecs/Makefile b/Platform/Linux/Build/Modules/nimCodecs/Makefile
-index 600e371..9d69531 100644
+index 1089d96..9d69531 100644
--- a/Platform/Linux/Build/Modules/nimCodecs/Makefile
+++ b/Platform/Linux/Build/Modules/nimCodecs/Makefile
@@ -2,16 +2,21 @@ BIN_DIR = ../../../Bin
@@ -15,12 +15,12 @@ index 600e371..9d69531 100644
INC_DIRS = \
../../../../../Include \
- ../../../../../Source \
-- ../../../../../Source/External/LibJPEG
+- ../../../../../Externals/LibJPEG
+ ../../../../../Source
SRC_FILES = \
- ../../../../../Source/Modules/nimCodecs/*.cpp \
-- ../../../../../Source/External/LibJPEG/*.c
+- ../../../../../Externals/LibJPEG/*.c
+ ../../../../../Source/Modules/nimCodecs/*.cpp
LIB_NAME = nimCodecs
diff --git a/debian/patches/0008-Use-system-wide-tinyxml.patch b/debian/patches/0007-Use-system-wide-tinyxml.patch
similarity index 90%
rename from debian/patches/0008-Use-system-wide-tinyxml.patch
rename to debian/patches/0007-Use-system-wide-tinyxml.patch
index 46eb06d..8fee137 100644
--- a/debian/patches/0008-Use-system-wide-tinyxml.patch
+++ b/debian/patches/0007-Use-system-wide-tinyxml.patch
@@ -7,7 +7,7 @@ Subject: Use system wide tinyxml
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/Platform/Linux/Build/OpenNI/Makefile b/Platform/Linux/Build/OpenNI/Makefile
-index 2f99e3c..8c0a74d 100644
+index c4645f5..8c0a74d 100644
--- a/Platform/Linux/Build/OpenNI/Makefile
+++ b/Platform/Linux/Build/OpenNI/Makefile
@@ -4,13 +4,11 @@ BIN_DIR = ../../Bin
@@ -15,13 +15,13 @@ index 2f99e3c..8c0a74d 100644
INC_DIRS = \
../../../../Include \
- ../../../../Source \
-- ../../../../Source/External/TinyXml
+- ../../../../Externals/TinyXml
+ ../../../../Source
SRC_FILES = \
../../../../Source/OpenNI/*.cpp \
- ../../../../Source/OpenNI/Linux/*.cpp \
-- ../../../../Source/External/TinyXml/*.cpp
+- ../../../../Externals/TinyXml/*.cpp
+ ../../../../Source/OpenNI/Linux/*.cpp
ifeq ("$(OSTYPE)","Darwin")
diff --git a/debian/patches/series b/debian/patches/series
index 1bd872e..87e02af 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,5 @@
0003-Change-path-of-config-files-to-etc-openni.patch
0004-Disable-SSE.patch
0005-Silence-asserts.patch
-0006-Link-against-libGL.patch
-0007-Use-system-wide-libjpeg.patch
-0008-Use-system-wide-tinyxml.patch
+0006-Use-system-wide-libjpeg.patch
+0007-Use-system-wide-tinyxml.patch
--
openni packaging
More information about the pkg-multimedia-commits
mailing list