audio/mumble: Revive and update to 1.3.0-rc1

- Now supports Qt5

PR:		235177

1 files changed, 65 insertions, 0 deletions

diff --git a/audio/mumble/files/patch-src__mumble__OSS.cpp b/audio/mumble/files/patch-src__mumble__OSS.cpp
new file mode 100644
index 000000000000..10ee5d91d003
--- /dev/null
+++ b/audio/mumble/files/patch-src__mumble__OSS.cpp
@@ -0,0 +1,65 @@
+--- src/mumble/OSS.cpp.orig	2014-08-08 15:51:59 UTC
++++ src/mumble/OSS.cpp
+@@ -153,7 +153,6 @@ OSSEnumerator::OSSEnumerator() {
+ 	qhOutput.insert(QString(), QLatin1String("Default OSS Device"));
+ 	qhDevices.insert(QString(), QLatin1String("/dev/dsp"));
+ 
+-#if (SOUND_VERSION >= 0x040002)
+ 	int mixerfd = open("/dev/mixer", O_RDWR, 0);
+ 	if (mixerfd == -1) {
+ 		qWarning("OSSEnumerator: Failed to open /dev/mixer");
+@@ -182,15 +181,14 @@ OSSEnumerator::OSSEnumerator() {
+ 		if (ainfo.caps & PCM_CAP_HIDDEN)
+ 			continue;
+ 
+-		qhDevices.insert(handle, device);
++		qhDevices.insert(name, device);
+ 
+ 		if (ainfo.caps & PCM_CAP_INPUT)
+-			qhInput.insert(handle, name);
++			qhInput.insert(name, name);
+ 		if (ainfo.caps & PCM_CAP_OUTPUT)
+-			qhOutput.insert(handle, name);
++			qhOutput.insert(name, name);
+ 	}
+ 	close(mixerfd);
+-#endif
+ }
+ 
+ OSSInput::OSSInput() {
+@@ -221,20 +219,23 @@ void OSSInput::run() {
+ 	ival = AFMT_S16_NE;
+ 	if ((ioctl(fd, SNDCTL_DSP_SETFMT, &ival) == -1) || (ival != AFMT_S16_NE)) {
+ 		qWarning("OSSInput: Failed to set sound format");
+-		goto out;
++		close(fd);
++		return;
+ 	}
+ 
+ 	ival = 1;
+ 	if ((ioctl(fd, SNDCTL_DSP_CHANNELS, &ival) == -1)) {
+ 		qWarning("OSSInput: Failed to set mono mode");
+-		goto out;
++		close(fd);
++		return;
+ 	}
+ 	iMicChannels = ival;
+ 
+ 	ival = SAMPLE_RATE;
+ 	if (ioctl(fd, SNDCTL_DSP_SPEED, &ival) == -1) {
+ 		qWarning("OSSInput: Failed to set speed");
+-		goto out;
++		close(fd);
++		return;
+ 	}
+ 	iMicFreq = ival;
+ 
+@@ -258,8 +259,6 @@ void OSSInput::run() {
+ 	qWarning("OSSInput: Releasing.");
+ 	ioctl(fd, SNDCTL_DSP_RESET, NULL);
+ 
+-out:
+-	close(fd);
+ }
+ 
+ OSSOutput::OSSOutput() {