alsa-plugins-pulseaudio 1.0.25-1 màj port

6 files changed, 45 insertions, 21 deletions

diff --git a/alsa-plugins-pulseaudio/.footprint.i686 b/alsa-plugins-pulseaudio/.footprint.i686
index e6c8ea793..3b59ae5e5 100644
--- a/alsa-plugins-pulseaudio/.footprint.i686
+++ b/alsa-plugins-pulseaudio/.footprint.i686
@@ -1,5 +1,7 @@
 drwxr-xr-x	root/root	etc/
--rw-r--r--	root/root	etc/asound.conf
+drwxr-xr-x	root/root	etc/alsa/
+drwxr-xr-x	root/root	etc/alsa/pcm/
+-rw-r--r--	root/root	etc/alsa/pulse-default.conf
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/alsa-lib/
@@ -11,5 +13,6 @@ drwxr-xr-x	root/root	usr/lib/alsa-lib/
 -rwxr-xr-x	root/root	usr/lib/alsa-lib/libasound_module_pcm_pulse.so
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/alsa/
-drwxr-xr-x	root/root	usr/share/alsa/pcm/
--rw-r--r--	root/root	usr/share/alsa/pcm/pulseaudio.conf
+drwxr-xr-x	root/root	usr/share/alsa/alsa.conf.d/
+-rw-r--r--	root/root	usr/share/alsa/alsa.conf.d/50-pulseaudio.conf
+-rw-r--r--	root/root	usr/share/alsa/alsa.conf.d/99-pulseaudio-default.conf.example
diff --git a/alsa-plugins-pulseaudio/.footprint.x86_64 b/alsa-plugins-pulseaudio/.footprint.x86_64
index e6c8ea793..3b59ae5e5 100644
--- a/alsa-plugins-pulseaudio/.footprint.x86_64
+++ b/alsa-plugins-pulseaudio/.footprint.x86_64
@@ -1,5 +1,7 @@
 drwxr-xr-x	root/root	etc/
--rw-r--r--	root/root	etc/asound.conf
+drwxr-xr-x	root/root	etc/alsa/
+drwxr-xr-x	root/root	etc/alsa/pcm/
+-rw-r--r--	root/root	etc/alsa/pulse-default.conf
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/alsa-lib/
@@ -11,5 +13,6 @@ drwxr-xr-x	root/root	usr/lib/alsa-lib/
 -rwxr-xr-x	root/root	usr/lib/alsa-lib/libasound_module_pcm_pulse.so
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/alsa/
-drwxr-xr-x	root/root	usr/share/alsa/pcm/
--rw-r--r--	root/root	usr/share/alsa/pcm/pulseaudio.conf
+drwxr-xr-x	root/root	usr/share/alsa/alsa.conf.d/
+-rw-r--r--	root/root	usr/share/alsa/alsa.conf.d/50-pulseaudio.conf
+-rw-r--r--	root/root	usr/share/alsa/alsa.conf.d/99-pulseaudio-default.conf.example
diff --git a/alsa-plugins-pulseaudio/.md5sum.i686 b/alsa-plugins-pulseaudio/.md5sum.i686
index a5fd9843d..5a78f822c 100644
--- a/alsa-plugins-pulseaudio/.md5sum.i686
+++ b/alsa-plugins-pulseaudio/.md5sum.i686
@@ -1,3 +1,2 @@
-e4d4c90e11ab9d1a117afbbc1edd2b16  alsa-plugins-1.0.24.tar.bz2
-919b4c517560185ce088093465da3dc0  pulse-default.conf
-70cd62dbf9ccef8a1bd4def1bfd432af  pulseaudio.conf
+038c023eaa51171f018fbf7141255185  alsa-plugins-1.0.25.tar.bz2
+9f41b27238bf926999c45e4230ca5deb  pulse-default.conf
diff --git a/alsa-plugins-pulseaudio/.md5sum.x86_64 b/alsa-plugins-pulseaudio/.md5sum.x86_64
index a5fd9843d..5a78f822c 100644
--- a/alsa-plugins-pulseaudio/.md5sum.x86_64
+++ b/alsa-plugins-pulseaudio/.md5sum.x86_64
@@ -1,3 +1,2 @@
-e4d4c90e11ab9d1a117afbbc1edd2b16  alsa-plugins-1.0.24.tar.bz2
-919b4c517560185ce088093465da3dc0  pulse-default.conf
-70cd62dbf9ccef8a1bd4def1bfd432af  pulseaudio.conf
+038c023eaa51171f018fbf7141255185  alsa-plugins-1.0.25.tar.bz2
+9f41b27238bf926999c45e4230ca5deb  pulse-default.conf
diff --git a/alsa-plugins-pulseaudio/Pkgfile b/alsa-plugins-pulseaudio/Pkgfile
index dec04bcf3..ce43128d6 100755
--- a/alsa-plugins-pulseaudio/Pkgfile
+++ b/alsa-plugins-pulseaudio/Pkgfile
@@ -6,10 +6,9 @@
 # Run on: alsa-plugins,pulseaudio
 
 name=alsa-plugins-pulseaudio
-version=1.0.24
+version=1.0.25
 release=1
 source=(ftp://ftp.alsa-project.org/pub/plugins/${name%-*}-$version.tar.bz2
-	pulseaudio.conf
 	pulse-default.conf)
 
 build() {
@@ -20,11 +19,10 @@ build() {
 		--disable-avcodec \
 		--disable-maemo-plugin \
 		--with-speex=no
-		
+
 	make -C pulse
 	make -C pulse DESTDIR=$PKG install
 
-	install -D -m 0644 ../pulse-default.conf $PKG/etc/asound.conf
-	install -D -m 0644 ../pulseaudio.conf $PKG/usr/share/alsa/pcm/pulseaudio.conf
+	install -d $PKG/etc/alsa/pcm
+	install -D -m 0644 ../pulse-default.conf $PKG/etc/alsa/pulse-default.conf
 }
-  
diff --git a/alsa-plugins-pulseaudio/pulse-default.conf b/alsa-plugins-pulseaudio/pulse-default.conf
index db7c0b71e..a84bede02 100644
--- a/alsa-plugins-pulseaudio/pulse-default.conf
+++ b/alsa-plugins-pulseaudio/pulse-default.conf
@@ -1,13 +1,35 @@
-# pulseaudio plugin configuration
+# PulseAudio plugin configuration
+# $Id$
+
+# Let's create a virtual device "pulse" for mixer and PCM
+
+pcm.pulse {
+    type pulse
+    hint {
+        description "PulseAudio Sound Server"
+    }
+}
+
+ctl.pulse {
+    type pulse
+    hint {
+        description "PulseAudio Sound Server"
+    }
+}
+
+# Let's make it the default!
 
 pcm.!default {
     type pulse
     hint {
-        show on
-        description "Default ALSA Output (currently PulseAudio Sound Server)"
+        description "Default"
     }
 }
 
 ctl.!default {
     type pulse
+    hint {
+        description "Default"
+    }
 }
+