From b5d23b1ace705a7930b105999f7f4b29e3903304 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 28 Sep 2011 09:28:22 +0200 Subject: [PATCH] pulseaudio: update to 1.0. --- srcpkgs/pulseaudio/depends | 2 +- srcpkgs/pulseaudio/libpulseaudio.template | 32 +++++------ srcpkgs/pulseaudio/pulseaudio-devel.template | 17 +++--- srcpkgs/pulseaudio/template | 58 +++++++++----------- xbps-src/common/mapping_shlib_binpkg.txt | 36 ++++++------ 5 files changed, 69 insertions(+), 76 deletions(-) diff --git a/srcpkgs/pulseaudio/depends b/srcpkgs/pulseaudio/depends index 041f96cbd0b..bb0044e6e3b 100644 --- a/srcpkgs/pulseaudio/depends +++ b/srcpkgs/pulseaudio/depends @@ -1,2 +1,2 @@ -abi_depends=">=0.9.23" +abi_depends=">=1.0" api_depends="${abi_depends}" diff --git a/srcpkgs/pulseaudio/libpulseaudio.template b/srcpkgs/pulseaudio/libpulseaudio.template index 2123ffb2d83..7ed12516d48 100644 --- a/srcpkgs/pulseaudio/libpulseaudio.template +++ b/srcpkgs/pulseaudio/libpulseaudio.template @@ -9,26 +9,26 @@ long_desc=" This package provides client libraries used by applications that access a PulseAudio sound server via PulseAudio's native interface." -Add_dependency run glibc -Add_dependency run libltdl -Add_dependency run libasyncns -Add_dependency run tcp_wrappers-libs -Add_dependency run libtdb -Add_dependency run libcap -Add_dependency run glib -Add_dependency run libspeex -Add_dependency run libsndfile -Add_dependency run dbus-libs -Add_dependency run avahi-libs +Add_dependency run json-c +Add_dependency run libX11 +Add_dependency run libxcb Add_dependency run libSM Add_dependency run libICE -Add_dependency run libX11 Add_dependency run libXtst -Add_dependency run xcb-util -Add_dependency run libxcb +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 do_install() { - install -d ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/lib*.so* ${DESTDIR}/usr/lib + vmove "usr/lib/libpulse.so*" usr/lib + vmove "usr/lib/libpulsecommon*.so*" usr/lib } diff --git a/srcpkgs/pulseaudio/pulseaudio-devel.template b/srcpkgs/pulseaudio/pulseaudio-devel.template index c5591d27199..5b768833097 100644 --- a/srcpkgs/pulseaudio/pulseaudio-devel.template +++ b/srcpkgs/pulseaudio/pulseaudio-devel.template @@ -8,18 +8,12 @@ long_desc=" This package contains files for development, headers, static libs, etc." -Add_dependency run pkg-config -Add_dependency run gettext -Add_dependency run zlib-devel -Add_dependency run GConf-devel -Add_dependency run glib-devel +Add_dependency run gtk+-devel Add_dependency run libltdl-devel Add_dependency run speex-devel -Add_dependency run libX11-devel -Add_dependency run libSM-devel -Add_dependency run libICE-devel Add_dependency run libXtst-devel -Add_dependency run tcp_wrappers-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 @@ -30,7 +24,10 @@ 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 libpulseaudio +Add_dependency run libsamplerate-devel +Add_dependency run json-c-devel +Add_dependency run orc-devel +Add_dependency run pulseaudio do_install() { diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template index ddb0ed4d53d..73ffa812a0e 100644 --- a/srcpkgs/pulseaudio/template +++ b/srcpkgs/pulseaudio/template @@ -1,16 +1,16 @@ # Template file for 'pulseaudio' pkgname=pulseaudio -version=0.9.23 -distfiles="$FREEDESKTOP_SITE/$pkgname/releases/$pkgname-$version.tar.gz" +version=1.0 +distfiles="$FREEDESKTOP_SITE/$pkgname/releases/$pkgname-$version.tar.xz" build_style=gnu_configure -configure_args="--disable-samplerate --disable-oss-output --disable-oss-wrapper +configure_args="--disable-oss-output --disable-oss-wrapper --disable-tcpwrap --disable-jack --disable-lirc --disable-hal --disable-hal-compat ---with-database=tdb --localstatedir=/var LDFLAGS=" +--with-database=tdb --enable-orc --localstatedir=/var LDFLAGS=" short_desc="A featureful, general-purpose sound server" maintainer="Juan RP " homepage="http://www.pulseaudio.org/" license="LGPL-2" -checksum=af3e84c614cb632fd1f57105489fcd5f93f906da1ce5aa9019492212031fba4e +checksum=e63464f8a0975446e2b4cfe768b615a66735c8d092b2366d2bdc7a2a04a249be 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 @@ -45,44 +45,40 @@ conf_files=" /etc/pulse/default.pa" Add_dependency run glibc -Add_dependency run zlib Add_dependency run glib +Add_dependency run libpulseaudio Add_dependency run libltdl -Add_dependency run tcp_wrappers-libs Add_dependency run libspeex -Add_dependency run libsndfile -Add_dependency run libasyncns -Add_dependency run dbus-libs +Add_dependency run orc Add_dependency run libtdb -Add_dependency run libcap -Add_dependency run libbluetooth -Add_dependency run alsa-lib -Add_dependency run libudev -Add_dependency run libssl -Add_dependency run avahi-libs +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 libX11 -Add_dependency run xcb-util -Add_dependency run libxcb -Add_dependency run GConf -Add_dependency run libpulseaudio +Add_dependency run libsamplerate +Add_dependency run libsndfile +Add_dependency run libasyncns +Add_dependency run dbus-libs +Add_dependency run libcap +Add_dependency run alsa-lib +Add_dependency run libudev +Add_dependency run avahi-libs +Add_dependency run libssl +Add_dependency run zlib +Add_dependency run libbluetooth +Add_dependency run rtkit Add_dependency build m4 Add_dependency build pkg-config -Add_dependency build gettext -Add_dependency build GConf-devel -Add_dependency build glib-devel +Add_dependency build intltool +Add_dependency build gtk+-devel Add_dependency build libltdl-devel Add_dependency build speex-devel -Add_dependency build libX11-devel -Add_dependency build libSM-devel -Add_dependency build libICE-devel Add_dependency build libXtst-devel Add_dependency build xcb-util-devel Add_dependency build libxcb-devel -Add_dependency build tcp_wrappers-devel Add_dependency build libsndfile-devel Add_dependency build libasyncns-devel Add_dependency build dbus-devel @@ -93,9 +89,9 @@ Add_dependency build avahi-libs-devel Add_dependency build alsa-lib-devel Add_dependency build libudev-devel Add_dependency build openssl-devel -Add_dependency build zlib-devel - -Add_dependency full rtkit +Add_dependency build libsamplerate-devel +Add_dependency build json-c-devel +Add_dependency build orc-devel post_install() { diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt index 47c03f46f2f..e5010e2a3e0 100644 --- a/xbps-src/common/mapping_shlib_binpkg.txt +++ b/xbps-src/common/mapping_shlib_binpkg.txt @@ -677,24 +677,24 @@ libsndfile.so libsndfile libsndfile-devel libspeex.so libspeex speex-devel libspeexdsp.so libspeex speex-devel libasyncns.so libasyncns libasyncns-devel -libpulsecore-0.9.23.so libpulseaudio pulseaudio-devel -libpulse.so.0.12.2 libpulseaudio pulseaudio-devel -libpulsecommon-0.9.23.so libpulseaudio pulseaudio-devel -libbluetooth-util.so libpulseaudio pulseaudio-devel -libavahi-wrap.so libpulseaudio pulseaudio-devel -libprotocol-esound.so libpulseaudio pulseaudio-devel -libalsa-util.so libpulseaudio pulseaudio-devel -libraop.so libpulseaudio pulseaudio-devel -librtp.so libpulseaudio pulseaudio-devel -libprotocol-http.so libpulseaudio pulseaudio-devel -libprotocol-cli.so libpulseaudio pulseaudio-devel -libprotocol-native.so libpulseaudio pulseaudio-devel -libcli.so libpulseaudio pulseaudio-devel -libprotocol-simple.so libpulseaudio pulseaudio-devel -libbluetooth-ipc.so libpulseaudio pulseaudio-devel -libbluetooth-sbc.so libpulseaudio pulseaudio-devel -libpulse-browse.so libpulseaudio pulseaudio-devel -libpulse-mainloop-glib.so libpulseaudio pulseaudio-devel +libpulsecore-1.0.so pulseaudio pulseaudio-devel +libpulse.so libpulseaudio pulseaudio-devel +libpulsecommon-1.0.so libpulseaudio pulseaudio-devel +libbluetooth-util.so pulseaudio pulseaudio-devel +libavahi-wrap.so pulseaudio pulseaudio-devel +libprotocol-esound.so pulseaudio pulseaudio-devel +libalsa-util.so pulseaudio pulseaudio-devel +libraop.so pulseaudio pulseaudio-devel +librtp.so pulseaudio pulseaudio-devel +libprotocol-http.so pulseaudio pulseaudio-devel +libprotocol-cli.so pulseaudio pulseaudio-devel +libprotocol-native.so pulseaudio pulseaudio-devel +libcli.so pulseaudio pulseaudio-devel +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 pulseaudio pulseaudio-devel liborc-0.4.so orc orc-devel liborc-test-0.4.so orc orc-devel libgmime-2.4.so gmime gmime-devel