[SCM] projectm/master: Added patch which might prevent projectM from crashing

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

The following commit has been merged in the master branch:
commit 79470f956574902e0f045bfc517a4c70b2321bce
Author: Matthias Klumpp <matthias at nlinux.org>
Date:   Wed Sep 15 14:55:31 2010 +0200

    Added patch which might prevent projectM from crashing
    
    * Might work-around a segfault during renderer
      initialization
    * Updated debian/rules

diff --git a/debian/patches/10_renderer_catch-ftglerror.patch b/debian/patches/10_renderer_catch-ftglerror.patch
new file mode 100644
index 0000000..80af2b8
--- /dev/null
+++ b/debian/patches/10_renderer_catch-ftglerror.patch
@@ -0,0 +1,24 @@
+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 86ea8fe..4886b8e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@
 08_qprojectm-openglcontext.patch
 09_error-handling.patch
 
+10_renderer_catch-ftglerror.patch
diff --git a/debian/rules b/debian/rules
index b5651da..ec5c47e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,8 +10,7 @@ DEB_CMAKE_OPTIONS ?= -DCMAKE_VERBOSE_MAKEFILE=ON \
 BUILD_DIR=$(CURDIR)/src/build
 
 %:
-	dh $@
-	
+	dh $@ --builddirectory=$(BUILD_DIR)
 .PHONY: override_dh_strip
 
 override_dh_auto_clean:
@@ -28,9 +27,6 @@ override_dh_auto_configure:
 	cd $(BUILD_DIR) && \
 		cmake $(DEB_CMAKE_OPTIONS) ..
 
-override_dh_auto_build:
-	$(MAKE) --directory=$(BUILD_DIR)
-
 override_dh_auto_install:
 	$(MAKE) --directory=$(BUILD_DIR) install DESTDIR=$(CURDIR)/debian/tmp
 

-- 
projectm packaging