summaryrefslogtreecommitdiff
path: root/extra/pulseaudio
diff options
context:
space:
mode:
Diffstat (limited to 'extra/pulseaudio')
-rw-r--r--extra/pulseaudio/0001-Remove-usage-of-deprecated-udev_get_-_path.patch80
-rw-r--r--extra/pulseaudio/PKGBUILD12
-rwxr-xr-xextra/pulseaudio/pulseaudio.install16
3 files changed, 94 insertions, 14 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
new file mode 100644
index 000000000..93167b79b
--- /dev/null
+++ b/extra/pulseaudio/0001-Remove-usage-of-deprecated-udev_get_-_path.patch
@@ -0,0 +1,80 @@
+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 41bf3fad1..cca5f2472 100644
--- a/extra/pulseaudio/PKGBUILD
+++ b/extra/pulseaudio/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 158827 2012-05-11 21:11:56Z heftig $
+# $Id: PKGBUILD 160369 2012-06-01 12:58:42Z dreisner $
# 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=2.0
-pkgrel=1
+pkgrel=2
arch=(i686 x86_64)
url="http://www.freedesktop.org/wiki/Software/PulseAudio"
license=(GPL LGPL)
@@ -18,13 +18,17 @@ makedepends=(libasyncns libcap attr libxtst libsm libsamplerate libtool rtkit
libsystemd)
options=(!emptydirs !libtool)
source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz
- pulseaudio.xinit)
+ pulseaudio.xinit 0001-Remove-usage-of-deprecated-udev_get_-_path.patch)
sha256sums=('28b42edd42f4879a6884af5f0ec11801ac001eb7582881215b36649aa37e2061'
- 'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf')
+ 'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf'
+ '13e3cbe5499e462e8d818aa1faa2419aa880888ec18b4757cabbd7f5fcd6e803')
build() {
cd $pkgbase-$pkgver
+ # libudev.so.1.0.0
+ patch -Np1 -i ../0001-Remove-usage-of-deprecated-udev_get_-_path.patch
+
./configure --prefix=/usr \
--sysconfdir=/etc \
--libexecdir=/usr/lib \
diff --git a/extra/pulseaudio/pulseaudio.install b/extra/pulseaudio/pulseaudio.install
index fd7db3b36..1dc4cefb3 100755
--- a/extra/pulseaudio/pulseaudio.install
+++ b/extra/pulseaudio/pulseaudio.install
@@ -8,16 +8,12 @@ MES
}
post_upgrade() {
- # Delete old users and groups
- # System-wide daemon not supported anymore
- if (( $(vercmp $2 0.9.22) < 0 )); then
- getent passwd pulse &>/dev/null && usr/sbin/userdel -f pulse
- getent group pulse-access &>/dev/null && usr/sbin/groupdel pulse-access
- getent group pulse-rt &>/dev/null && usr/sbin/groupdel pulse-rt
- getent group pulse &>/dev/null && usr/sbin/groupdel pulse
- fi
-
- true
+ cat << MES
+>>> If you have per-user copies of configuration files (such as client.conf,
+ daemon.conf or default.pa) in ~/.pulse/, make sure you keep them in sync
+ with changes to the packaged files in /etc/pulse/. Otherwise, PulseAudio
+ may refuse to start due to configuration errors.
+MES
}
# vim:set ts=2 sw=2 et: