From 26b46794e6da93ee6c4916d62e1abcac87e0a904 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 20 Oct 2011 21:19:22 +0200 Subject: [PATCH] pulseaudio: update to 1.1. --- srcpkgs/pulseaudio/depends | 2 +- srcpkgs/pulseaudio/libpulseaudio.template | 9 ++---- srcpkgs/pulseaudio/pulseaudio-devel.template | 29 ++++---------------- srcpkgs/pulseaudio/template | 14 ++++------ xbps-src/common/mapping_shlib_binpkg.txt | 7 +++-- 5 files changed, 20 insertions(+), 41 deletions(-) diff --git a/srcpkgs/pulseaudio/depends b/srcpkgs/pulseaudio/depends index bb0044e6e3b..739c08bbaa3 100644 --- a/srcpkgs/pulseaudio/depends +++ b/srcpkgs/pulseaudio/depends @@ -1,2 +1,2 @@ abi_depends=">=1.0" -api_depends="${abi_depends}" +api_depends=">=1.1" diff --git a/srcpkgs/pulseaudio/libpulseaudio.template b/srcpkgs/pulseaudio/libpulseaudio.template index 7ed12516d48..74fc58c6e0a 100644 --- a/srcpkgs/pulseaudio/libpulseaudio.template +++ b/srcpkgs/pulseaudio/libpulseaudio.template @@ -15,20 +15,17 @@ Add_dependency run libxcb Add_dependency run libSM Add_dependency run libICE Add_dependency run libXtst -Add_dependency run libsamplerate Add_dependency run libsndfile Add_dependency run libasyncns Add_dependency run dbus-libs Add_dependency run glibc -Add_dependency run glib Add_dependency run libcap -Add_dependency run libltdl -Add_dependency run libspeex -Add_dependency run orc -Add_dependency run libtdb +Add_dependency run glib 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 } diff --git a/srcpkgs/pulseaudio/pulseaudio-devel.template b/srcpkgs/pulseaudio/pulseaudio-devel.template index 5b768833097..39574246e18 100644 --- a/srcpkgs/pulseaudio/pulseaudio-devel.template +++ b/srcpkgs/pulseaudio/pulseaudio-devel.template @@ -8,32 +8,15 @@ long_desc=" This package contains files for development, headers, static libs, etc." -Add_dependency run gtk+-devel -Add_dependency run libltdl-devel -Add_dependency run speex-devel -Add_dependency run libXtst-devel -Add_dependency run xcb-util-devel -Add_dependency run libxcb-devel -Add_dependency run libsndfile-devel Add_dependency run libasyncns-devel Add_dependency run dbus-devel -Add_dependency run tdb-devel -Add_dependency run libcap-devel -Add_dependency run libbluetooth-devel -Add_dependency run avahi-libs-devel -Add_dependency run alsa-lib-devel -Add_dependency run libudev-devel -Add_dependency run openssl-devel -Add_dependency run libsamplerate-devel -Add_dependency run json-c-devel -Add_dependency run orc-devel -Add_dependency run pulseaudio +Add_dependency run libXtst-devel +Add_dependency run libpulseaudio do_install() { - install -d ${DESTDIR}/usr/{lib,share} - - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/share/vala ${DESTDIR}/usr/share + vmove usr/include usr + vmove usr/lib/pkgconfig usr/lib + vmove usr/lib/cmake usr/lib + vmove usr/share/vala usr/share } diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template index dd20dce437e..06e9031d219 100644 --- a/srcpkgs/pulseaudio/template +++ b/srcpkgs/pulseaudio/template @@ -1,7 +1,6 @@ # Template file for 'pulseaudio' pkgname=pulseaudio -version=1.0 -revision=1 +version=1.1 distfiles="$FREEDESKTOP_SITE/$pkgname/releases/$pkgname-$version.tar.xz" build_style=gnu_configure configure_args="--disable-oss-output --disable-oss-wrapper --disable-tcpwrap @@ -11,7 +10,7 @@ short_desc="A featureful, general-purpose sound server" maintainer="Juan RP " homepage="http://www.pulseaudio.org/" license="LGPL-2" -checksum=e63464f8a0975446e2b4cfe768b615a66735c8d092b2366d2bdc7a2a04a249be +checksum=6fe531136f6ebce2d35872a2d2c914278cdc5dcdd5eea516dc52c81f9001f5ee 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 @@ -46,22 +45,20 @@ conf_files=" /etc/pulse/default.pa" Add_dependency run glibc -Add_dependency run glib -Add_dependency run libpulseaudio Add_dependency run libltdl +Add_dependency run libsamplerate Add_dependency run libspeex -Add_dependency run orc -Add_dependency run libtdb Add_dependency run json-c Add_dependency run libX11 Add_dependency run libxcb Add_dependency run libSM Add_dependency run libICE Add_dependency run libXtst -Add_dependency run libsamplerate Add_dependency run libsndfile Add_dependency run libasyncns +Add_dependency run orc Add_dependency run dbus-libs +Add_dependency run libtdb Add_dependency run libcap Add_dependency run alsa-lib Add_dependency run libudev @@ -69,6 +66,7 @@ Add_dependency run avahi-libs Add_dependency run libssl Add_dependency run zlib Add_dependency run libbluetooth +Add_dependency run libpulseaudio Add_dependency run rtkit Add_dependency build pkg-config diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt index 1a221ae9683..55d0f52ca9a 100644 --- a/xbps-src/common/mapping_shlib_binpkg.txt +++ b/xbps-src/common/mapping_shlib_binpkg.txt @@ -674,9 +674,11 @@ libsndfile.so.1 libsndfile libsndfile-devel libspeex.so.1 libspeex speex-devel libspeexdsp.so.1 libspeex speex-devel libasyncns.so.0 libasyncns libasyncns-devel -libpulsecore-1.0.so pulseaudio pulseaudio-devel libpulse.so.0 libpulseaudio pulseaudio-devel -libpulsecommon-1.0.so libpulseaudio pulseaudio-devel +libpulsecommon-1.1.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 libbluetooth-util.so pulseaudio pulseaudio-devel libavahi-wrap.so pulseaudio pulseaudio-devel libprotocol-esound.so pulseaudio pulseaudio-devel @@ -691,7 +693,6 @@ libprotocol-simple.so pulseaudio pulseaudio-devel libbluetooth-ipc.so pulseaudio pulseaudio-devel libbluetooth-sbc.so pulseaudio pulseaudio-devel libpulse-browse.so pulseaudio pulseaudio-devel -libpulse-mainloop-glib.so.0 pulseaudio pulseaudio-devel liborc-0.4.so.0 orc orc-devel liborc-test-0.4.so.0 orc orc-devel libgmime-2.4.so.2 gmime gmime-devel