diff options
Diffstat (limited to 'extra/pulseaudio')
| -rw-r--r-- | extra/pulseaudio/0001-Remove-usage-of-deprecated-udev_get_-_path.patch | 80 | ||||
| -rw-r--r-- | extra/pulseaudio/PKGBUILD | 8 | ||||
| -rwxr-xr-x | extra/pulseaudio/pulseaudio.install | 9 |
3 files changed, 15 insertions, 82 deletions
diff --git a/extra/pulseaudio/0001-Remove-usage-of-deprecated-udev_get_-_path.patch b/extra/pulseaudio/0001-Remove-usage-of-deprecated-udev_get_-_path.patch deleted file mode 100644 index 93167b79b..000000000 --- a/extra/pulseaudio/0001-Remove-usage-of-deprecated-udev_get_-_path.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 45607b113a052e4bec93a8707dc4db113c5dd100 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> -Date: Sat, 26 May 2012 02:58:11 +0200 -Subject: [PATCH] Remove usage of deprecated udev_get_*_path - -These symbols were removed in libudev.so.1.0.0. Replace them with -hardcoded strings. - -Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> ---- - src/modules/module-udev-detect.c | 9 +++------ - src/modules/udev-util.c | 4 ++-- - 2 files changed, 5 insertions(+), 8 deletions(-) - -diff --git a/src/modules/module-udev-detect.c b/src/modules/module-udev-detect.c -index 1192194..31416bd 100644 ---- a/src/modules/module-udev-detect.c -+++ b/src/modules/module-udev-detect.c -@@ -123,7 +123,7 @@ static char *card_get_sysattr(const char *card_idx, const char *name) { - goto finish; - } - -- t = pa_sprintf_malloc("%s/class/sound/card%s", udev_get_sys_path(udev), card_idx); -+ t = pa_sprintf_malloc("/sys/class/sound/card%s", card_idx); - card = udev_device_new_from_syspath(udev, t); - pa_xfree(t); - -@@ -282,7 +282,7 @@ static void verify_access(struct userdata *u, struct device *d) { - pa_assert(u); - pa_assert(d); - -- cd = pa_sprintf_malloc("%s/snd/controlC%s", udev_get_dev_path(u->udev), path_get_card_id(d->path)); -+ cd = pa_sprintf_malloc("/dev/snd/controlC%s", path_get_card_id(d->path)); - accessible = access(cd, R_OK|W_OK) >= 0; - pa_log_debug("%s is accessible: %s", cd, pa_yes_no(accessible)); - -@@ -621,7 +621,6 @@ fail: - } - - static int setup_inotify(struct userdata *u) { -- char *dev_snd; - int r; - - if (u->inotify_fd >= 0) -@@ -632,9 +631,7 @@ static int setup_inotify(struct userdata *u) { - return -1; - } - -- dev_snd = pa_sprintf_malloc("%s/snd", udev_get_dev_path(u->udev)); -- r = inotify_add_watch(u->inotify_fd, dev_snd, IN_ATTRIB|IN_CLOSE_WRITE|IN_DELETE_SELF|IN_MOVE_SELF); -- pa_xfree(dev_snd); -+ r = inotify_add_watch(u->inotify_fd, "/dev/snd", IN_ATTRIB|IN_CLOSE_WRITE|IN_DELETE_SELF|IN_MOVE_SELF); - - if (r < 0) { - int saved_errno = errno; -diff --git a/src/modules/udev-util.c b/src/modules/udev-util.c -index 2f18bc4..b0bb17d 100644 ---- a/src/modules/udev-util.c -+++ b/src/modules/udev-util.c -@@ -180,7 +180,7 @@ int pa_udev_get_info(int card_idx, pa_proplist *p) { - goto finish; - } - -- t = pa_sprintf_malloc("%s/class/sound/card%i", udev_get_sys_path(udev), card_idx); -+ t = pa_sprintf_malloc("/sys/class/sound/card%i", card_idx); - card = udev_device_new_from_syspath(udev, t); - pa_xfree(t); - -@@ -277,7 +277,7 @@ char* pa_udev_get_property(int card_idx, const char *name) { - goto finish; - } - -- t = pa_sprintf_malloc("%s/class/sound/card%i", udev_get_sys_path(udev), card_idx); -+ t = pa_sprintf_malloc("/sys/class/sound/card%i", card_idx); - card = udev_device_new_from_syspath(udev, t); - pa_xfree(t); - --- -1.7.10.2 - diff --git a/extra/pulseaudio/PKGBUILD b/extra/pulseaudio/PKGBUILD index 92aff71f9..70575cf3a 100644 --- a/extra/pulseaudio/PKGBUILD +++ b/extra/pulseaudio/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 173315 2012-12-18 20:30:41Z heftig $ +# $Id: PKGBUILD 181159 2013-04-01 19:36:12Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Corrado Primier <bardo@aur.archlinux.org> @@ -8,7 +8,7 @@ pkgbase=pulseaudio pkgname=(pulseaudio libpulse) pkgdesc="A featureful, general-purpose sound server" pkgver=3.0 -pkgrel=2 +pkgrel=3 arch=(i686 x86_64 mips64el) url="http://www.freedesktop.org/wiki/Software/PulseAudio" license=(GPL LGPL) @@ -58,6 +58,10 @@ package_pulseaudio() { cd $pkgbase-$pkgver make -j1 DESTDIR="$pkgdir" install + # Disable autospawn by default + sed -e '/autospawn/iautospawn=no' \ + -i "$pkgdir/etc/pulse/client.conf" + # Speed up pulseaudio shutdown # Lower resample quality, saves CPU sed -e '/exit-idle-time/iexit-idle-time=0' \ diff --git a/extra/pulseaudio/pulseaudio.install b/extra/pulseaudio/pulseaudio.install index 0e599b856..9de8b0e8f 100755 --- a/extra/pulseaudio/pulseaudio.install +++ b/extra/pulseaudio/pulseaudio.install @@ -20,6 +20,15 @@ post_upgrade() { with changes to the packaged files in /etc/pulse/. Otherwise, PulseAudio may refuse to start due to configuration errors. MES + if (( $(vercmp $2 3.0-3) < 0 )); then + cat << MES + +>>> Autospawn is now disabled by default. If you need to run PulseAudio outside + of an X session, either: + - Enable autospawn in client.conf, or + - Start it manually by executing 'pulseaudio --start' +MES + fi } # vim:set ts=2 sw=2 et: |