From owner-svn-ports-head@FreeBSD.ORG Sun Nov 17 23:07:03 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 68932B9B; Sun, 17 Nov 2013 23:07:03 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3E0D82B43; Sun, 17 Nov 2013 23:07:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAHN73gG006916; Sun, 17 Nov 2013 23:07:03 GMT (envelope-from feld@svn.freebsd.org) Received: (from feld@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAHN72v6006912; Sun, 17 Nov 2013 23:07:02 GMT (envelope-from feld@svn.freebsd.org) Message-Id: <201311172307.rAHN72v6006912@svn.freebsd.org> From: Mark Felder Date: Sun, 17 Nov 2013 23:07:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334131 - in head/audio/mumble: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Nov 2013 23:07:03 -0000 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@FreeBSD.org +MAINTAINER= feld@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() { +