On Fri, Jun 25, 2010 at 17:59:09 (CEST), ximion-gu...@users.alioth.debian.org
wrote:
The following commit has been merged in the master branch:
commit 4660ea95b76f4de0d8c9b95b651c77a10bb62751
Author: Matthias Klumpp matth...@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.0 -0500
+--- projectm-2.0.1.orig/src/projectM-pulseaudio/qprojectM-pulseaudio.cpp
2010-01-26 11:52:18.0 -0500
+++ projectm-2.0.1/src/projectM-pulseaudio/qprojectM-pulseaudio.cpp
2010-01-26 12:09:43.0 -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 000..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.0 -0500
projectm-2.0.1/src/libprojectM/CMakeLists.txt2010-01-16
17:23:40.0 -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)
err, do you really bump the soname from 2 to 2.0.1? why?
TBH, this looks wrong to me. since this is a new library, this cannot
break binary compatibility. do other distros ship with a soversion of 2.0.1?
--
Gruesse/greetings,
Reinhard Tartler, KeyID 945348A4
___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-multimedia-maintainers
