From owner-svn-ports-all@freebsd.org  Sun May  1 03:10:23 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3AB12B0F722;
 Sun,  1 May 2016 03:10:23 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0CA1D18ED;
 Sun,  1 May 2016 03:10:22 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u413AMLw075719;
 Sun, 1 May 2016 03:10:22 GMT (envelope-from jbeich@FreeBSD.org)
Received: (from jbeich@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u413AM8A075717;
 Sun, 1 May 2016 03:10:22 GMT (envelope-from jbeich@FreeBSD.org)
Message-Id: <201605010310.u413AM8A075717@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jbeich set sender to
 jbeich@FreeBSD.org using -f
From: Jan Beich <jbeich@FreeBSD.org>
Date: Sun, 1 May 2016 03:10:22 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r414376 - in head/audio/alsa-lib: . 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-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 01 May 2016 03:10:23 -0000

Author: jbeich
Date: Sun May  1 03:10:21 2016
New Revision: 414376
URL: https://svnweb.freebsd.org/changeset/ports/414376

Log:
  audio/alsa-lib: improve etc/asound.conf
  
  - Expose "oss" via "aplay -L"
  - Simplify "oss" and "pulse"
  - Define "sysdefault"
  
  Note, "aplay -D sysdefault" != "aplay -D oss" per ports/184006

Modified:
  head/audio/alsa-lib/Makefile   (contents, props changed)
  head/audio/alsa-lib/files/asound.conf.sample

Modified: head/audio/alsa-lib/Makefile
==============================================================================
--- head/audio/alsa-lib/Makefile	Sun May  1 01:24:00 2016	(r414375)
+++ head/audio/alsa-lib/Makefile	Sun May  1 03:10:21 2016	(r414376)
@@ -3,6 +3,7 @@
 
 PORTNAME=	alsa-lib
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.alsa-project.org/pub/lib/ \
 		GENTOO

Modified: head/audio/alsa-lib/files/asound.conf.sample
==============================================================================
--- head/audio/alsa-lib/files/asound.conf.sample	Sun May  1 01:24:00 2016	(r414375)
+++ head/audio/alsa-lib/files/asound.conf.sample	Sun May  1 03:10:21 2016	(r414376)
@@ -1,25 +1,25 @@
 #
 # FreeBSD/OSS
 #
-pcm.!default {
-	type plug
-	slave.pcm.type oss
+pcm.oss {
+	type oss
+	hint.description "Open Sound System"
 }
 
-ctl.!default {
+ctl.oss {
 	type oss
 }
 
+pcm.!sysdefault pcm.plug:oss
+ctl.!sysdefault ctl.oss
+pcm.!default pcm.sysdefault
+ctl.!default ctl.sysdefault
+
 #
 # Pulseaudio
 #
-# pcm.!default {
-# 	type pulse
-# }
-# 
-# ctl.!default {
-# 	type pulse
-# }
+# pcm.!default pcm.pulse
+# ctl.!default ctl.pulse
 
 #
 # Remap all possible surround stuffs.