[SCM] projectm/master: Make cmake find FreeType library

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

The following commit has been merged in the master branch:
commit 0a13ff3e7d4bf4c75ee9d85f81ca2097364d03ff
Author: Matthias Klumpp <matthias at nlinux.org>
Date:   Wed Mar 23 15:31:52 2011 +0100

    Make cmake find FreeType library
    
    Use FindFreetype shipped with cmake instead
    of the version shipped with projectM sources.
    The projectM version is buggy and does not
    work with newer FreeType library versions.

diff --git a/debian/patches/13_lprojectm_cmake_freetype.patch b/debian/patches/13_lprojectm_cmake_freetype.patch
new file mode 100644
index 0000000..a4cb358
--- /dev/null
+++ b/debian/patches/13_lprojectm_cmake_freetype.patch
@@ -0,0 +1,77 @@
+Description: Patch to make projectM find Freetype
+ Use FindFreetype from cmake itself instead using the buggy
+ cmake script which is shipped with projectM.
+Forwarded: no
+Author: Matthias Klumpp <matthias at nlinux.org>
+Last-Update: 2011-03-22
+--- a/src/libprojectM/CMakeLists.txt
++++ b/src/libprojectM/CMakeLists.txt
+@@ -9,7 +9,7 @@
+ 
+ 
+ set( CMAKE_MODULE_PATH    ${CMAKE_MODULE_PATH}
+-                          ${CMAKE_CURRENT_SOURCE_DIR}/cmake )     
++                          ${CMAKE_CURRENT_SOURCE_DIR}/cmake )
+ 
+ OPTION (USE_DEVIL "Use devIL for image loading rather than the builtin SOIL library" OFF)
+ 
+@@ -42,8 +42,8 @@
+ 
+ SET(LIB_INSTALL_DIR "\${exec_prefix}/lib${LIB_SUFFIX}"
+   CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib${LIB_SUFFIX})"
+-  FORCE)  
+-  
++  FORCE)
++
+ if (USE_NATIVE_GLEW)
+ ADD_DEFINITIONS(-DUSE_NATIVE_GLEW)
+ SET(GLEW_SOURCES glew.h glew.c)
+@@ -102,8 +102,8 @@
+ if(USE_FTGL)
+ ADD_DEFINITIONS(-DUSE_FTGL)
+ 
+-find_package( Freetype2 REQUIRED)
+-include_directories( ${FREETYPE2_INCLUDE_DIR} )
++find_package( Freetype REQUIRED)
++include_directories( ${FREETYPE_INCLUDE_DIRS} )
+ 
+ endif(USE_FTGL)
+ 
+@@ -138,7 +138,7 @@
+ 
+ add_subdirectory(Renderer)
+ 
+-#ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX="\\\"${CMAKE_INSTALL_PREFIX}\\\"") 
++#ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX="\\\"${CMAKE_INSTALL_PREFIX}\\\"")
+ 
+ FIND_PACKAGE(OpenGL)
+ 
+@@ -153,23 +153,23 @@
+ 	if (FTGL_FOUND)
+ 		MESSAGE(STATUS "[projectM] FTGL font support was detected and enabled.")
+ 	else (FTGL_FOUND)
+-		MESSAGE(STATUS 
++		MESSAGE(STATUS
+ 	"[projectM] Warning! FTGL has been enabled but not detected. Your compilation will probably break. Turn off FTGL support by setting USE_FTGL to false, or visit http://ftgl.wiki.sourceforge.net/ for help on installing FTGL.")
+ 	endif (FTGL_FOUND)
+-	
++
+ 	ADD_DEFINITIONS(-DUSE_FTGL)
+-	
++
+ 	set (FTGL_INCUDE_DIRS ${FTGL_INCLUDE_DIRS} ${CMAKE_INCLUDE_PATH} ${OPENGL_INCLUDE_DIR})
+ 	set (FTGL_LINK_DIRS ${FTGL_LIBRARY_DIRS} )
+ 	set (FTGL_LINK_TARGETS ftgl freetype)
+-	
++
+ ELSE (USE_FTGL)
+ 	IF (FTGL_FOUND)
+ 		MESSAGE(STATUS "[projectM] Warning: FTGL font support was detected but NOT enabled. You can enable it by setting USE_FTGL=true")
+ 	ELSE (FTGL_FOUND)
+ 		MESSAGE(STATUS "[projectM] Warning: FTGL font support was not detected. Visit http://ftgl.wiki.sourceforge.net/ for help on installing FTGL.")
+ 	ENDIF(FTGL_FOUND)
+-	
++
+ 	# todo: change this because its obscure and probably not being used
+ 	set (FTGL_INCLUDE_DIRS "/opt/local/include")
+ 	set (FTGL_LINK_DIRS )
diff --git a/debian/patches/series b/debian/patches/series
index fe0f698..9a3096e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@
 10_lprojectm_userfonts.patch
 11_lprojectm_change-texture-size.patch
 12_lprojectm_change-preset-duration.patch
+13_lprojectm_cmake_freetype.patch

-- 
projectm packaging