1 |
commit: 49ba2f7bae64d3a75f414c682f9703626a6fd9e7 |
2 |
Author: Ryan Hill <rhill <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Oct 2 01:41:14 2015 +0000 |
4 |
Commit: Ryan Hill <rhill <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Oct 2 01:41:14 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49ba2f7b |
7 |
|
8 |
media-sound/mumble: Fix build with GCC 4.9. |
9 |
|
10 |
Gentoo-Bug: https://bugs.gentoo.org/532180 |
11 |
|
12 |
Package-Manager: portage-2.2.22 |
13 |
Signed-off-by: Ryan Hill <rhill <AT> gentoo.org> |
14 |
|
15 |
media-sound/mumble/files/mumble-1.2.8-gcc49.patch | 26 +++++++++++++++++++++++ |
16 |
media-sound/mumble/mumble-1.2.8.ebuild | 3 ++- |
17 |
2 files changed, 28 insertions(+), 1 deletion(-) |
18 |
|
19 |
diff --git a/media-sound/mumble/files/mumble-1.2.8-gcc49.patch b/media-sound/mumble/files/mumble-1.2.8-gcc49.patch |
20 |
new file mode 100644 |
21 |
index 0000000..cecb3d3 |
22 |
--- /dev/null |
23 |
+++ b/media-sound/mumble/files/mumble-1.2.8-gcc49.patch |
24 |
@@ -0,0 +1,26 @@ |
25 |
+https://bugs.gentoo.org/532180 |
26 |
+ |
27 |
+Avoid "jump to label crosses initialization" error. |
28 |
+ |
29 |
+ Move variable "buffer" into the while loop to avoid a compile error |
30 |
+ with g++ 4.9.0. |
31 |
+ |
32 |
+ Although earlier compiler versions did accept the code, jumping into the |
33 |
+ scope of an variable length array is not allowed: |
34 |
+ http://gcc.gnu.org/onlinedocs/gcc-4.3.0/gcc/Variable-Length.html |
35 |
+ |
36 |
+ |
37 |
+--- a/src/mumble/OSS.cpp |
38 |
++++ b/src/mumble/OSS.cpp |
39 |
+@@ -243,9 +243,9 @@ void OSSInput::run() { |
40 |
+ eMicFormat = SampleShort; |
41 |
+ initializeMixer(); |
42 |
+ |
43 |
+- short buffer[iMicLength]; |
44 |
+- |
45 |
+ while (bRunning) { |
46 |
++ short buffer[iMicLength]; |
47 |
++ |
48 |
+ int len = static_cast<int>(iMicLength * iMicChannels * sizeof(short)); |
49 |
+ ssize_t l = read(fd, buffer, len); |
50 |
+ if (l != len) { |
51 |
|
52 |
diff --git a/media-sound/mumble/mumble-1.2.8.ebuild b/media-sound/mumble/mumble-1.2.8.ebuild |
53 |
index e457a05..a0282bf 100644 |
54 |
--- a/media-sound/mumble/mumble-1.2.8.ebuild |
55 |
+++ b/media-sound/mumble/mumble-1.2.8.ebuild |
56 |
@@ -1,4 +1,4 @@ |
57 |
-# Copyright 1999-2014 Gentoo Foundation |
58 |
+# Copyright 1999-2015 Gentoo Foundation |
59 |
# Distributed under the terms of the GNU General Public License v2 |
60 |
# $Id$ |
61 |
|
62 |
@@ -47,6 +47,7 @@ DEPEND="${RDEPEND} |
63 |
|
64 |
PATCHES=( |
65 |
"${FILESDIR}"/${PN}-1.2.4-speech-dispatcher.patch |
66 |
+ "${FILESDIR}"/${PN}-1.2.8-gcc49.patch |
67 |
) |
68 |
|
69 |
S="${WORKDIR}/${MY_P}" |