From 9b1d424b16dd638c0d335e1ae63962b6f6fa6a91 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 11 May 2012 20:58:48 +0200 Subject: [PATCH] pulseaudio: update to 2.0. --- common/shlibs | 2 +- srcpkgs/pulseaudio/depends | 2 +- srcpkgs/pulseaudio/libpulseaudio.template | 8 ++----- .../patches/pulseaudio-activation.patch | 7 ------ srcpkgs/pulseaudio/pulseaudio-devel.template | 7 ++---- srcpkgs/pulseaudio/pulseaudio.rshlibs | 7 ++++-- srcpkgs/pulseaudio/template | 23 +++++++++++-------- 7 files changed, 24 insertions(+), 32 deletions(-) delete mode 100644 srcpkgs/pulseaudio/patches/pulseaudio-activation.patch diff --git a/common/shlibs b/common/shlibs index 373d4650970..84eca1ea613 100644 --- a/common/shlibs +++ b/common/shlibs @@ -634,7 +634,7 @@ libspeex.so.1 libspeex speex-devel libspeexdsp.so.1 libspeex speex-devel libasyncns.so.0 libasyncns libasyncns-devel libpulse.so.0 libpulseaudio pulseaudio-devel -libpulsecommon-1.1.so libpulseaudio pulseaudio-devel +libpulsecommon-2.0.so libpulseaudio pulseaudio-devel libpulse-mainloop-glib.so.0 libpulseaudio pulseaudio-devel libpulse-simple.so.0 libpulseaudio pulseaudio-devel libpulsecore-1.1.so pulseaudio pulseaudio-devel diff --git a/srcpkgs/pulseaudio/depends b/srcpkgs/pulseaudio/depends index 739c08bbaa3..791454dd497 100644 --- a/srcpkgs/pulseaudio/depends +++ b/srcpkgs/pulseaudio/depends @@ -1,2 +1,2 @@ abi_depends=">=1.0" -api_depends=">=1.1" +api_depends=">=2.0" diff --git a/srcpkgs/pulseaudio/libpulseaudio.template b/srcpkgs/pulseaudio/libpulseaudio.template index 5d1b4667c69..ad835414f78 100644 --- a/srcpkgs/pulseaudio/libpulseaudio.template +++ b/srcpkgs/pulseaudio/libpulseaudio.template @@ -9,13 +9,9 @@ long_desc=" This package provides client libraries used by applications that access a PulseAudio sound server via PulseAudio's native interface." -revision=3 - - -do_install() -{ +do_install() { vmove "usr/lib/libpulse.so*" usr/lib - vmove "usr/lib/libpulsecommon*.so*" usr/lib vmove "usr/lib/libpulse-simple.so*" usr/lib vmove "usr/lib/libpulse-mainloop-glib.so*" usr/lib + vmove usr/lib/pulseaudio usr/lib } diff --git a/srcpkgs/pulseaudio/patches/pulseaudio-activation.patch b/srcpkgs/pulseaudio/patches/pulseaudio-activation.patch deleted file mode 100644 index b4a48fb307c..00000000000 --- a/srcpkgs/pulseaudio/patches/pulseaudio-activation.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- src/daemon/pulseaudio.desktop.in.activation 2011-03-28 13:48:10.015794947 -0400 -+++ src/daemon/pulseaudio.desktop.in 2011-03-28 13:48:48.565313013 -0400 -@@ -8,3 +8,4 @@ Terminal=false - Type=Application - Categories= - GenericName= -+X-GNOME-Autostart-Phase=Initialization diff --git a/srcpkgs/pulseaudio/pulseaudio-devel.template b/srcpkgs/pulseaudio/pulseaudio-devel.template index 8aab480a5f7..05bb1e6db43 100644 --- a/srcpkgs/pulseaudio/pulseaudio-devel.template +++ b/srcpkgs/pulseaudio/pulseaudio-devel.template @@ -11,12 +11,9 @@ long_desc=" Add_dependency run libasyncns-devel Add_dependency run dbus-devel Add_dependency run libXtst-devel -Add_dependency run libpulseaudio +Add_dependency run libpulseaudio ">=${version}" -revision=1 - -do_install() -{ +do_install() { vmove usr/include usr vmove usr/lib/pkgconfig usr/lib vmove usr/lib/cmake usr/lib diff --git a/srcpkgs/pulseaudio/pulseaudio.rshlibs b/srcpkgs/pulseaudio/pulseaudio.rshlibs index c764be10a7c..c8c20bf9486 100644 --- a/srcpkgs/pulseaudio/pulseaudio.rshlibs +++ b/srcpkgs/pulseaudio/pulseaudio.rshlibs @@ -1,5 +1,4 @@ libpulse.so.0 -libpulsecommon-1.1.so libxcb.so.1 libpthread.so.0 libc.so.6 @@ -30,6 +29,10 @@ libavahi-client.so.3 libjack.so.0 libssl.so.1 libcrypto.so.1 -libz.so.1 libfftw3f.so.3 ld-linux-x86-64.so.2 +libpulsecommon-2.0.so +libsystemd-login.so.0 +libsystemd-daemon.so.0 +libstdc++.so.6 +libgcc_s.so.1 diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template index 963ef849134..d1bd67037da 100644 --- a/srcpkgs/pulseaudio/template +++ b/srcpkgs/pulseaudio/template @@ -1,7 +1,6 @@ # Template file for 'pulseaudio' pkgname=pulseaudio -version=1.1 -revision=7 +version=2.0 distfiles="$FREEDESKTOP_SITE/$pkgname/releases/$pkgname-$version.tar.xz" build_style=gnu-configure configure_args="--disable-oss-output --disable-oss-wrapper --disable-tcpwrap @@ -9,9 +8,9 @@ configure_args="--disable-oss-output --disable-oss-wrapper --disable-tcpwrap --disable-gconf --with-database=tdb --enable-orc" short_desc="A featureful, general-purpose sound server" maintainer="Juan RP " -homepage="http://www.pulseaudio.org/" +homepage="http://www.freedesktop.org/wiki/Software/PulseAudio" license="LGPL-2" -checksum=6fe531136f6ebce2d35872a2d2c914278cdc5dcdd5eea516dc52c81f9001f5ee +checksum=28b42edd42f4879a6884af5f0ec11801ac001eb7582881215b36649aa37e2061 long_desc=" PulseAudio, previously known as Polypaudio, is a sound server for POSIX and WIN32 systems. It is a drop in replacement for the ESD sound server with much @@ -37,8 +36,11 @@ long_desc=" * Extensible plug-in architecture with plug-ins for jackd, multicast-rtp lirc and avahi, just to name a few." +# XXX: WebRTC echo canceller disabled subpackages="libpulseaudio $pkgname-devel" +shlib_depends="libpulseaudio>=${version}" + conf_files=" /etc/pulse/system.pa /etc/pulse/daemon.conf @@ -47,9 +49,11 @@ conf_files=" Add_dependency build pkg-config Add_dependency build intltool +Add_dependency build zlib-devel Add_dependency build gtk+-devel Add_dependency build libltdl-devel Add_dependency build speex-devel +Add_dependency build libXi-devel Add_dependency build libXtst-devel Add_dependency build xcb-util-devel Add_dependency build libxcb-devel @@ -69,13 +73,12 @@ Add_dependency build orc-devel Add_dependency build glib-devel Add_dependency build jack-devel Add_dependency build fftw-devel +Add_dependency build systemd-devel Add_dependency full rtkit -post_install() -{ - install -Dm755 ${FILESDIR}/pulseaudio.xinit \ - ${DESTDIR}/etc/X11/xinit/xinitrc.d/pulseaudio - - rm ${DESTDIR}/etc/dbus-1/system.d/pulseaudio-system.conf +post_install() { + vinstall ${FILESDIR}/pulseaudio.xinit 755 \ + etc/X11/xinit/xinitrc.d pulseaudio + rm -f ${DESTDIR}/etc/dbus-1/system.d/pulseaudio-system.conf }