diff options
| -rw-r--r-- | media-sound/mumble/ChangeLog | 8 | ||||
| -rw-r--r-- | media-sound/mumble/files/mumble-1.2.1-celt-libnaming.patch | 52 | ||||
| -rw-r--r-- | media-sound/mumble/mumble-1.2.2.ebuild (renamed from media-sound/mumble/mumble-1.2.1-r1.ebuild) | 6 | ||||
| -rw-r--r-- | media-sound/murmur/ChangeLog | 8 | ||||
| -rw-r--r-- | media-sound/murmur/murmur-1.2.2.ebuild (renamed from media-sound/murmur/murmur-1.2.1.ebuild) | 2 |
5 files changed, 16 insertions, 60 deletions
diff --git a/media-sound/mumble/ChangeLog b/media-sound/mumble/ChangeLog index b88b79d8653f..5447481f01db 100644 --- a/media-sound/mumble/ChangeLog +++ b/media-sound/mumble/ChangeLog @@ -1,6 +1,12 @@ # 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.26 2010/02/02 01:17:42 tgurr Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mumble/ChangeLog,v 1.27 2010/02/10 21:48:20 tgurr Exp $ + +*mumble-1.2.2 (10 Feb 2010) + + 10 Feb 2010; Timo Gurr <tgurr@gentoo.org> -mumble-1.2.1-r1.ebuild, + -files/mumble-1.2.1-celt-libnaming.patch, +mumble-1.2.2.ebuild: + Version bump, remove old. *mumble-1.2.1-r1 (02 Feb 2010) 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 deleted file mode 100644 index 98639d151e45..000000000000 --- a/media-sound/mumble/files/mumble-1.2.1-celt-libnaming.patch +++ /dev/null @@ -1,52 +0,0 @@ -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-r1.ebuild b/media-sound/mumble/mumble-1.2.2.ebuild index 985807ef5f27..cf00242c1877 100644 --- a/media-sound/mumble/mumble-1.2.1-r1.ebuild +++ b/media-sound/mumble/mumble-1.2.2.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-r1.ebuild,v 1.1 2010/02/02 01:17:42 tgurr Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mumble/mumble-1.2.2.ebuild,v 1.1 2010/02/10 21:48:20 tgurr Exp $ EAPI="2" @@ -42,10 +42,6 @@ DEPEND="${RDEPEND} S="${WORKDIR}/${MY_P}" -src_prepare() { - epatch "${FILESDIR}/${P}-celt-libnaming.patch" -} - src_configure() { local conf_add diff --git a/media-sound/murmur/ChangeLog b/media-sound/murmur/ChangeLog index 5fd3099f6ac2..f5e71ccc6533 100644 --- a/media-sound/murmur/ChangeLog +++ b/media-sound/murmur/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-sound/murmur # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/ChangeLog,v 1.21 2010/01/08 21:05:54 tgurr Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/ChangeLog,v 1.22 2010/02/10 21:52:57 tgurr Exp $ + +*murmur-1.2.2 (10 Feb 2010) + + 10 Feb 2010; Timo Gurr <tgurr@gentoo.org> -murmur-1.2.1.ebuild, + +murmur-1.2.2.ebuild: + Version bump, remove old. *murmur-1.2.1 (08 Jan 2010) diff --git a/media-sound/murmur/murmur-1.2.1.ebuild b/media-sound/murmur/murmur-1.2.2.ebuild index 6c1cdbea6917..ccbe935847d7 100644 --- a/media-sound/murmur/murmur-1.2.1.ebuild +++ b/media-sound/murmur/murmur-1.2.2.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/murmur/murmur-1.2.1.ebuild,v 1.1 2010/01/08 21:05:54 tgurr Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/murmur-1.2.2.ebuild,v 1.1 2010/02/10 21:52:57 tgurr Exp $ EAPI="2" |