[SCM] projectm/master: Disable FTGL support

[ximion-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b605bab6db22ce53a3d79a20c5b5777396ee5fe1
Author: Matthias Klumpp <matthias at nlinux.org>
Date:   Sat Sep 18 19:02:45 2010 +0200

    Disable FTGL support
    
    * Causes crash on some machines

diff --git a/debian/patches/10_renderer_catch-ftglerror.patch b/debian/patches/10_renderer_catch-ftglerror.patch
deleted file mode 100644
index 80af2b8..0000000
--- a/debian/patches/10_renderer_catch-ftglerror.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Catch segfault while setting FaceSize
- * Quick & dirty hack to prevent projectM from crashing
-   if FTGLExtrdFont:.FaceSize() fails.
- 
-Forwarded: no
-Author: Matthias Klumpp <matthias at nlinux.org>
-Last-Update: 2010-09-15
---- a/src/libprojectM/Renderer/Renderer.cpp
-+++ b/src/libprojectM/Renderer/Renderer.cpp
-@@ -55,8 +55,12 @@
- 	poly_font = new FTGLExtrdFont(title_fontURL.c_str());
- 
- 	poly_font->UseDisplayList(true);
--	poly_font->Depth(20);
--	poly_font->FaceSize(72);
-+	try {
-+	  poly_font->Depth(20);
-+	  poly_font->FaceSize(72);
-+	} catch (...) {
-+	  std::cout << "Could not set font FaceSize." << std::endl;
-+	}
- 
- 	poly_font->UseDisplayList(true);
- 
diff --git a/debian/patches/series b/debian/patches/series
index 4886b8e..fc62544 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,5 +7,3 @@
 07_cg-profile-setting.patch
 08_qprojectm-openglcontext.patch
 09_error-handling.patch
-
-10_renderer_catch-ftglerror.patch
diff --git a/debian/rules b/debian/rules
index ec5c47e..73a0f82 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,9 @@ DEB_CMAKE_OPTIONS ?= -DCMAKE_VERBOSE_MAKEFILE=ON \
 		-DCMAKE_INSTALL_PREFIX="/usr" \
 		-DCMAKE_C_FLAGS="$(DEB_CFLAGS)" \
 		-DINCLUDE-PROJECTM-TEST=OFF \
-		-DINCLUDE-PROJECTM-JACK=ON
+		-DINCLUDE-PROJECTM-JACK=ON \
+		-DUSE_FTGL=OFF
+# We disable FTGL at time: Causes crash of projectM on some machines
 
 BUILD_DIR=$(CURDIR)/src/build
 

-- 
projectm packaging