summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpiernov <piernov@piernov.org>2011-07-24 20:39:39 +0200
committerpiernov <piernov@piernov.org>2011-07-24 20:39:39 +0200
commit8f8199954beef1a68e2d67c3d0feaec3fac058e0 (patch)
treecb1b29e76ca71e0732cfb53a9c69f2764f652d55
parent162983172e20c4babc0171d3df77abe30969e47f (diff)
downloadnutyx-pakxe-8f8199954beef1a68e2d67c3d0feaec3fac058e0.tar.gz
nutyx-pakxe-8f8199954beef1a68e2d67c3d0feaec3fac058e0.tar.bz2
nutyx-pakxe-8f8199954beef1a68e2d67c3d0feaec3fac058e0.tar.xz
nutyx-pakxe-8f8199954beef1a68e2d67c3d0feaec3fac058e0.zip
pulseaudio 0.9.23-2 correction port
-rw-r--r--extra/pulseaudio/.footprint.i68626
-rw-r--r--extra/pulseaudio/.footprint.x86_6426
-rw-r--r--extra/pulseaudio/.md5sum.i6861
-rw-r--r--extra/pulseaudio/.md5sum.x86_641
-rw-r--r--extra/pulseaudio/Pkgfile8
-rw-r--r--extra/pulseaudio/asound.conf19
6 files changed, 53 insertions, 28 deletions
diff --git a/extra/pulseaudio/.footprint.i686 b/extra/pulseaudio/.footprint.i686
index 5232c613d..2aa6317d7 100644
--- a/extra/pulseaudio/.footprint.i686
+++ b/extra/pulseaudio/.footprint.i686
@@ -1,3 +1,16 @@
+drwxr-xr-x root/root etc/
+-rw-r--r-- root/root etc/asound.conf
+drwxr-xr-x root/root etc/dbus-1/
+drwxr-xr-x root/root etc/dbus-1/system.d/
+drwxr-xr-x root/root etc/pulse/
+-rw-r--r-- root/root etc/pulse/client.conf
+-rw-r--r-- root/root etc/pulse/daemon.conf
+-rw-r--r-- root/root etc/pulse/default.pa
+-rw-r--r-- root/root etc/pulse/system.pa
+drwxr-xr-x root/root etc/xdg/
+drwxr-xr-x root/root etc/xdg/autostart/
+-rw-r--r-- root/root etc/xdg/autostart/pulseaudio-kde.desktop
+-rw-r--r-- root/root etc/xdg/autostart/pulseaudio.desktop
drwxr-xr-x root/root lib/
drwxr-xr-x root/root lib/udev/
drwxr-xr-x root/root lib/udev/rules.d/
@@ -18,19 +31,6 @@ lrwxrwxrwx root/root usr/bin/parecord -> pacat
-rwxr-xr-x root/root usr/bin/pulseaudio
-rwxr-xr-x root/root usr/bin/start-pulseaudio-kde
-rwxr-xr-x root/root usr/bin/start-pulseaudio-x11
-drwxr-xr-x root/root etc/
-drwxr-xr-x root/root etc/dbus-1/
-drwxr-xr-x root/root etc/dbus-1/system.d/
--rw-r--r-- root/root etc/dbus-1/system.d/pulseaudio-system.conf
-drwxr-xr-x root/root etc/pulse/
--rw-r--r-- root/root etc/pulse/client.conf
--rw-r--r-- root/root etc/pulse/daemon.conf
--rw-r--r-- root/root etc/pulse/default.pa
--rw-r--r-- root/root etc/pulse/system.pa
-drwxr-xr-x root/root etc/xdg/
-drwxr-xr-x root/root etc/xdg/autostart/
--rw-r--r-- root/root etc/xdg/autostart/pulseaudio-kde.desktop
--rw-r--r-- root/root etc/xdg/autostart/pulseaudio.desktop
drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/include/pulse/
-rw-r--r-- root/root usr/include/pulse/cdecl.h
diff --git a/extra/pulseaudio/.footprint.x86_64 b/extra/pulseaudio/.footprint.x86_64
index 5232c613d..2aa6317d7 100644
--- a/extra/pulseaudio/.footprint.x86_64
+++ b/extra/pulseaudio/.footprint.x86_64
@@ -1,3 +1,16 @@
+drwxr-xr-x root/root etc/
+-rw-r--r-- root/root etc/asound.conf
+drwxr-xr-x root/root etc/dbus-1/
+drwxr-xr-x root/root etc/dbus-1/system.d/
+drwxr-xr-x root/root etc/pulse/
+-rw-r--r-- root/root etc/pulse/client.conf
+-rw-r--r-- root/root etc/pulse/daemon.conf
+-rw-r--r-- root/root etc/pulse/default.pa
+-rw-r--r-- root/root etc/pulse/system.pa
+drwxr-xr-x root/root etc/xdg/
+drwxr-xr-x root/root etc/xdg/autostart/
+-rw-r--r-- root/root etc/xdg/autostart/pulseaudio-kde.desktop
+-rw-r--r-- root/root etc/xdg/autostart/pulseaudio.desktop
drwxr-xr-x root/root lib/
drwxr-xr-x root/root lib/udev/
drwxr-xr-x root/root lib/udev/rules.d/
@@ -18,19 +31,6 @@ lrwxrwxrwx root/root usr/bin/parecord -> pacat
-rwxr-xr-x root/root usr/bin/pulseaudio
-rwxr-xr-x root/root usr/bin/start-pulseaudio-kde
-rwxr-xr-x root/root usr/bin/start-pulseaudio-x11
-drwxr-xr-x root/root etc/
-drwxr-xr-x root/root etc/dbus-1/
-drwxr-xr-x root/root etc/dbus-1/system.d/
--rw-r--r-- root/root etc/dbus-1/system.d/pulseaudio-system.conf
-drwxr-xr-x root/root etc/pulse/
--rw-r--r-- root/root etc/pulse/client.conf
--rw-r--r-- root/root etc/pulse/daemon.conf
--rw-r--r-- root/root etc/pulse/default.pa
--rw-r--r-- root/root etc/pulse/system.pa
-drwxr-xr-x root/root etc/xdg/
-drwxr-xr-x root/root etc/xdg/autostart/
--rw-r--r-- root/root etc/xdg/autostart/pulseaudio-kde.desktop
--rw-r--r-- root/root etc/xdg/autostart/pulseaudio.desktop
drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/include/pulse/
-rw-r--r-- root/root usr/include/pulse/cdecl.h
diff --git a/extra/pulseaudio/.md5sum.i686 b/extra/pulseaudio/.md5sum.i686
index 12711f7f9..8b0333ff7 100644
--- a/extra/pulseaudio/.md5sum.i686
+++ b/extra/pulseaudio/.md5sum.i686
@@ -1 +1,2 @@
+ea1df7bdbfcd6d13160f5286b61a3ed8 asound.conf
7391205a337d1e04a9ff38025f684034 pulseaudio-0.9.23.tar.gz
diff --git a/extra/pulseaudio/.md5sum.x86_64 b/extra/pulseaudio/.md5sum.x86_64
index 12711f7f9..8b0333ff7 100644
--- a/extra/pulseaudio/.md5sum.x86_64
+++ b/extra/pulseaudio/.md5sum.x86_64
@@ -1 +1,2 @@
+ea1df7bdbfcd6d13160f5286b61a3ed8 asound.conf
7391205a337d1e04a9ff38025f684034 pulseaudio-0.9.23.tar.gz
diff --git a/extra/pulseaudio/Pkgfile b/extra/pulseaudio/Pkgfile
index 3a36419ce..0146c11d2 100644
--- a/extra/pulseaudio/Pkgfile
+++ b/extra/pulseaudio/Pkgfile
@@ -7,8 +7,9 @@
name=pulseaudio
version=0.9.23
-release=1
-source=(http://freedesktop.org/software/$name/releases/$name-$version.tar.gz)
+release=2
+source=(http://freedesktop.org/software/$name/releases/$name-$version.tar.gz
+ asound.conf)
build() {
unset MAKEFLAGS
@@ -28,4 +29,7 @@ build() {
--disable-default-build-tests
make
make DESTDIR=$PKG install
+
+ install -Dm644 ../asound.conf $PKG/etc/asound.conf
+ rm $PKG/etc/dbus-1/system.d/$name-system.conf
}
diff --git a/extra/pulseaudio/asound.conf b/extra/pulseaudio/asound.conf
new file mode 100644
index 000000000..7166265e6
--- /dev/null
+++ b/extra/pulseaudio/asound.conf
@@ -0,0 +1,19 @@
+# Use PulseAudio by default
+pcm.!default {
+ type pulse
+}
+
+ctl.!default {
+ type pulse
+}
+
+# Explicit PulseAudio device
+pcm.pulse {
+ type pulse
+}
+
+ctl.pulse {
+ type pulse
+}
+
+# vim:set ft=alsaconf: