[SCM] projectm/master: Add patch for projectM crash

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

The following commit has been merged in the master branch:
commit 8d2fdfe1a75ece7cf4891d59286e182ea2f35b75
Author: Matthias Klumpp <matthias at nlinux.org>
Date:   Sat Sep 25 02:13:35 2010 +0200

    Add patch for projectM crash
    
    * Loading the existing system-fonts prevents
      projectM from crashing.

diff --git a/debian/patches/05_libprojectm_fix-cmakelists.patch b/debian/patches/05_lprojectm_fix-cmakelists.patch
old mode 100644
new mode 100755
similarity index 100%
rename from debian/patches/05_libprojectm_fix-cmakelists.patch
rename to debian/patches/05_lprojectm_fix-cmakelists.patch
diff --git a/debian/patches/06_libprojectm_fonts.patch b/debian/patches/06_lprojectm_fonts.patch
old mode 100644
new mode 100755
similarity index 100%
rename from debian/patches/06_libprojectm_fonts.patch
rename to debian/patches/06_lprojectm_fonts.patch
diff --git a/debian/patches/10_lprojectm_userfonts.patch b/debian/patches/10_lprojectm_userfonts.patch
new file mode 100644
index 0000000..3cdce54
--- /dev/null
+++ b/debian/patches/10_lprojectm_userfonts.patch
@@ -0,0 +1,18 @@
+Description: Set correct font paths in user-specific settings too.
+Forwarded: no
+Author: Matthias Klumpp <matthias at nlinux.org>
+Last-Update: 2010-09-25
+--- a/src/libprojectM/projectM.cpp
++++ b/src/libprojectM/projectM.cpp
+@@ -200,9 +200,9 @@
+ 
+     #ifdef LINUX
+     _settings.titleFontURL = config.read<string>
+-    ( "Title Font", CMAKE_INSTALL_PREFIX  "/share/projectM/fonts/Vera.ttf" );
++    ( "Title Font", CMAKE_INSTALL_PREFIX  "/share/fonts/bitstream-vera/Vera.ttf" );
+     _settings.menuFontURL = config.read<string>
+-    ( "Menu Font", CMAKE_INSTALL_PREFIX  "/share/projectM/fonts/VeraMono.ttf" );
++    ( "Menu Font", CMAKE_INSTALL_PREFIX  "/share/fonts/bitstream-vera/VeraMono.ttf" );
+     #endif
+ 
+     #ifdef WIN32
diff --git a/debian/patches/series b/debian/patches/series
old mode 100644
new mode 100755
index fc62544..72dddea
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,8 +2,9 @@
 02_pulseaudio_cmakelist.patch
 03_desktop-files.patch
 04_pulseaudio_stat.patch
-05_libprojectm_fix-cmakelists.patch
-06_libprojectm_fonts.patch
+05_lprojectm_fix-cmakelists.patch
+06_lprojectm_fonts.patch
 07_cg-profile-setting.patch
 08_qprojectm-openglcontext.patch
 09_error-handling.patch
+10_lprojectm_userfonts.patch
diff --git a/debian/rules b/debian/rules
index 73a0f82..ec5c47e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,9 +5,7 @@ DEB_CMAKE_OPTIONS ?= -DCMAKE_VERBOSE_MAKEFILE=ON \
 		-DCMAKE_INSTALL_PREFIX="/usr" \
 		-DCMAKE_C_FLAGS="$(DEB_CFLAGS)" \
 		-DINCLUDE-PROJECTM-TEST=OFF \
-		-DINCLUDE-PROJECTM-JACK=ON \
-		-DUSE_FTGL=OFF
-# We disable FTGL at time: Causes crash of projectM on some machines
+		-DINCLUDE-PROJECTM-JACK=ON
 
 BUILD_DIR=$(CURDIR)/src/build
 

-- 
projectm packaging