head	1.3;
access;
symbols
	pkgsrc-2019Q2:1.2.0.2
	pkgsrc-2019Q2-base:1.2
	pkgsrc-2019Q1:1.1.0.4
	pkgsrc-2019Q1-base:1.1
	pkgsrc-2018Q4:1.1.0.2
	pkgsrc-2018Q4-base:1.1;
locks; strict;
comment	@// @;


1.3
date	2019.09.16.22.46.21;	author nia;	state dead;
branches;
next	1.2;
commitid	LCRU5SpFMHhAZhDB;

1.2
date	2019.06.17.08.08.31;	author nia;	state Exp;
branches;
next	1.1;
commitid	HJ0nqpv1vH6t3wrB;

1.1
date	2018.12.22.18.17.39;	author nia;	state Exp;
branches;
next	;
commitid	9RsqfL1B8i397P4B;


desc
@@


1.3
log
@mumble: Update to 1.3.0

Full release notes:
https://www.mumble.info/blog/mumble-1.3.0-release-announcement/
@
text
@$NetBSD: patch-src_mumble_AudioOutput.cpp,v 1.2 2019/06/17 08:08:31 nia Exp $

https://github.com/mumble-voip/mumble/pull/3287

--- src/mumble/AudioOutput.cpp.orig	2019-06-17 07:42:51.973326995 +0000
+++ src/mumble/AudioOutput.cpp
@@@@ -37,13 +37,15 @@@@
 #include "AudioOutputSample.h"
 #include "AudioOutputSpeech.h"
 #include "User.h"
-#include "Global.h"
 #include "Message.h"
 #include "Plugins.h"
 #include "PacketDataStream.h"
 #include "ServerHandler.h"
 #include "VoiceRecorder.h"
 
+// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
+#include "Global.h"
+
 // Remember that we cannot use static member classes that are not pointers, as the constructor
 // for AudioOutputRegistrar() might be called before they are initialized, as the constructor
 // is called from global initialization.
@@@@ -431,7 +433,7 @@@@ bool AudioOutput::mix(void *outbuff, uns
 					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;
@


1.2
log
@mumble: Fix build with newer protobuf.

While here, use a working portaudio library and make it a default.

https://github.com/mumble-voip/mumble/pull/3623
@
text
@d1 1
a1 1
$NetBSD: patch-src_mumble_AudioOutput.cpp,v 1.1 2018/12/22 18:17:39 nia Exp $
@


1.1
log
@chat/mumble: Import version 1.2.19. Based partially on work in pkgsrc-wip.

Mumble is an open source, low-latency, high quality voice chat software
primarily intended for use while gaming.

This package contains the client and server software.
@
text
@d1 1
a1 1
$NetBSD$
d5 1
a5 1
--- src/mumble/AudioOutput.cpp.orig	2017-01-27 06:48:33.000000000 +0000
d7 18
a24 1
@@@@ -431,7 +431,7 @@@@ bool AudioOutput::mix(void *outbuff, uns
@