[SCM] openni/master: Add patch to link against libGL

[eighthave at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 8b92b1fcf5e0a9227c291e6dab0449379839d5d6
Author: Jochen Sprickerhof <jochen at sprickerhof.de>
Date:   Fri Jul 6 14:21:55 2012 +0200

    Add patch to link against libGL

diff --git a/debian/patches/0006-Link-against-libGL.patch b/debian/patches/0006-Link-against-libGL.patch
new file mode 100644
index 0000000..2a9e228
--- /dev/null
+++ b/debian/patches/0006-Link-against-libGL.patch
@@ -0,0 +1,77 @@
+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/series b/debian/patches/series
index c331eb6..1515bc8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0003-Change-path-of-config-files-to-etc-openni.patch
 0004-Disable-SSE.patch
 0005-Silence-asserts.patch
+0006-Link-against-libGL.patch
diff --git a/debian/rules b/debian/rules
index 9691d2b..956f67b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
 	dh $@ --buildsystem=makefile
 
 override_dh_auto_build:
-	cd Platform/Linux/CreateRedist && LDFLAGS=-lGL ./RedistMaker
+	cd Platform/Linux/CreateRedist && sh RedistMaker
 
 override_dh_auto_clean:
 	dh_auto_clean

-- 
openni packaging