mumble: update to 1.2.6.
This commit is contained in:
parent
c15f2826e4
commit
770d11d639
|
@ -0,0 +1,34 @@
|
||||||
|
From 349436284b5f1baa61836c98ff0d518392140c5d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Christian Krause <chkr@plauener.de>
|
||||||
|
Date: Mon, 28 Apr 2014 03:08:08 +0200
|
||||||
|
Subject: [PATCH] Avoid "jump to label crosses initialization" error.
|
||||||
|
|
||||||
|
Move variable "buffer" into the while loop to avoid a compile error
|
||||||
|
with g++ 4.9.0.
|
||||||
|
|
||||||
|
Although earlier compiler versions did accept the code, jumping into the
|
||||||
|
scope of an variable length array is not allowed:
|
||||||
|
http://gcc.gnu.org/onlinedocs/gcc-4.3.0/gcc/Variable-Length.html
|
||||||
|
---
|
||||||
|
src/mumble/OSS.cpp | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/mumble/OSS.cpp b/src/mumble/OSS.cpp
|
||||||
|
index eb87d5b..4af1326 100644
|
||||||
|
--- src/mumble/OSS.cpp
|
||||||
|
+++ src/mumble/OSS.cpp
|
||||||
|
@@ -243,9 +243,9 @@ void OSSInput::run() {
|
||||||
|
eMicFormat = SampleShort;
|
||||||
|
initializeMixer();
|
||||||
|
|
||||||
|
- short buffer[iMicLength];
|
||||||
|
-
|
||||||
|
while (bRunning) {
|
||||||
|
+ short buffer[iMicLength];
|
||||||
|
+
|
||||||
|
int len = static_cast<int>(iMicLength * iMicChannels * sizeof(short));
|
||||||
|
ssize_t l = read(fd, buffer, len);
|
||||||
|
if (l != len) {
|
||||||
|
--
|
||||||
|
1.9.3
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
# Template file for 'mumble'
|
# Template file for 'mumble'
|
||||||
pkgname=mumble
|
pkgname=mumble
|
||||||
version=1.2.5
|
version=1.2.6
|
||||||
revision=2
|
revision=1
|
||||||
hostmakedepends="pkg-config"
|
hostmakedepends="pkg-config"
|
||||||
makedepends="
|
makedepends="
|
||||||
libcap-devel Ice-devel>=3.5 protobuf-devel>=2.5.0 libXi-devel qt-devel openssl-devel
|
libcap-devel Ice-devel>=3.5 protobuf-devel>=2.5.0 libXi-devel qt-devel openssl-devel
|
||||||
speex-devel libsndfile-devel libX11-devel alsa-lib-devel pulseaudio-devel
|
speex-devel libsndfile-devel libX11-devel alsa-lib-devel pulseaudio-devel
|
||||||
avahi-compat-libs-devel MesaLib-devel libstdc++-devel libogg-devel boost-devel"
|
avahi-compat-libs-devel MesaLib-devel opus-devel libogg-devel boost-devel"
|
||||||
depends="qt-plugin-sqlite desktop-file-utils hicolor-icon-theme"
|
depends="qt-plugin-sqlite desktop-file-utils hicolor-icon-theme"
|
||||||
replaces="libmumble<=1.2.3"
|
replaces="libmumble<=1.2.3"
|
||||||
short_desc="Open source, low-latency, high quality voice chat for gaming"
|
short_desc="Open source, low-latency, high quality voice chat for gaming"
|
||||||
|
@ -14,20 +14,18 @@ maintainer="Juan RP <xtraeme@gmail.com>"
|
||||||
homepage="http://mumble.sourceforge.net/"
|
homepage="http://mumble.sourceforge.net/"
|
||||||
license="BSD"
|
license="BSD"
|
||||||
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
|
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
|
||||||
checksum=915156946f7662c2488e4c40c95cb95c4ff00532789515da7df775a36d544faf
|
checksum=876cdecfb89798ab45020cdae0d64bd0fa899a9a97c2c7f4a6e706d4165fb6ff
|
||||||
|
|
||||||
disable_parallel_build=yes
|
|
||||||
|
|
||||||
do_configure() {
|
do_configure() {
|
||||||
# Needs bundled celt for some reason
|
# Needs bundled celt for some reason
|
||||||
qmake -recursive main.pro \
|
qmake -recursive main.pro \
|
||||||
CONFIG+="no-speechd bundled-celt no-bundled-speex no-g15 \
|
CONFIG+="bundled-celt no-bundled-opus no-speechd no-bundled-speex no-g15 \
|
||||||
pulseaudio no-embed-qt-translations no-update" \
|
no-xevie pulseaudio no-embed-qt-translations no-update-packaged" \
|
||||||
DEFINES+="PLUGIN_PATH=/usr/lib/mumble"
|
DEFINES+="PLUGIN_PATH=/usr/lib/mumble"
|
||||||
}
|
}
|
||||||
|
|
||||||
do_build() {
|
do_build() {
|
||||||
make ${makejobs} release
|
make release
|
||||||
}
|
}
|
||||||
|
|
||||||
do_install() {
|
do_install() {
|
||||||
|
|
Loading…
Reference in New Issue