svn commit: r334131 - in head/audio/mumble: . files

[Mark Felder]

Author: feld
Date: Sun Nov 17 23:07:02 2013
New Revision: 334131
URL: http://svnweb.freebsd.org/changeset/ports/334131

Log:
  Take maintainership
  Add patch that allows audio device selection with FreeBSD's OSS
  
  PR:		ports/181104
  Submitted by:	Natacha Porte
  Approved by:	swills (mentor)

Added:
  head/audio/mumble/files/patch-src-mumble-OSS.cpp   (contents, props changed)
Modified:
  head/audio/mumble/Makefile

Modified: head/audio/mumble/Makefile
==============================================================================
--- head/audio/mumble/Makefile	Sun Nov 17 22:16:16 2013	(r334130)
+++ head/audio/mumble/Makefile	Sun Nov 17 23:07:02 2013	(r334131)
@@ -3,11 +3,11 @@
 
 PORTNAME=	mumble
 PORTVERSION=	1.2.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/Mumble/${PORTVERSION}
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	feld at FreeBSD.org
 COMMENT=	A voice chat software primarily intended for use while gaming
 
 LIB_DEPENDS+=	libspeex.so:${PORTSDIR}/audio/speex \

Added: head/audio/mumble/files/patch-src-mumble-OSS.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/mumble/files/patch-src-mumble-OSS.cpp	Sun Nov 17 23:07:02 2013	(r334131)
@@ -0,0 +1,30 @@
+--- src/mumble/OSS.cpp.orig	2013-08-03 14:01:25.000000000 +0200
++++ src/mumble/OSS.cpp	2013-08-03 14:12:51.000000000 +0200
+@@ -153,7 +153,6 @@
+ 	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 @@
+ 		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() {
+