svn commit: r414434 - in branches/2016Q2/audio/alsa-lib: . files

[Jan Beich]

Author: jbeich
Date: Mon May  2 05:35:26 2016
New Revision: 414434
URL: https://svnweb.freebsd.org/changeset/ports/414434

Log:
  MFH: r414376
  
  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
  
  Approved by:	ports-secteam (junovitch)

Modified:
  branches/2016Q2/audio/alsa-lib/Makefile
  branches/2016Q2/audio/alsa-lib/files/asound.conf.sample
Directory Properties:
  branches/2016Q2/   (props changed)

Modified: branches/2016Q2/audio/alsa-lib/Makefile
==============================================================================
--- branches/2016Q2/audio/alsa-lib/Makefile	Mon May  2 05:32:39 2016	(r414433)
+++ branches/2016Q2/audio/alsa-lib/Makefile	Mon May  2 05:35:26 2016	(r414434)
@@ -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: branches/2016Q2/audio/alsa-lib/files/asound.conf.sample
==============================================================================
--- branches/2016Q2/audio/alsa-lib/files/asound.conf.sample	Mon May  2 05:32:39 2016	(r414433)
+++ branches/2016Q2/audio/alsa-lib/files/asound.conf.sample	Mon May  2 05:35:26 2016	(r414434)
@@ -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.