X-Original-To: alpine-aports@mail.alpinelinux.org Delivered-To: alpine-aports@mail.alpinelinux.org Received: from mail.alpinelinux.org (dallas-a1.alpinelinux.org [127.0.0.1]) by mail.alpinelinux.org (Postfix) with ESMTP id C2ACFDC0569 for ; Mon, 1 Jun 2015 19:20:56 +0000 (UTC) Received: from mx0.jmt.gr (mx0.jmt.gr [81.7.7.41]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id 63286DC011F for ; Mon, 1 Jun 2015 19:20:51 +0000 (UTC) Received: from localhost.my.domain (unknown [178.254.48.21]) by mx0.jmt.gr (Postfix) with ESMTPSA id 8E4BC802CD; Mon, 1 Jun 2015 19:20:48 +0000 (GMT) From: Johannes Matheis To: alpine-aports@lists.alpinelinux.org Cc: Johannes Matheis Subject: [alpine-aports] [PATCH] main/mumble: fixed build issue & minor changes Date: Mon, 1 Jun 2015 19:20:30 +0000 Message-Id: <1433186430-2162-1-git-send-email-jomat+alpinebuild@jmt.gr> X-Mailer: git-send-email 2.4.0 X-Virus-Scanned: ClamAV using ClamSMTP X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- .../349436284b5f1baa61836c98ff0d518392140c5d.patch | 31 ++++++++++++++++++++++ main/mumble/APKBUILD | 14 ++++++---- main/mumble/murmur.initd | 2 +- 3 files changed, 41 insertions(+), 6 deletions(-) create mode 100644 main/mumble/349436284b5f1baa61836c98ff0d518392140c5d.patch diff --git a/main/mumble/349436284b5f1baa61836c98ff0d518392140c5d.patch b/main/mumble/349436284b5f1baa61836c98ff0d518392140c5d.patch new file mode 100644 index 0000000..4a16c13 --- /dev/null +++ b/main/mumble/349436284b5f1baa61836c98ff0d518392140c5d.patch @@ -0,0 +1,31 @@ +From 349436284b5f1baa61836c98ff0d518392140c5d Mon Sep 17 00:00:00 2001 +From: Christian Krause +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 +--- a/src/mumble/OSS.cpp ++++ b/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(iMicLength * iMicChannels * sizeof(short)); + ssize_t l = read(fd, buffer, len); + if (l != len) { diff --git a/main/mumble/APKBUILD b/main/mumble/APKBUILD index cf8af32..7402a29 100644 --- a/main/mumble/APKBUILD +++ b/main/mumble/APKBUILD @@ -2,14 +2,14 @@ # Maintainer: Johannes Matheis pkgname=mumble pkgver=1.2.8 -pkgrel=3 +pkgrel=4 pkgdesc="Mumble is an open source, low-latency, high quality voice chat software primarily intended for use while gaming" url="http://mumble.sourceforge.net/" arch="all" license="BSD" depends="qt-sqlite" depends_dev="qt-dev libsndfile-dev boost-dev avahi-dev protobuf-dev libxi-dev - speex-dev libcap-dev" + speex-dev speexdsp-dev libcap-dev" makedepends="$depends_dev" install="murmur.pre-install" pkgusers="murmur" @@ -17,6 +17,7 @@ pkggroups="murmur" subpackages="$pkgname-doc murmur murmur-doc:murmur_doc" source="http://downloads.sourceforge.net/mumble/$pkgname-$pkgver.tar.gz murmur.initd + 349436284b5f1baa61836c98ff0d518392140c5d.patch " _builddir=$srcdir/$pkgname-$pkgver @@ -80,8 +81,11 @@ murmur_doc() { } md5sums="1a3ef91489ff674dfc010377d7721a28 mumble-1.2.8.tar.gz -b62d8e976d4f82ae850720ff70ead4b3 murmur.initd" +a33eeda77b1a5d10fbebaefd9c54ec8f murmur.initd +9a1c254352dd4bb9fe4ba2f7471fb030 349436284b5f1baa61836c98ff0d518392140c5d.patch" sha256sums="4c2fc3dff49687bc1d977905958e8a9c35e109723aeed42c9ea124104febe159 mumble-1.2.8.tar.gz -3f977e2b01f9e354ddf93111c0bee6b82e4f8a4530c7b1e11a004d45ec838937 murmur.initd" +2fa2104cc57a53145b0e962e04d90c49e3a70b9dfc3c78202948f97157c961d8 murmur.initd +15a280e13e6671f3be1ef35d9462055d589bca0963048c495b62d0ba53b37dad 349436284b5f1baa61836c98ff0d518392140c5d.patch" sha512sums="9c3534dacce22c6152f3ffa847e98b3b1bab43fd8a92285362333487b1bb9a064699296005350cf09bd44a8070508beaf14d3b518465fad3db94710cd818bc5b mumble-1.2.8.tar.gz -26ec430c90dd934b921a69db56e1d394ffbcac10de3242734e182a7436d634261ed1aedd2e489c834bc42b12567ff4231280e8f8df66ab55df90e0ddd0cd7ea1 murmur.initd" +c74ade232146a180448cb0027503f59642000bee50613a1fb99162cdc4bc81089ab4e84e51b0bbdac5c176eb52b76e6bd2b3ec790a9148135a1fc050569921c3 murmur.initd +17b4a2c506adddf58ed43b28cf97a256f891049bb87040e6eb9185e0174f1e827d1511e4554327b5337394356b787edf32a44e95624f9e004b35c0b1fecae0a4 349436284b5f1baa61836c98ff0d518392140c5d.patch" diff --git a/main/mumble/murmur.initd b/main/mumble/murmur.initd index ba3cbe4..3eb0fcf 100644 --- a/main/mumble/murmur.initd +++ b/main/mumble/murmur.initd @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run depends() { needs localmount -- 2.4.0 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---