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

Fri Jun 25 15:59:09 UTC 2010

The following commit has been merged in the master branch:
commit 4660ea95b76f4de0d8c9b95b651c77a10bb62751
Author: Matthias Klumpp <matthias at nlinux.org>
Date:   Fri Jun 25 17:58:57 2010 +0200

    Some more patches for projectM
    
    * libprojectM-fix-soname: Patch which sets the right soname
      for libprojectM
    * libprojectM-Fonts: Remove fonts from build process and set
      system font paths.
    * libprojectM-UseThreads: Enable thread usage in libprojectM2

diff --git a/debian/patches/01_pulsecmakelist.patch b/debian/patches/01_pulseaudio_cmakelist.patch
similarity index 100%
rename from debian/patches/01_pulsecmakelist.patch
rename to debian/patches/01_pulseaudio_cmakelist.patch
diff --git a/debian/patches/03_pulseaudio-stat.patch b/debian/patches/03_pulseaudio_stat.patch
similarity index 86%
rename from debian/patches/03_pulseaudio-stat.patch
rename to debian/patches/03_pulseaudio_stat.patch
index 6e0992a..140429f 100644
--- a/debian/patches/03_pulseaudio-stat.patch
+++ b/debian/patches/03_pulseaudio_stat.patch
@@ -1,5 +1,5 @@
 diff -Naur projectM-pulseaudio-2.0.1-orig/qprojectM-pulseaudio.cpp projectM-pulseaudio-2.0.1/qprojectM-pulseaudio.cpp
---- projectm-2.0.1-orig/src/projectM-pulseaudio/qprojectM-pulseaudio.cpp	2010-01-26 11:52:18.000000000 -0500
+--- projectm-2.0.1.orig/src/projectM-pulseaudio/qprojectM-pulseaudio.cpp	2010-01-26 11:52:18.000000000 -0500
 +++ projectm-2.0.1/src/projectM-pulseaudio/qprojectM-pulseaudio.cpp		2010-01-26 12:09:43.000000000 -0500
 @@ -68,6 +68,7 @@
  #include <unistd.h>
@@ -8,3 +8,4 @@ diff -Naur projectM-pulseaudio-2.0.1-orig/qprojectM-pulseaudio.cpp projectM-puls
 +#include <sys/stat.h>
  
  //#include <pulsecore/gccmacro.h>
+
diff --git a/debian/patches/04_libprojectm_fix-soname.patch b/debian/patches/04_libprojectm_fix-soname.patch
new file mode 100644
index 0000000..3a29984
--- /dev/null
+++ b/debian/patches/04_libprojectm_fix-soname.patch
@@ -0,0 +1,12 @@
+diff -Naur libprojectM-2.0.1-orig/CMakeLists.txt libprojectM-2.0.1/CMakeLists.txt
+--- projectm-2.0.1.orig/src/libprojectM/CMakeLists.txt	2010-01-16 17:23:11.000000000 -0500
++++ projectm-2.0.1/src/libprojectM/CMakeLists.txt	2010-01-16 17:23:40.000000000 -0500
+@@ -110,7 +110,7 @@
+ ADD_LIBRARY(projectM SHARED ${projectM_SOURCES})
+ endif(BUILD_PROJECTM_STATIC)
+ 
+-SET_TARGET_PROPERTIES(projectM PROPERTIES VERSION 2.00 SOVERSION 2)
++SET_TARGET_PROPERTIES(projectM PROPERTIES VERSION 2.0.1 SOVERSION 2.0.1)
+ 
+ ADD_DEFINITIONS(-DUSE_THREADS)
+ 
diff --git a/debian/patches/05_libprojectm_fonts.patch b/debian/patches/05_libprojectm_fonts.patch
new file mode 100644
index 0000000..51c7f0d
--- /dev/null
+++ b/debian/patches/05_libprojectm_fonts.patch
@@ -0,0 +1,31 @@
+Set the right system font directories and exclude fonts
+from build.
+
+Author: Matthias <matthias at nlinux.org>
+
+Index: projectm-2.0.1/src/libprojectM/CMakeLists.txt
+===================================================================
+--- projectm-2.0.1.orig/src/libprojectM/CMakeLists.txt	2010-06-25 17:27:33.154001560 +0200
++++ projectm-2.0.1/src/libprojectM/CMakeLists.txt	2010-06-25 17:27:33.154001560 +0200
+@@ -169,8 +169,6 @@
+ 
+ FILE(GLOB presets "presets/*.milk" "presets/*.prjm" "presets/*.tga")
+ INSTALL(FILES ${presets} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/presets)
+-FILE(GLOB fonts "fonts/*.ttf")
+-INSTALL(FILES ${fonts} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/fonts)
+ 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
+===================================================================
+--- 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
+@@ -17,6 +17,6 @@
+ Aspect Correction = true	# Custom Shape Aspect Correction
+ 
+ Preset Path = @CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@/presets # preset location
+-Title Font = @CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@/fonts/Vera.ttf
+-Menu Font = @CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@/fonts/VeraMono.ttf
++Title Font = @CMAKE_INSTALL_PREFIX@/share/fonts/bitstream-vera/Vera.ttf
++Menu Font = @CMAKE_INSTALL_PREFIX@/share/fonts/bitstream-vera/VeraMono.ttf
+  
diff --git a/debian/patches/06_libprojectm_use-threads.patch b/debian/patches/06_libprojectm_use-threads.patch
new file mode 100644
index 0000000..60bf954
--- /dev/null
+++ b/debian/patches/06_libprojectm_use-threads.patch
@@ -0,0 +1,20 @@
+--- projectm-2.0.1.orig/src/libprojectM/CMakeLists.txt	2010-02-08 09:11:11.000000000 -0500
++++ projectm-2.0.1/src/libprojectM/CMakeLists.txt	2010-02-08 09:20:37.000000000 -0500
+@@ -112,7 +112,7 @@
+ 
+ SET_TARGET_PROPERTIES(projectM PROPERTIES VERSION 2.0.1 SOVERSION 2.0.1)
+ 
+-ADD_DEFINITIONS(-DUSE_THREADS)
++#ADD_DEFINITIONS(-DUSE_THREADS)
+ 
+ if (APPLE)
+ ADD_DEFINITIONS(-DMACOS -DSTBI_NO_DDS -DUSE_THREADS)
+@@ -123,7 +123,7 @@
+ ADD_DEFINITIONS(-DWIN32 -DSTBI_NO_DDS -DUSE_THREADS)
+ else(WIN32)
+ set (RESOURCE_PREFIX "share/projectM")
+-ADD_DEFINITIONS(-DLINUX -DSTBI_NO_DDS -DUSE_THREADS)
++ADD_DEFINITIONS(-DLINUX -DSTBI_NO_DDS)
+ endif(WIN32)
+ endif(APPLE)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index acfa71f..c8f02ee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,6 @@
-01_pulsecmakelist.patch
+01_pulseaudio_cmakelist.patch
 02_desktop-encoding.patch
-03_pulseaudio-stat.patch
+03_pulseaudio_stat.patch
+04_libprojectm_fix-soname.patch
+05_libprojectm_fonts.patch
+06_libprojectm_use-threads.patch

-- 
projectm packaging

