From fa82012fc1b491d7169ef2871bc7de4ffedff082 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 27 Apr 2013 10:50:53 +0200 Subject: [PATCH] pulseaudio: enable X11; disable bluez (incompatible) and esound (obsolete) support. --- srcpkgs/pulseaudio/files/pulseaudio.xinit | 10 +++++++--- srcpkgs/pulseaudio/template | 16 ++++++++-------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/srcpkgs/pulseaudio/files/pulseaudio.xinit b/srcpkgs/pulseaudio/files/pulseaudio.xinit index ca510e882dc..b28b4da2ad0 100644 --- a/srcpkgs/pulseaudio/files/pulseaudio.xinit +++ b/srcpkgs/pulseaudio/files/pulseaudio.xinit @@ -1,7 +1,11 @@ #!/bin/sh -case "$SESSION" in - GNOME|KDE*|xfce4) # PulseAudio is started via XDG Autostart +case "$DESKTOP_SESSION" in + gnome|kde*|xfce*) # PulseAudio is started via XDG Autostart + ;; + *) + if [ -z "$KDE_FULL_SESSION" -a -z "$GNOME_DESKTOP_SESSION_ID" ]; then + /usr/bin/start-pulseaudio-x11 + fi ;; - *) /usr/bin/start-pulseaudio-x11 ;; esac diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template index aa94b4696ec..aef764cfe41 100644 --- a/srcpkgs/pulseaudio/template +++ b/srcpkgs/pulseaudio/template @@ -1,17 +1,18 @@ # Template file for 'pulseaudio' pkgname=pulseaudio version=3.0 -revision=5 +revision=6 build_style=gnu-configure configure_args="--disable-oss-output --disable-oss-wrapper --disable-tcpwrap --enable-jack --disable-lirc --disable-hal-compat --disable-gconf --enable-orc - --with-database=tdb --with-udev-rules-dir=/usr/lib/udev/rules.d" + --with-database=tdb --with-udev-rules-dir=/usr/lib/udev/rules.d + --disable-bluez --disable-esound" makedepends="pkg-config intltool zlib-devel gtk+-devel libltdl-devel speex-devel libXi-devel libXtst-devel xcb-util-devel libsndfile-devel - libasyncns-devel dbus-devel tdb-devel libcap-devel libbluetooth-devel + libasyncns-devel dbus-devel tdb-devel libcap-devel avahi-libs-devel openssl-devel libsamplerate-devel json-c-devel orc-devel jack-devel fftw-devel systemd-devel webrtc-audio-processing-devel sbc-devel - libcap-progs rtkit" + libcap-progs libxcb-devel libXtst-devel libSM-devel rtkit" short_desc="A featureful, general-purpose sound server" maintainer="Juan RP " homepage="http://www.freedesktop.org/wiki/Software/PulseAudio" @@ -50,7 +51,7 @@ post_install() { } libpulseaudio_package() { - short_desc="${short_desc} - shared libraries" + short_desc+=" - shared libraries" pkg_install() { vmove "usr/lib/libpulse.so*" vmove "usr/lib/libpulse-simple.so*" @@ -62,7 +63,7 @@ libpulseaudio_package() { pulseaudio-devel_package() { depends="libasyncns-devel dbus-devel libXtst-devel libpulseaudio-${version}_${revision}" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig @@ -79,7 +80,6 @@ pulseaudio_package() { /etc/pulse/client.conf /etc/pulse/default.pa" pkg_install() { - vmove etc - vmove usr + vmove all } }