From b2143525b9a35e12f79ceae6a0fd491f807367cb Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 13 Feb 2015 03:33:40 +0100 Subject: [PATCH] pulseaudio: update to 6.0. --- common/shlibs | 1 + srcpkgs/pulseaudio/files/pulseaudio.xinit | 11 ----------- srcpkgs/pulseaudio/template | 23 +++++++++++------------ 3 files changed, 12 insertions(+), 23 deletions(-) delete mode 100644 srcpkgs/pulseaudio/files/pulseaudio.xinit diff --git a/common/shlibs b/common/shlibs index d5e16d19ac..c9257bcc0f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -657,6 +657,7 @@ libpulse.so.0 libpulseaudio-1.0_1 libpulse-mainloop-glib.so.0 libpulseaudio-1.0_1 libpulse-simple.so.0 libpulseaudio-1.0_1 libpulsecommon-5.0.so libpulseaudio-5.0_1 +libpulsecommon-6.0.so libpulseaudio-6.0_1 liborc-0.4.so.0 orc-0.4.11_1 liborc-test-0.4.so.0 orc-0.4.11_1 libgmime-2.6.so.0 gmime-2.6.4_1 diff --git a/srcpkgs/pulseaudio/files/pulseaudio.xinit b/srcpkgs/pulseaudio/files/pulseaudio.xinit deleted file mode 100644 index b28b4da2ad..0000000000 --- a/srcpkgs/pulseaudio/files/pulseaudio.xinit +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -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 - ;; -esac diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template index c362b9bd5c..2eacae8c84 100644 --- a/srcpkgs/pulseaudio/template +++ b/srcpkgs/pulseaudio/template @@ -1,7 +1,7 @@ # Template file for 'pulseaudio' pkgname=pulseaudio -version=5.0 -revision=11 +version=6.0 +revision=1 # Package build options build_options="systemd" build_style=gnu-configure @@ -10,14 +10,14 @@ configure_args="--disable-oss-output --disable-oss-wrapper --disable-tcpwrap --with-database=tdb --with-udev-rules-dir=/usr/lib/udev/rules.d --disable-esound --disable-gtk3 --enable-bluez5 --disable-bluez4 $(vopt_enable systemd) $(vopt_enable systemd systemd-journal)" -hostmakedepends="automake libtool pkg-config intltool which orc-devel" +hostmakedepends="automake libtool pkg-config intltool orc-devel" makedepends=" zlib-devel libltdl-devel glib-devel libudev-devel speex-devel>=1.2rc2_4 libXi-devel libXtst-devel xcb-util-devel libsndfile-devel libasyncns-devel dbus-devel tdb-devel libcap-devel avahi-libs-devel libressl-devel>=2.1.3 - libsamplerate-devel json-c-devel>=0.11_2 orc-devel jack-devel fftw-devel - webrtc-audio-processing-devel sbc-devel libxcb-devel libXtst-devel libSM-devel - libcap-progs $(vopt_if systemd systemd-devel)" + webrtc-audio-processing-devel json-c-devel>=0.11_2 orc-devel jack-devel fftw-devel + libcap-progs sbc-devel libxcb-devel libXtst-devel libSM-devel + $(vopt_if systemd systemd-devel)" depends="rtkit" conf_files=" /etc/pulse/system.pa @@ -29,7 +29,7 @@ maintainer="Juan RP " homepage="http://www.freedesktop.org/wiki/Software/PulseAudio" license="LGPL-2" distfiles="${FREEDESKTOP_SITE}/${pkgname}/releases/${pkgname}-${version}.tar.xz" -checksum=99c13a8b1249ddbd724f195579df79484e9af6418cecf6a15f003a7f36caf939 +checksum=b50640e0b80b1607600accfad2e45aabb79d379bf6354c9671efa2065477f6f6 pre_configure() { libtoolize -f @@ -37,16 +37,15 @@ pre_configure() { } post_install() { - vinstall ${FILESDIR}/pulseaudio.xinit 755 etc/X11/xinit/xinitrc.d pulseaudio rm -f ${DESTDIR}/etc/dbus-1/system.d/pulseaudio-system.conf - vmkdir usr/share/bash-completion/completions - mv ${DESTDIR}/etc/bash_completion.d/pulseaudio-bash-completion.sh \ - ${DESTDIR}/usr/share/bash-completion/completions/pulseaudio + mv ${DESTDIR}/etc/bash_completion.d/* \ + ${DESTDIR}/usr/share/bash-completion/completions + } libpulseaudio_package() { - shlib_provides="libpulsecommon-5.0.so" + shlib_provides="libpulsecommon-6.0.so" short_desc+=" - shared libraries" pkg_install() { vmove "usr/lib/libpulse.so.*"