[SCM] projectm/master: Refreshed userfonts patch

ximion-guest at users.alioth.debian.org ximion-guest at users.alioth.debian.org
Tue Sep 28 16:34:42 UTC 2010


The following commit has been merged in the master branch:
commit cfc34fe39bc49e82f158cd1405961f60f75700b1
Author: Matthias Klumpp <matthias at nlinux.org>
Date:   Tue Sep 28 18:34:28 2010 +0200

    Refreshed userfonts patch
    
    * Some changes were not committed with the last patch

diff --git a/debian/patches/10_lprojectm_userfonts.patch b/debian/patches/10_lprojectm_userfonts.patch
index 5533673..7db5ed8 100644
--- a/debian/patches/10_lprojectm_userfonts.patch
+++ b/debian/patches/10_lprojectm_userfonts.patch
@@ -20,7 +20,15 @@ Last-Update: 2010-09-25
      #ifdef WIN32
 --- a/src/libprojectM/Renderer/Renderer.cpp
 +++ b/src/libprojectM/Renderer/Renderer.cpp
-@@ -45,7 +45,21 @@
+@@ -6,6 +6,7 @@
+ #include "TextureManager.hpp"
+ #include <iostream>
+ #include <algorithm>
++#include <sys/stat.h> 
+ #include <cassert>
+ #include "omptl/omptl"
+ #include "omptl/omptl_algorithm"
+@@ -45,7 +46,21 @@
  	this->beatDetect = beatDetect;
  
  #ifdef USE_FTGL
@@ -32,12 +40,12 @@ Last-Update: 2010-09-25
 +	
 +	intStat = stat(title_fontURL.c_str(),&stFileInfo);
 +	if(intStat != 0) {
-+	  std::cout "Could not open font file: " << title_fontURL << std:endl;
++	  std::cout << "Could not open font file: " << title_fontURL << std::endl;
 +	  exit(1);
 +	}
 +	intStat = stat(menu_fontURL.c_str(),&stFileInfo);
 +	if(!intStat != 0) {
-+	  std::cout "Could not open font file: " << menu_fontURL << std:endl;
++	  std::cout << "Could not open font file: " << menu_fontURL << std::endl;
 +	  exit(1);
 +	}
  

-- 
projectm packaging



More information about the pkg-multimedia-commits mailing list