From owner-freebsd-gnome@FreeBSD.ORG  Thu Jun 24 23:10:22 2010
Return-Path: <owner-freebsd-gnome@FreeBSD.ORG>
Delivered-To: gnome@FreeBSD.org
Received: from [127.0.0.1] (freefall.freebsd.org [IPv6:2001:4f8:fff6::28])
	by hub.freebsd.org (Postfix) with ESMTP id D1F3F106566C
	for <gnome@FreeBSD.org>; Thu, 24 Jun 2010 23:10:21 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
From: Jung-uk Kim <jkim@FreeBSD.org>
To: gnome@FreeBSD.org
Date: Thu, 24 Jun 2010 19:10:04 -0400
User-Agent: KMail/1.6.2
MIME-Version: 1.0
Content-Disposition: inline
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_VX+IMR0hfW257sM"
Message-Id: <201006241910.13456.jkim@FreeBSD.org>
Cc: 
Subject: [PATCH] OSS device detection for pulseaudio
X-BeenThere: freebsd-gnome@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: GNOME for FreeBSD -- porting and maintaining
	<freebsd-gnome.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gnome>,
	<mailto:freebsd-gnome-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-gnome>
List-Post: <mailto:freebsd-gnome@freebsd.org>
List-Help: <mailto:freebsd-gnome-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gnome>,
	<mailto:freebsd-gnome-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Jun 2010 23:10:22 -0000


--Boundary-00=_VX+IMR0hfW257sM
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Pulseaudio detects /dev/dspN.0 instead of /dev/dspN where N is a 
device unit number.  We should not reference a virtual channel 0, 
which is automatically cloned from /dev/dspN.  Please review the 
attached trivial patch.

Thanks,

Jung-uk Kim

--Boundary-00=_VX+IMR0hfW257sM
Content-Type: text/plain;
  charset="iso-8859-1";
  name="pulseaudio.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="pulseaudio.diff"

Index: audio/pulseaudio/Makefile
===================================================================
RCS file: /home/pcvs/ports/audio/pulseaudio/Makefile,v
retrieving revision 1.59
diff -u -r1.59 Makefile
--- audio/pulseaudio/Makefile	31 May 2010 01:57:31 -0000	1.59
+++ audio/pulseaudio/Makefile	24 Jun 2010 22:59:28 -0000
@@ -12,7 +12,7 @@
 
 PORTNAME=	pulseaudio
 PORTVERSION=	0.9.21
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	http://0pointer.de/lennart/projects/${PORTNAME}/
 
Index: audio/pulseaudio/files/patch-src_modules_module-detect.c
===================================================================
RCS file: audio/pulseaudio/files/patch-src_modules_module-detect.c
diff -N audio/pulseaudio/files/patch-src_modules_module-detect.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ audio/pulseaudio/files/patch-src_modules_module-detect.c	24 Jun 2010 22:59:28 -0000
@@ -0,0 +1,12 @@
+--- src/modules/module-detect.c.orig	2009-11-22 22:57:05.000000000 -0500
++++ src/modules/module-detect.c	2010-06-17 19:20:39.000000000 -0400
+@@ -161,8 +161,7 @@
+                 continue;
+ 
+         } else if (sscanf(line, "pcm%u: ", &device) == 1) {
+-            /* FreeBSD support, the devices are named /dev/dsp0.0, dsp0.1 and so on */
+-            pa_snprintf(args, sizeof(args), "device=/dev/dsp%u.0", device);
++            pa_snprintf(args, sizeof(args), "device=/dev/dsp%u", device);
+ 
+             if (!pa_module_load(c, "module-oss", args))
+                 continue;

--Boundary-00=_VX+IMR0hfW257sM--