[SCM] projectm packaging branch, master, updated. upstream/2.0.1+dfsg-20-g4f96c33

Fri Jun 25 16:20:41 UTC 2010

The following commit has been merged in the master branch:
commit 4f96c33c7f9f28591795b8dd281b492da7b70d17
Author: Matthias Klumpp <matthias at nlinux.org>
Date:   Fri Jun 25 18:20:30 2010 +0200

    Turn off FBO
    
    This might fix the segfaults of projectM-pulseaudio

diff --git a/debian/patches/05_libprojectm_fonts.patch b/debian/patches/05_libprojectm_fonts.patch
index 51c7f0d..6fd6fa9 100644
--- a/debian/patches/05_libprojectm_fonts.patch
+++ b/debian/patches/05_libprojectm_fonts.patch
@@ -16,10 +16,10 @@ Index: projectm-2.0.1/src/libprojectM/CMakeLists.txt
  INSTALL(FILES ${Renderer_SOURCE_DIR}/projectM.cg ${Renderer_SOURCE_DIR}/blur.cg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/shaders)
  INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/libprojectM.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig)
  INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/config.inp DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM)
-Index: projectm-2.0.1+dfsg/src/libprojectM/config.inp.in
+Index: projectm-2.0.1/src/libprojectM/config.inp.in
 ===================================================================
---- projectm-2.0.1+dfsg.orig/src/libprojectM/config.inp.in	2010-06-24 20:54:46.000000000 +0200
-+++ projectm-2.0.1+dfsg/src/libprojectM/config.inp.in	2010-06-25 17:27:33.154001560 +0200
+--- projectm-2.0.1.orig/src/libprojectM/config.inp.in	2010-06-24 20:54:46.000000000 +0200
++++ projectm-2.0.1/src/libprojectM/config.inp.in	2010-06-25 17:27:33.154001560 +0200
 @@ -17,6 +17,6 @@
  Aspect Correction = true	# Custom Shape Aspect Correction
  
diff --git a/debian/rules b/debian/rules
index fffe2bc..dd44fdd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,7 @@
 DEB_CMAKE_OPTIONS ?= -DCMAKE_VERBOSE_MAKEFILE=ON \
 		-DCMAKE_INSTALL_PREFIX="/usr" \
 		-DCMAKE_C_FLAGS="$(DEB_CFLAGS)" \
+		-DUSE_FBO=OFF \
 		-DINCLUDE-PROJECTM-TEST=OFF \
 		-DINCLUDE-PROJECTM-JACK=ON
 

-- 
projectm packaging

