anonfunc/aur-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

1.3.0~2717~gb25db3e; removed openssl-1.0 workaround

Browse Source
This commit is contained in:
Giovanni Harting
2018-03-22 00:43:26 +01:00
parent bed3f7aa7d
commit 8f1999bec4
3 changed files with 13 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.SRCINFO
View File

@@ -1,6 +1,6 @@
pkgbase = mumble-snapshot pkgbase = mumble-snapshot
pkgdesc = A high quality voice chat program. pkgdesc = A high quality voice chat program.
pkgver = 1.3.0_2586_g894ade2 pkgver = 1.3.0_2717_gb25db3e
pkgrel = 1 pkgrel = 1
url = https://www.mumble.info/ url = https://www.mumble.info/
arch = i686 arch = i686
@@ -21,13 +21,11 @@ pkgbase = mumble-snapshot
optdepends = espeak: speech synthesizer optdepends = espeak: speech synthesizer
provides = mumble provides = mumble
conflicts = mumble conflicts = mumble
source = https://dl.mumble.info/mumble-1.3.0~2586~g894ade2~snapshot.tar.gz source = https://dl.mumble.info/mumble-1.3.0~2717~gb25db3e~snapshot.tar.gz
source = https://dl.mumble.info/mumble-1.3.0~2586~g894ade2~snapshot.tar.gz.sig source = https://dl.mumble.info/mumble-1.3.0~2717~gb25db3e~snapshot.tar.gz.sig
source = float_overload.patch validpgpkeys = F3F5324A14AD0B32568F7839F0413B5CB858BD0E
validpgpkeys = C4666C6767A26017CE68406988048D0D625297A0 sha256sums = ce4647fd7f525edf8ac00880682715d88c93160fa2a25666b16c6e41d21d3c41
sha256sums = a0b8720e01495c399d14c2051bcf5e7356ceea8e0162a75cc4e10039a5324f7e
sha256sums = SKIP sha256sums = SKIP
sha256sums = c65cd76cdc4243ce29d7ce005a438e0a1bd7f99327e2623bea9436901fab98ec
pkgname = mumble-snapshot pkgname = mumble-snapshot

24
PKGBUILD
View File

@@ -2,7 +2,7 @@
# Contributor: synapse84 <synapse84 at gmail dot com> # Contributor: synapse84 <synapse84 at gmail dot com>
pkgname=mumble-snapshot pkgname=mumble-snapshot
pkgver=1.3.0_2586_g894ade2 pkgver=1.3.0_2717_gb25db3e
pkgrel=1 pkgrel=1
pkgdesc="A high quality voice chat program." pkgdesc="A high quality voice chat program."
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
@@ -13,27 +13,19 @@ makedepends=('boost' 'qt5-tools' 'python' 'libsndfile' 'speech-dispatcher')
optdepends=('espeak: speech synthesizer') optdepends=('espeak: speech synthesizer')
provides=('mumble') provides=('mumble')
conflicts=('mumble') conflicts=('mumble')
source=("https://dl.mumble.info/mumble-${pkgver//_/\~}~snapshot.tar.gz"{,.sig} source=("https://dl.mumble.info/mumble-${pkgver//_/\~}~snapshot.tar.gz"{,.sig})
"float_overload.patch") validpgpkeys=('F3F5324A14AD0B32568F7839F0413B5CB858BD0E')
validpgpkeys=('C4666C6767A26017CE68406988048D0D625297A0') sha256sums=('ce4647fd7f525edf8ac00880682715d88c93160fa2a25666b16c6e41d21d3c41'
sha256sums=('a0b8720e01495c399d14c2051bcf5e7356ceea8e0162a75cc4e10039a5324f7e' 'SKIP')
'SKIP'
'c65cd76cdc4243ce29d7ce005a438e0a1bd7f99327e2623bea9436901fab98ec')
prepare() {
cd $srcdir/mumble-${pkgver//_/\~}~snapshot
patch -Np1 -i "${srcdir}/float_overload.patch"
}
build() { build() {
cd $srcdir/mumble-${pkgver//_/\~}~snapshot cd $srcdir/mumble-${pkgver//_/\~}~snapshot
qmake-qt5 main.pro \ qmake-qt5 main.pro \
CONFIG+="bundled-celt no-bundled-opus no-bundled-speex no-g15 no-xevie no-server no-embed-qt-translations no-update" \ CONFIG+="bundled-celt no-bundled-opus no-bundled-speex no-g15 no-xevie no-server no-embed-qt-translations no-update" \
DEFINES+="PLUGIN_PATH=/usr/lib/mumble" \ DEFINES+="PLUGIN_PATH=/usr/lib/mumble" #\
INCLUDEPATH+="/usr/include/openssl-1.0" \ #INCLUDEPATH+="/usr/include/openssl-1.0" \
QMAKE_LFLAGS+="-L/usr/lib/openssl-1.0 -lssl -lcrypto" #QMAKE_LFLAGS+="-L/usr/lib/openssl-1.0 -lssl -lcrypto"
make release make release
} }

32
float_overload.patch
View File

@@ -1,32 +0,0 @@
From ea861fe86743c8402bbad77d8d1dd9de8dce447e Mon Sep 17 00:00:00 2001
From: Mikkel Krautz <mikkel@krautz.dk>
Date: Fri, 29 Dec 2017 14:47:25 +0100
Subject: [PATCH] AudioOutput: do not use non-existant template version of
std::abs.
This change fixes AudioOutput to use the float overload of std::abs:
float std::abs(float);
instead of a non-existant template version.
Fixes mumble-voip/mumble#3281
Needs-Backport: 1.2.x
---
src/mumble/AudioOutput.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/mumble/AudioOutput.cpp b/src/mumble/AudioOutput.cpp
index cbe0c0e2b..7a0a5e2ab 100644
--- a/src/mumble/AudioOutput.cpp
+++ b/src/mumble/AudioOutput.cpp
@@ -437,7 +437,7 @@ bool AudioOutput::mix(void *outbuff, unsigned int nsamp) {
top[2] = 0.0f;
}
- if (std::abs<float>(front[0] * top[0] + front[1] * top[1] + front[2] * top[2]) > 0.01f) {
+ if (std::abs(front[0] * top[0] + front[1] * top[1] + front[2] * top[2]) > 0.01f) {
// Not perpendicular. Assume Y up and rotate 90 degrees.
float azimuth = 0.0f;