Fix usage of newer celt versions wrt bug #293300. Thanks to Dennis Schridde again.

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

4 files changed, 68 insertions, 4 deletions

diff --git a/media-sound/mumble/ChangeLog b/media-sound/mumble/ChangeLog
index 97174b3a5bc1..b88b79d8653f 100644
--- a/media-sound/mumble/ChangeLog
+++ b/media-sound/mumble/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/mumble
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mumble/ChangeLog,v 1.25 2010/01/08 21:00:44 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mumble/ChangeLog,v 1.26 2010/02/02 01:17:42 tgurr Exp $
+
+*mumble-1.2.1-r1 (02 Feb 2010)
+
+  02 Feb 2010; Timo Gurr <tgurr@gentoo.org> -mumble-1.2.1.ebuild,
+  +mumble-1.2.1-r1.ebuild, +files/mumble-1.2.1-celt-libnaming.patch:
+  Fix usage of newer celt versions wrt bug #293300. Thanks to Dennis
+  Schridde again.
 
 *mumble-1.2.1 (08 Jan 2010)
 
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index af2e162ed480..459d74c81ba5 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -1,6 +1,7 @@
+AUX mumble-1.2.1-celt-libnaming.patch 2254 RMD160 00aa5aa4635989c97e30758fc32db25bd16e9335 SHA1 f899908f290d4d0b716a331b19c3646feb3b1b92 SHA256 89d22541e3c2e29de21a40db1a1d5d817d9f58ec71dc8bd52e192ba09215b5d2
 DIST mumble-1.1.8.tar.gz 1241365 RMD160 d2d05993b38749f30ed67b8b92a22ef236dc7cf1 SHA1 83b5ef771b6801953290ee184f1590686e831b8c SHA256 4cef76457e3178f9d854327f4a02c3521b19ddf64c03947b3ba182f871a81856
 DIST mumble-1.2.1.tar.gz 2913120 RMD160 c9828ece38fbd65fc03cce82591600d8744f152a SHA1 af4fdc176727693c351d5ecb80e5c1077d7ae36f SHA256 91267a8511783fea5115137ef6ab4aacc76e363e504ac0f562af5e630d9e68c1
 EBUILD mumble-1.1.8.ebuild 2845 RMD160 9bcbc462cb02ecefbdccfad5f5f1464773e20f6d SHA1 add1e9aefb791318143a71b8e725909a1670cbb6 SHA256 fbc051feb2b0dae49c705239136513c84cb4996b804fdce813429a216947fd00
-EBUILD mumble-1.2.1.ebuild 3318 RMD160 624e063a901a8b615ab39b9a430bbfe23447b53d SHA1 d317eca273d4b55021b01dbfba4712c05689fb24 SHA256 49ce3365e4751adb2108806ed51e1e60e71a08e6ca7d1f6d6b9366cdbf14622e
-MISC ChangeLog 4903 RMD160 d4dbbd87231c130d894e183099e8739f69d697e9 SHA1 512a4e7f90fa77e325d2fde9fb688c0e4cd09bc7 SHA256 3f8e0624c7fa4305902308204a31e98b3e2830a6286a44f567149a3689221768
+EBUILD mumble-1.2.1-r1.ebuild 3388 RMD160 738f1114220b4c8b0e0750594beb22170ab40d1b SHA1 04eabff92f5b94bc2fb3bcb7f1947d1557a24adc SHA256 5aba4c2f5418942782ab5ba7344b3fe145355dced215639803939f9f3fa1ac69
+MISC ChangeLog 5158 RMD160 7f57dc35e5f1913dfa55726251fb12e204177e17 SHA1 d6c568c43580eda7bf809323246688eac844f6fc SHA256 f5b381493767a4d03e2db07bc0ddc0a389c63504f59a07e2551c51596b500e87
 MISC metadata.xml 549 RMD160 bf20d4ebeee550d7eca61800a73c35334d48c2c4 SHA1 c1ee529dac74906ffb1c8c32eb9e7923f8767dc1 SHA256 509dfd976cbcf31578d2a49906a7fee519fd5ec2dd664e85f5269d2da5337ff3
diff --git a/media-sound/mumble/files/mumble-1.2.1-celt-libnaming.patch b/media-sound/mumble/files/mumble-1.2.1-celt-libnaming.patch
new file mode 100644
index 000000000000..98639d151e45
--- /dev/null
+++ b/media-sound/mumble/files/mumble-1.2.1-celt-libnaming.patch
@@ -0,0 +1,52 @@
+From d10991031021d6d1836f1d36044455a28444b8b9 Mon Sep 17 00:00:00 2001
+From: Thorvald Natvig <slicer@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.3
diff --git a/media-sound/mumble/mumble-1.2.1.ebuild b/media-sound/mumble/mumble-1.2.1-r1.ebuild
index 44c6b646ba76..985807ef5f27 100644
--- a/media-sound/mumble/mumble-1.2.1.ebuild
+++ b/media-sound/mumble/mumble-1.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mumble/mumble-1.2.1.ebuild,v 1.1 2010/01/08 21:00:44 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mumble/mumble-1.2.1-r1.ebuild,v 1.1 2010/02/02 01:17:42 tgurr Exp $
 
 EAPI="2"
 
@@ -42,6 +42,10 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-celt-libnaming.patch"
+}
+
 src_configure() {
 	local conf_add