diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-06-24 07:14:01 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-06-24 07:17:32 +0000 |
| commit | b349d40ed2f3d5bbbb375ea32ebb37a17b608d68 (patch) | |
| tree | f3cf3f59e9360815094516bbb3203a7b216bfa6e | |
| parent | ffe5857b20351350c6132f2fc83157e2e722a7a3 (diff) | |
| download | aports-b349d40ed2f3d5bbbb375ea32ebb37a17b608d68.tar.bz2 aports-b349d40ed2f3d5bbbb375ea32ebb37a17b608d68.tar.xz | |
main/mumble: upgrade to 1.2.9
| -rw-r--r-- | main/mumble/349436284b5f1baa61836c98ff0d518392140c5d.patch | 31 | ||||
| -rw-r--r-- | main/mumble/APKBUILD | 14 |
2 files changed, 5 insertions, 40 deletions
diff --git a/main/mumble/349436284b5f1baa61836c98ff0d518392140c5d.patch b/main/mumble/349436284b5f1baa61836c98ff0d518392140c5d.patch deleted file mode 100644 index 4a16c13789..0000000000 --- a/main/mumble/349436284b5f1baa61836c98ff0d518392140c5d.patch +++ /dev/null @@ -1,31 +0,0 @@ -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 ---- 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<int>(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 f8cc8cbeb1..ff7b3dd297 100644 --- a/main/mumble/APKBUILD +++ b/main/mumble/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Johannes Matheis <jomat+alpinebuild@jmt.gr> # Maintainer: Johannes Matheis <jomat+alpinebuild@jmt.gr> pkgname=mumble -pkgver=1.2.8 -pkgrel=5 +pkgver=1.2.9 +pkgrel=0 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" @@ -16,7 +16,6 @@ pkgusers="murmur" pkggroups="murmur" subpackages="$pkgname-doc murmur murmur-doc:murmur_doc" source="http://downloads.sourceforge.net/mumble/$pkgname-$pkgver.tar.gz - 349436284b5f1baa61836c98ff0d518392140c5d.patch murmur.initd " @@ -89,12 +88,9 @@ murmur_doc() { install -Dm644 ./LICENSE ${subpkgdir}/usr/share/licenses/murmur/LICENSE } -md5sums="1a3ef91489ff674dfc010377d7721a28 mumble-1.2.8.tar.gz -9a1c254352dd4bb9fe4ba2f7471fb030 349436284b5f1baa61836c98ff0d518392140c5d.patch +md5sums="85decb9a1efb13e7558fab6265f81ad8 mumble-1.2.9.tar.gz a33eeda77b1a5d10fbebaefd9c54ec8f murmur.initd" -sha256sums="4c2fc3dff49687bc1d977905958e8a9c35e109723aeed42c9ea124104febe159 mumble-1.2.8.tar.gz -15a280e13e6671f3be1ef35d9462055d589bca0963048c495b62d0ba53b37dad 349436284b5f1baa61836c98ff0d518392140c5d.patch +sha256sums="4bd17e85613267f1df39e8328de5053586576d3de4659d3f33833282c4322cbb mumble-1.2.9.tar.gz 2fa2104cc57a53145b0e962e04d90c49e3a70b9dfc3c78202948f97157c961d8 murmur.initd" -sha512sums="9c3534dacce22c6152f3ffa847e98b3b1bab43fd8a92285362333487b1bb9a064699296005350cf09bd44a8070508beaf14d3b518465fad3db94710cd818bc5b mumble-1.2.8.tar.gz -17b4a2c506adddf58ed43b28cf97a256f891049bb87040e6eb9185e0174f1e827d1511e4554327b5337394356b787edf32a44e95624f9e004b35c0b1fecae0a4 349436284b5f1baa61836c98ff0d518392140c5d.patch +sha512sums="dfd3cf620e2b65aafa55cb3d021e626d2c37683da6c31a1787a35b94254c446d1816ad4f05fa004dedeab6edd5c4696ce4ef8033f465b3d2c3cdfbfea97cf5d0 mumble-1.2.9.tar.gz c74ade232146a180448cb0027503f59642000bee50613a1fb99162cdc4bc81089ab4e84e51b0bbdac5c176eb52b76e6bd2b3ec790a9148135a1fc050569921c3 murmur.initd" |