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

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

The following commit has been merged in the master branch:
commit c879962f7cc0e1ea218e6dbc00651a82ddb2f674
Author: Matthias Klumpp <matthias at nlinux.org>
Date:   Wed Jul 28 14:42:34 2010 +0200

    Add patches for projectM-pulseaudio crash
    
    * Resolve issues with buggy ATi drivers
    * Check for valid QOpenGLContext

diff --git a/debian/patches/06_cg-profile-setting.patch b/debian/patches/06_cg-profile-setting.patch
new file mode 100644
index 0000000..ec4f8b8
--- /dev/null
+++ b/debian/patches/06_cg-profile-setting.patch
@@ -0,0 +1,20 @@
+Description: Don't set optimal settings on the cg profile
+  This resolves issues with buggy new ati drivers
+Forwarded: yes
+Author: Carmelo Piccione <carmelo.piccione at gmail.com>
+Last-Update: 2010-07-28
+
+--- trunk/src/libprojectM/Renderer/ShaderEngine.cpp	2009/08/04 02:27:16	1260
++++ trunk/src/libprojectM/Renderer/ShaderEngine.cpp	2010/07/26 23:46:19	1335
+@@ -376,7 +376,10 @@
+ 	cgSetParameterSettingMode(myCgContext, CG_DEFERRED_PARAMETER_SETTING);
+ 
+ 	myCgProfile = cgGLGetLatestProfile(CG_GL_FRAGMENT);
+-	cgGLSetOptimalOptions(myCgProfile);
++	
++	// HACK breaks with buggy ati video drivers such as my own
++	// -carmelo.piccione at gmail.com 7/26/2010
++	//cgGLSetOptimalOptions(myCgProfile);
+ 	checkForCgError("selecting fragment profile");
+ 
+ 	profileName = cgGetProfileString(myCgProfile);
diff --git a/debian/patches/07_qprojectm-openglcontext.patch b/debian/patches/07_qprojectm-openglcontext.patch
new file mode 100644
index 0000000..0db1c4c
--- /dev/null
+++ b/debian/patches/07_qprojectm-openglcontext.patch
@@ -0,0 +1,24 @@
+Description: Check OpenGLContext
+  Check if opengl context is valid, quit if we can't open one
+  with an error message.
+Forwarded: yes
+Author: Carmelo Piccione <carmelo.piccione at gmail.com>
+Last-Update: 2010-07-28
+
+--- trunk/src/projectM-qt/qprojectm_mainwindow.cpp	2009/10/04 14:44:41	1291
++++ trunk/src/projectM-qt/qprojectm_mainwindow.cpp	2010/07/27 23:17:44	1338
+@@ -104,6 +104,14 @@
+ 		  this, SLOT ( postProjectM_Initialize() ) );
+ 	
+ 	//connect(this, SIGNAL(dockLocationChanged ( Qt::DockWidgetArea)), SLOT(dockLocationChanged(Qt::DockWidgetArea)));
++	if (!m_QProjectMWidget->isValid()) {
++		int ret = QMessageBox::warning(this, tr("projectM cannot be started."),
++					       tr("Your graphics driver or configuration is not supported by projectM. Please contact the developers (carmelo.piccione+projectM at gmail.com or psperl+projectM at gmail.com) with your card and driver information so we can help you get it working."),
++			      QMessageBox::Ok);
++		exit(-1);
++	}
++
++	  
+ 	m_QProjectMWidget->makeCurrent();
+ 	m_QProjectMWidget->setFocus();
+ 	setCentralWidget ( m_QProjectMWidget );
diff --git a/debian/patches/series b/debian/patches/series
index 897cc40..7f9fe9c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,5 @@
 03_pulseaudio_stat.patch
 04_libprojectm_fix-cmakelists.patch
 05_libprojectm_fonts.patch
+06_cg-profile-setting.patch
+07_qprojectm-openglcontext.patch

-- 
projectm packaging