svn commit: r457971 - in head/audio/mumble: . audio files
Mark Felder
feld at FreeBSD.org
Wed Jan 3 16:18:46 UTC 2018
Author: feld
Date: Wed Jan 3 16:18:44 2018
New Revision: 457971
URL: https://svnweb.freebsd.org/changeset/ports/457971
Log:
audio/mumble: Fix disconnected patch from last commit
PR: 224086
Added:
head/audio/mumble/files/extrapatch-fix-build-boost-1.66
- copied unchanged from r457970, head/audio/mumble/audio/mumble/files/extrapatch-fix-build-boost-1.66
Deleted:
head/audio/mumble/audio/
Modified:
head/audio/mumble/Makefile
Modified: head/audio/mumble/Makefile
==============================================================================
--- head/audio/mumble/Makefile Wed Jan 3 15:49:41 2018 (r457970)
+++ head/audio/mumble/Makefile Wed Jan 3 16:18:44 2018 (r457971)
@@ -3,7 +3,7 @@
PORTNAME= mumble
PORTVERSION= 1.2.19
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= audio
MAINTAINER= feld at FreeBSD.org
@@ -60,6 +60,8 @@ PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio
.if ${COMPILER_TYPE} == gcc
CONFIG+= no-pch
.endif
+
+EXTRA_PATCHES= ${FILESDIR}/extrapatch-fix-build-boost-1.66:-p1
post-patch:
@${REINPLACE_CMD} -e 's|-ldl||' ${WRKSRC}/overlay_gl/overlay_gl.pro
Copied: head/audio/mumble/files/extrapatch-fix-build-boost-1.66 (from r457970, head/audio/mumble/audio/mumble/files/extrapatch-fix-build-boost-1.66)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/mumble/files/extrapatch-fix-build-boost-1.66 Wed Jan 3 16:18:44 2018 (r457971, copy of r457970, head/audio/mumble/audio/mumble/files/extrapatch-fix-build-boost-1.66)
@@ -0,0 +1,26 @@
+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;
+diff --git a/src/mumble/mumble_pch.hpp b/src/mumble/mumble_pch.hpp
+index ba87eab3b..dac5ba629 100644
+--- a/src/mumble/mumble_pch.hpp
++++ b/src/mumble/mumble_pch.hpp
+@@ -37,6 +37,8 @@
+ #include <QtSql/QtSql>
+ #include <QtXml/QtXml>
+
++#include <cmath>
++
+ #ifdef Q_OS_WIN
+ #include <windows.h>
+ #define ENABLE_SNDFILE_WINDOWS_PROTOTYPES 1
More information about the svn-ports-all
mailing list