[Pkg-voip-commits] r7969 - in /mumble/trunk/debian: changelog control patches/0001-Update-to-new-naming-for-libcelt0.patch patches/series
slicer-guest at alioth.debian.org
slicer-guest at alioth.debian.org
Tue Jan 19 13:19:05 UTC 2010
Author: slicer-guest
Date: Tue Jan 19 13:19:01 2010
New Revision: 7969
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7969
Log:
Add support for upcoming libcelt0-0.
Added:
mumble/trunk/debian/patches/0001-Update-to-new-naming-for-libcelt0.patch
Modified:
mumble/trunk/debian/changelog
mumble/trunk/debian/control
mumble/trunk/debian/patches/series
Modified: mumble/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/changelog?rev=7969&op=diff
==============================================================================
--- mumble/trunk/debian/changelog (original)
+++ mumble/trunk/debian/changelog Tue Jan 19 13:19:01 2010
@@ -4,6 +4,7 @@
* Remove 'ulimit -r' support from defaults and initscript; it's bash-only.
* Remove debconf for emailfrom, it's been deprecated in the 1.2.x series.
* Add debconf for use_capabilities; it is needed on servers with load.
+ * Add support for upcoming libcelt0-0.
[ Patrick Matthäi ]
* Change my odd email address in po/de.po.
Modified: mumble/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/control?rev=7969&op=diff
==============================================================================
--- mumble/trunk/debian/control (original)
+++ mumble/trunk/debian/control Tue Jan 19 13:19:01 2010
@@ -24,7 +24,7 @@
Package: mumble
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libcelt0 (>= 0.7.0), libcelt0 (<< 0.7.1~), libqt4-sql-sqlite, lsb-release
+Depends: ${shlibs:Depends}, ${misc:Depends}, libcelt0 (>= 0.7.0) | libcelt0-0 (>= 0.7.1~), libqt4-sql-sqlite, lsb-release
Recommends: speech-dispatcher, mumble-11x
Suggests: mumble-server
Description: Low latency VoIP client
Added: mumble/trunk/debian/patches/0001-Update-to-new-naming-for-libcelt0.patch
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/patches/0001-Update-to-new-naming-for-libcelt0.patch?rev=7969&op=file
==============================================================================
--- mumble/trunk/debian/patches/0001-Update-to-new-naming-for-libcelt0.patch (added)
+++ mumble/trunk/debian/patches/0001-Update-to-new-naming-for-libcelt0.patch Tue Jan 19 13:19:01 2010
@@ -1,0 +1,53 @@
+From d10991031021d6d1836f1d36044455a28444b8b9 Mon Sep 17 00:00:00 2001
+From: Thorvald Natvig <slicer at users.sourceforge.net>
+Date: Sat, 16 Jan 2010 18:03:38 +0100
+Subject: [PATCH] Update to new naming for libcelt0
+
+---
+ celt-0.7.0-build/celt-0.7.0-build.pro | 2 +-
+ installer/Mumble.nsi | 4 ++--
+ src/mumble/Audio.cpp | 15 +++++++++------
+ 3 files changed, 12 insertions(+), 9 deletions(-)
+
+diff --git a/src/mumble/Audio.cpp b/src/mumble/Audio.cpp
+index 91462bb..4bf8538 100644
+--- a/src/mumble/Audio.cpp
++++ b/src/mumble/Audio.cpp
+@@ -104,25 +104,28 @@ CELTCodec::CELTCodec(const QString &version) {
+
+ QStringList alternatives;
+ #if defined(Q_OS_MAC)
+- alternatives << QString::fromLatin1("celt.%1.dylib").arg(version);
++ alternatives << QString::fromLatin1("libcelt0.%1.dylib").arg(version);
++ alternatives << QString::fromLatin1("celt0.%1.dylib").arg(version);
+ alternatives << QString::fromLatin1("libcelt.%1.dylib").arg(version);
++ alternatives << QString::fromLatin1("celt.%1.dylib").arg(version);
+ #elif defined(Q_OS_UNIX)
+- alternatives << QString::fromLatin1("celt.so.%1").arg(version);
++ alternatives << QString::fromLatin1("libcelt0.so.%1").arg(version);
+ alternatives << QString::fromLatin1("libcelt.so.%1").arg(version);
++ alternatives << QString::fromLatin1("celt.so.%1").arg(version);
+ #else
+ int cpuinfo[4];
+ __cpuid(cpuinfo, 1);
+ if (cpuinfo[3] & 0x02000000) {
+ if (cpuinfo[3] & 0x04000000) {
+ if (cpuinfo[2] & 0x00000001) {
+- alternatives << QString::fromLatin1("celt.%1.sse3.dll").arg(version);
++ alternatives << QString::fromLatin1("celt0.%1.sse3.dll").arg(version);
+ }
+- alternatives << QString::fromLatin1("celt.%1.sse2.dll").arg(version);
++ alternatives << QString::fromLatin1("celt0.%1.sse2.dll").arg(version);
+ }
+- alternatives << QString::fromLatin1("celt.%1.sse.dll").arg(version);
++ alternatives << QString::fromLatin1("celt0.%1.sse.dll").arg(version);
+ }
+
+- alternatives << QString::fromLatin1("celt.%1.dll").arg(version);
++ alternatives << QString::fromLatin1("celt0.%1.dll").arg(version);
+ #endif
+ foreach(const QString &lib, alternatives) {
+ qlCELT.setFileName(QApplication::instance()->applicationDirPath() + QLatin1String("/") + lib);
+--
+1.6.6
+
Modified: mumble/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/patches/series?rev=7969&op=diff
==============================================================================
--- mumble/trunk/debian/patches/series (original)
+++ mumble/trunk/debian/patches/series Tue Jan 19 13:19:01 2010
@@ -1,1 +1,2 @@
0001-Fixed-patch-for-sqlite-syntax.patch
+0001-Update-to-new-naming-for-libcelt0.patch
More information about the Pkg-voip-commits
mailing list