From d6bb8bbe3c0084132b899025a4ad5bf6f1a98281 Mon Sep 17 00:00:00 2001 From: Timo Gurr Date: Tue, 2 Feb 2010 01:17:43 +0000 Subject: Fix usage of newer celt versions wrt bug #293300. Thanks to Dennis Schridde again. (Portage version: 2.2_rc62/cvs/Linux x86_64) --- media-sound/mumble/ChangeLog | 9 +- .../mumble/files/mumble-1.2.1-celt-libnaming.patch | 52 ++++++++++ media-sound/mumble/mumble-1.2.1-r1.ebuild | 115 +++++++++++++++++++++ media-sound/mumble/mumble-1.2.1.ebuild | 111 -------------------- 4 files changed, 175 insertions(+), 112 deletions(-) create mode 100644 media-sound/mumble/files/mumble-1.2.1-celt-libnaming.patch create mode 100644 media-sound/mumble/mumble-1.2.1-r1.ebuild delete mode 100644 media-sound/mumble/mumble-1.2.1.ebuild (limited to 'media-sound/mumble') 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 -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/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 +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.1-r1.ebuild new file mode 100644 index 000000000000..985807ef5f27 --- /dev/null +++ b/media-sound/mumble/mumble-1.2.1-r1.ebuild @@ -0,0 +1,115 @@ +# 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 $ + +EAPI="2" + +inherit eutils multilib qt4 + +MY_P="${PN}-${PV/_/~}" + +DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software." +HOMEPAGE="http://mumble.sourceforge.net/" +SRC_URI="http://mumble.info/snapshot/${MY_P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+alsa +dbus debug g15 oss pch portaudio pulseaudio speech zeroconf" + +RDEPEND=">=dev-libs/boost-1.36.0-r1 + dev-libs/openssl + >=dev-libs/protobuf-2.2.0 + >=media-libs/celt-0.7.0 + >=media-libs/libsndfile-1.0.20 + >=media-libs/speex-1.2_rc1 + x11-libs/qt-core:4[ssl] + x11-libs/qt-gui:4 + x11-libs/qt-opengl:4 + x11-libs/qt-sql:4[sqlite] + x11-libs/qt-svg:4 + x11-libs/qt-xmlpatterns:4 + x11-proto/inputproto + alsa? ( media-libs/alsa-lib ) + dbus? ( x11-libs/qt-dbus:4 ) + g15? ( app-misc/g15daemon ) + portaudio? ( media-libs/portaudio ) + pulseaudio? ( media-sound/pulseaudio ) + speech? ( app-accessibility/speech-dispatcher ) + zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat] net-misc/mDNSResponder ) )" +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + epatch "${FILESDIR}/${P}-celt-libnaming.patch" +} + +src_configure() { + local conf_add + + if has_version '<=sys-devel/gcc-4.2'; then + conf_add="${conf_add} no-pch" + else + use pch || conf_add="${conf_add} no-pch" + fi + + use alsa || conf_add="${conf_add} no-alsa" + use dbus || conf_add="${conf_add} no-dbus" + use debug && conf_add="${conf_add} symbols debug" || conf_add="${conf_add} release" + use g15 || conf_add="${conf_add} no-g15" + use oss || conf_add="${conf_add} no-oss" + use portaudio || conf_add="${conf_add} no-portaudio" + use pulseaudio || conf_add="${conf_add} no-pulseaudio" + use speech || conf_add="${conf_add} no-speechd" + use zeroconf || conf_add="${conf_add} no-bonjour" + + eqmake4 "${S}/main.pro" -recursive \ + CONFIG+="${conf_add} \ + no-11x \ + no-bundled-celt \ + no-bundled-speex \ + no-embed-qt-translations \ + no-server" \ + DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble" \ + || die "eqmake4 failed." +} + +src_install() { + newdoc README.Linux README || die "Installing docs failed." + dodoc CHANGES || die "Installing docs failed." + + local dir + if use debug; then + dir=debug + else + dir=release + fi + + dobin "${dir}"/mumble || die "Installing mumble binary failed." + dobin scripts/mumble-overlay || die "Installing overlay script failed." + + insinto /usr/share/services + doins scripts/mumble.protocol || die "Installing mumble.protocol file failed." + + domenu scripts/mumble.desktop || die "Installing menu entry failed." + + insinto /usr/share/icons/hicolor/scalable/apps + doins icons/mumble.svg || die "Installing icon failed." + + doman man/mumble-overlay.1 || die "Installing mumble-overlay manpage failed." + doman man/mumble.1 || die "Installing mumble manpage failed." + + insopts -o root -g root -m 0755 + insinto "/usr/$(get_libdir)/mumble" + doins "${dir}"/lib*.so* || die "Installing plugins failed." + doins "${dir}"/plugins/lib*.so* || die "Installing plugins failed." +} + +pkg_postinst() { + echo + elog "Visit http://mumble.sourceforge.net/ for futher configuration instructions." + elog "Run mumble-overlay to start the OpenGL overlay (after starting mumble)." + echo +} diff --git a/media-sound/mumble/mumble-1.2.1.ebuild b/media-sound/mumble/mumble-1.2.1.ebuild deleted file mode 100644 index 44c6b646ba76..000000000000 --- a/media-sound/mumble/mumble-1.2.1.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# 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 $ - -EAPI="2" - -inherit eutils multilib qt4 - -MY_P="${PN}-${PV/_/~}" - -DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software." -HOMEPAGE="http://mumble.sourceforge.net/" -SRC_URI="http://mumble.info/snapshot/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+alsa +dbus debug g15 oss pch portaudio pulseaudio speech zeroconf" - -RDEPEND=">=dev-libs/boost-1.36.0-r1 - dev-libs/openssl - >=dev-libs/protobuf-2.2.0 - >=media-libs/celt-0.7.0 - >=media-libs/libsndfile-1.0.20 - >=media-libs/speex-1.2_rc1 - x11-libs/qt-core:4[ssl] - x11-libs/qt-gui:4 - x11-libs/qt-opengl:4 - x11-libs/qt-sql:4[sqlite] - x11-libs/qt-svg:4 - x11-libs/qt-xmlpatterns:4 - x11-proto/inputproto - alsa? ( media-libs/alsa-lib ) - dbus? ( x11-libs/qt-dbus:4 ) - g15? ( app-misc/g15daemon ) - portaudio? ( media-libs/portaudio ) - pulseaudio? ( media-sound/pulseaudio ) - speech? ( app-accessibility/speech-dispatcher ) - zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat] net-misc/mDNSResponder ) )" -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -S="${WORKDIR}/${MY_P}" - -src_configure() { - local conf_add - - if has_version '<=sys-devel/gcc-4.2'; then - conf_add="${conf_add} no-pch" - else - use pch || conf_add="${conf_add} no-pch" - fi - - use alsa || conf_add="${conf_add} no-alsa" - use dbus || conf_add="${conf_add} no-dbus" - use debug && conf_add="${conf_add} symbols debug" || conf_add="${conf_add} release" - use g15 || conf_add="${conf_add} no-g15" - use oss || conf_add="${conf_add} no-oss" - use portaudio || conf_add="${conf_add} no-portaudio" - use pulseaudio || conf_add="${conf_add} no-pulseaudio" - use speech || conf_add="${conf_add} no-speechd" - use zeroconf || conf_add="${conf_add} no-bonjour" - - eqmake4 "${S}/main.pro" -recursive \ - CONFIG+="${conf_add} \ - no-11x \ - no-bundled-celt \ - no-bundled-speex \ - no-embed-qt-translations \ - no-server" \ - DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble" \ - || die "eqmake4 failed." -} - -src_install() { - newdoc README.Linux README || die "Installing docs failed." - dodoc CHANGES || die "Installing docs failed." - - local dir - if use debug; then - dir=debug - else - dir=release - fi - - dobin "${dir}"/mumble || die "Installing mumble binary failed." - dobin scripts/mumble-overlay || die "Installing overlay script failed." - - insinto /usr/share/services - doins scripts/mumble.protocol || die "Installing mumble.protocol file failed." - - domenu scripts/mumble.desktop || die "Installing menu entry failed." - - insinto /usr/share/icons/hicolor/scalable/apps - doins icons/mumble.svg || die "Installing icon failed." - - doman man/mumble-overlay.1 || die "Installing mumble-overlay manpage failed." - doman man/mumble.1 || die "Installing mumble manpage failed." - - insopts -o root -g root -m 0755 - insinto "/usr/$(get_libdir)/mumble" - doins "${dir}"/lib*.so* || die "Installing plugins failed." - doins "${dir}"/plugins/lib*.so* || die "Installing plugins failed." -} - -pkg_postinst() { - echo - elog "Visit http://mumble.sourceforge.net/ for futher configuration instructions." - elog "Run mumble-overlay to start the OpenGL overlay (after starting mumble)." - echo -} -- cgit v1.2.3-65-gdbad