[SCM] projectm/master: Refresh patches

ximion-guest at users.alioth.debian.org ximion-guest at users.alioth.debian.org
Sun Jan 1 19:24:32 UTC 2012


The following commit has been merged in the master branch:
commit b8381b54d2c8b88c3b6333994379bab0753136de
Author: Matthias Klumpp <matthias at nlinux.org>
Date:   Sun Jan 1 18:18:34 2012 +0100

    Refresh patches

diff --git a/debian/patches/18_pulseaudio_remove_unused_header.patch b/debian/patches/18_pulseaudio_remove_unused_header.patch
index d35f1af..f082f26 100644
--- a/debian/patches/18_pulseaudio_remove_unused_header.patch
+++ b/debian/patches/18_pulseaudio_remove_unused_header.patch
@@ -1,7 +1,5 @@
-Index: projectm-2.0.1+dfsg/src/projectM-pulseaudio/QPulseAudioThread.hpp
-===================================================================
---- projectm-2.0.1+dfsg.orig/src/projectM-pulseaudio/QPulseAudioThread.hpp	2011-09-12 08:25:25.000000000 -0400
-+++ projectm-2.0.1+dfsg/src/projectM-pulseaudio/QPulseAudioThread.hpp	2011-09-12 08:25:42.000000000 -0400
+--- a/src/projectM-pulseaudio/QPulseAudioThread.hpp
++++ b/src/projectM-pulseaudio/QPulseAudioThread.hpp
 @@ -34,7 +34,6 @@
  {
  #include <pulse/introspect.h>
diff --git a/debian/patches/22_unbind_fbo.patch b/debian/patches/22_unbind_fbo.patch
index 8ff387f..ff59729 100644
--- a/debian/patches/22_unbind_fbo.patch
+++ b/debian/patches/22_unbind_fbo.patch
@@ -3,12 +3,12 @@ Unbind framebuffer object when initialization is done
 --- a/src/libprojectM/Renderer/FBO.cpp
 +++ b/src/libprojectM/Renderer/FBO.cpp
 @@ -141,6 +141,9 @@
- 	  this->textureID[1] = other_tex;
-
+ 	  this->textureID[1] = other_tex; 
+ 	  
  	  GLenum status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
 +
 +	  glBindFramebufferEXT (GL_FRAMEBUFFER_EXT, 0);
 +
  	  if (status == GL_FRAMEBUFFER_COMPLETE_EXT) {
  	    return;
- 	  }
+ 	  }	

-- 
projectm packaging



More information about the pkg-multimedia-commits mailing list