Gentoo Archives: gentoo-commits

From: "Timo Gurr (tgurr)" <tgurr@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-sound/mumble/files: mumble-1.2.1-celt-libnaming.patch
Date: Tue, 02 Feb 2010 01:17:49
Message-Id: E1Nc7Oh-0007cU-OA@stork.gentoo.org
1 tgurr 10/02/02 01:17:43
2
3 Added: mumble-1.2.1-celt-libnaming.patch
4 Log:
5 Fix usage of newer celt versions wrt bug #293300. Thanks to Dennis Schridde again.
6 (Portage version: 2.2_rc62/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 media-sound/mumble/files/mumble-1.2.1-celt-libnaming.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/mumble/files/mumble-1.2.1-celt-libnaming.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/mumble/files/mumble-1.2.1-celt-libnaming.patch?rev=1.1&content-type=text/plain
13
14 Index: mumble-1.2.1-celt-libnaming.patch
15 ===================================================================
16 From d10991031021d6d1836f1d36044455a28444b8b9 Mon Sep 17 00:00:00 2001
17 From: Thorvald Natvig <slicer@×××××××××××××××××.net>
18 Date: Sat, 16 Jan 2010 18:03:38 +0100
19 Subject: [PATCH] Update to new naming for libcelt0
20
21 ---
22 celt-0.7.0-build/celt-0.7.0-build.pro | 2 +-
23 installer/Mumble.nsi | 4 ++--
24 src/mumble/Audio.cpp | 15 +++++++++------
25 3 files changed, 12 insertions(+), 9 deletions(-)
26
27 diff --git a/src/mumble/Audio.cpp b/src/mumble/Audio.cpp
28 index 91462bb..4bf8538 100644
29 --- a/src/mumble/Audio.cpp
30 +++ b/src/mumble/Audio.cpp
31 @@ -104,25 +104,28 @@ CELTCodec::CELTCodec(const QString &version) {
32
33 QStringList alternatives;
34 #if defined(Q_OS_MAC)
35 - alternatives << QString::fromLatin1("celt.%1.dylib").arg(version);
36 + alternatives << QString::fromLatin1("libcelt0.%1.dylib").arg(version);
37 + alternatives << QString::fromLatin1("celt0.%1.dylib").arg(version);
38 alternatives << QString::fromLatin1("libcelt.%1.dylib").arg(version);
39 + alternatives << QString::fromLatin1("celt.%1.dylib").arg(version);
40 #elif defined(Q_OS_UNIX)
41 - alternatives << QString::fromLatin1("celt.so.%1").arg(version);
42 + alternatives << QString::fromLatin1("libcelt0.so.%1").arg(version);
43 alternatives << QString::fromLatin1("libcelt.so.%1").arg(version);
44 + alternatives << QString::fromLatin1("celt.so.%1").arg(version);
45 #else
46 int cpuinfo[4];
47 __cpuid(cpuinfo, 1);
48 if (cpuinfo[3] & 0x02000000) {
49 if (cpuinfo[3] & 0x04000000) {
50 if (cpuinfo[2] & 0x00000001) {
51 - alternatives << QString::fromLatin1("celt.%1.sse3.dll").arg(version);
52 + alternatives << QString::fromLatin1("celt0.%1.sse3.dll").arg(version);
53 }
54 - alternatives << QString::fromLatin1("celt.%1.sse2.dll").arg(version);
55 + alternatives << QString::fromLatin1("celt0.%1.sse2.dll").arg(version);
56 }
57 - alternatives << QString::fromLatin1("celt.%1.sse.dll").arg(version);
58 + alternatives << QString::fromLatin1("celt0.%1.sse.dll").arg(version);
59 }
60
61 - alternatives << QString::fromLatin1("celt.%1.dll").arg(version);
62 + alternatives << QString::fromLatin1("celt0.%1.dll").arg(version);
63 #endif
64 foreach(const QString &lib, alternatives) {
65 qlCELT.setFileName(QApplication::instance()->applicationDirPath() + QLatin1String("/") + lib);
66 --
67 1.6.3