From da99054d7fa9860c073f3811169ec98073e46c9e Mon Sep 17 00:00:00 2001 From: Arun Raghavan Date: Tue, 27 Sep 2011 09:48:43 +0000 Subject: Bump to 1.0 and drop prerelease ebuild. Just a few bug fixes since the last release candidate. Also remove non-existent deps. Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64 --- media-sound/pulseaudio/ChangeLog | 9 +- media-sound/pulseaudio/Manifest | 14 +- media-sound/pulseaudio/pulseaudio-0.99.4.ebuild | 215 ------------------------ media-sound/pulseaudio/pulseaudio-1.0.ebuild | 215 ++++++++++++++++++++++++ media-sound/pulseaudio/pulseaudio-9999.ebuild | 6 +- 5 files changed, 233 insertions(+), 226 deletions(-) delete mode 100644 media-sound/pulseaudio/pulseaudio-0.99.4.ebuild create mode 100644 media-sound/pulseaudio/pulseaudio-1.0.ebuild (limited to 'media-sound/pulseaudio') diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog index 295120242a37..bf6bddc4f9df 100644 --- a/media-sound/pulseaudio/ChangeLog +++ b/media-sound/pulseaudio/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-sound/pulseaudio # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.246 2011/09/15 11:19:37 ford_prefect Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.247 2011/09/27 09:48:43 ford_prefect Exp $ + +*pulseaudio-1.0 (27 Sep 2011) + + 27 Sep 2011; Arun Raghavan + -pulseaudio-0.99.4.ebuild, +pulseaudio-1.0.ebuild, pulseaudio-9999.ebuild: + Bump to 1.0 and drop prerelease ebuild. Just a few bug fixes since the last + release candidate. Also remove non-existent deps. *pulseaudio-0.99.4 (15 Sep 2011) diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest index bb1a8b1f4e77..10e09048115d 100644 --- a/media-sound/pulseaudio/Manifest +++ b/media-sound/pulseaudio/Manifest @@ -9,18 +9,18 @@ AUX pulseaudio.init.d-4 2493 RMD160 9f6b2f487298a5576b60b53095ee697095b88c89 SHA AUX pulseaudio.init.d-5 2352 RMD160 36a3732386617f5436a60d0d9248a69da9804c5d SHA1 4b2fa2f0437b78b0a7fd5a54e8a83b02c99af579 SHA256 60e4571a8af0437bd99cfd858fde1e6223544a60e591febf25e55e4a2918ff59 DIST pulseaudio-0.9.22.tar.gz 2076785 RMD160 31199c497f7b1cce2285a6369d43fc1f66cd41a4 SHA1 f5fc14d7a62ae9f9ee9745026e3f13f4c130140a SHA256 c6019324395117a258c048a6db5e9734551cc2c61dc35b46403ff00d64be55f0 DIST pulseaudio-0.9.23.tar.gz 2095454 RMD160 1f5d19a40279327dcd04908e4f441c95a986313d SHA1 361f7d89606e8423aad19691bb27f6552e0b679e SHA256 af3e84c614cb632fd1f57105489fcd5f93f906da1ce5aa9019492212031fba4e -DIST pulseaudio-0.99.4.tar.gz 2279678 RMD160 b0e957896232c737ec9368481d599ccf580f9ba3 SHA1 0996b25f97423e63cbb13f6d7200f0854b82f464 SHA256 7dde2f73f6b8336797d06928c8210d5e6cfaa7d679bea7b93f5ffc26fb970fec +DIST pulseaudio-1.0.tar.xz 1305008 RMD160 eecacfcaa8e181a694589a889e26352a214f7440 SHA1 24a408e762b2df4334e9ae4f644ac1b893c7ef86 SHA256 e63464f8a0975446e2b4cfe768b615a66735c8d092b2366d2bdc7a2a04a249be EBUILD pulseaudio-0.9.22-r2.ebuild 6796 RMD160 02fc6a6e035cb758042d4dd40c311bb242cefbb2 SHA1 9592d4c27deb87758ce73a7e9d1760161d5f5697 SHA256 5c1b7996dd575cf24084d32b7957e41d6af547e6792ddf2b695c5cbe49bf4062 EBUILD pulseaudio-0.9.22.ebuild 6673 RMD160 7fedd677e1965979a1b3ae723bc631f0ac9b9502 SHA1 8c20123736b20c264b255a579da3f848184f6104 SHA256 c20632a24bd755409e6e4fc6185174bd903f8c890b02d4b605dc7d9d427dbea8 EBUILD pulseaudio-0.9.23-r1.ebuild 6447 RMD160 bdd2c8a238140a694d68a8a73ccd1c036edbe141 SHA1 296ce55f936d89e77ff99e34be01ac99ea2462ed SHA256 4df36f7090347daaebfdef125a08ee455f6b7572e5e9376ed9d4c6e142a7bba1 -EBUILD pulseaudio-0.99.4.ebuild 6517 RMD160 5897d991bb8547d33b09cf29c9505c33b7b931f6 SHA1 a446cc4d9ad00aa726bc0b771af2b568b707a362 SHA256 68df56c2169aae6a4a6940e22de9413b2da2c9f685dd427b16382aff798dac18 -EBUILD pulseaudio-9999.ebuild 6505 RMD160 ef7e7b6dc60697e43f44774844f9c6f0d01be600 SHA1 c1c3c07a04a1f6df286e6d82c8b55eb21a7a8afd SHA256 6b1c4e9f14589471417ff96b0689d0ab0e9adfc93bd4c4f608b06477ef2584da -MISC ChangeLog 47143 RMD160 dd2eabde71293cf8e2e1ac4d709a9daf4d952c8b SHA1 007db917d17772c6f12e8f08367f2bad92d489c6 SHA256 94906f8f5adadf0c3e6721216f10eaceeba9e402b7efe7b2fda9206f30ca0fb2 +EBUILD pulseaudio-1.0.ebuild 6444 RMD160 0c5e1c1825f8c7781a8d9100f3a14b25bb735267 SHA1 537dc2a66fa5fec9895d6ba9175071984409fdc2 SHA256 4f4c0becf099dee4432d9f72f3d3e526da471a653b9853aed07862cdb69f2c3b +EBUILD pulseaudio-9999.ebuild 6435 RMD160 76fb6716a38f0568ba10c9b276c32a096c7573b4 SHA1 e2ee39f74d291082fcc19d427e1e2d08e9d48b2a SHA256 03acb5c865b7d8083c1d482bd38189aa4bae3e6ccee9e97b20b9c4fc66d349ff +MISC ChangeLog 47437 RMD160 70ef0dcd2969ac0cb6a4695ae6df2fedbfc65bee SHA1 55538c135824223c11a3aafded2c810ee4b59451 SHA256 d54eef1ab08edf01444d0b7735ae8b676b44b3e82b1b1f9fa322d53696656c02 MISC metadata.xml 2225 RMD160 270fc66edbe5134853cc06c1feaca8d94a8c50fd SHA1 1c8edb3e83bb3791d860e3b007e7dab37bdf3459 SHA256 57429e87e6e2902c0a81aa480f603ffa894234434c03da1ffef89d52493d848b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk5x35YACgkQ+Vqt1inD4uyRpwCfV9aRQjfgoqoohJ816ebdWBKM -eOoAn28u1PJ5uxXKgAVIz2Ph4Njgz0rN -=ejsA +iEYEARECAAYFAk6BnE0ACgkQ+Vqt1inD4uwGzQCgtPMSq14O8YtFhGtPvEx/xLfR +FTIAoKTCXcXzBAEDpiT3DEM0k9wJZ9yz +=sxqq -----END PGP SIGNATURE----- diff --git a/media-sound/pulseaudio/pulseaudio-0.99.4.ebuild b/media-sound/pulseaudio/pulseaudio-0.99.4.ebuild deleted file mode 100644 index 6c99db18a6e3..000000000000 --- a/media-sound/pulseaudio/pulseaudio-0.99.4.ebuild +++ /dev/null @@ -1,215 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.99.4.ebuild,v 1.1 2011/09/15 11:19:37 ford_prefect Exp $ - -EAPI=4 - -inherit eutils libtool flag-o-matic versionator - -DESCRIPTION="A networked sound server with an advanced plugin system" -HOMEPAGE="http://www.pulseaudio.org/" - -SRC_URI="http://freedesktop.org/software/pulseaudio/releases/${P}.tar.gz" - -LICENSE="LGPL-2 GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="+alsa avahi +caps equalizer jack lirc oss tcpd +X dbus libsamplerate gnome bluetooth +asyncns +glib test doc +udev ipv6 system-wide realtime +orc" - -RDEPEND="app-admin/eselect-esd - X? ( - || ( >=x11-libs/libX11-1.4.0 =x11-libs/libxcb-1.6 - >=x11-libs/xcb-util-0.3.1 - x11-libs/libSM - x11-libs/libICE - x11-libs/libXtst - ) - caps? ( sys-libs/libcap ) - libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) - alsa? ( >=media-libs/alsa-lib-1.0.19 ) - glib? ( >=dev-libs/glib-2.4.0 ) - avahi? ( >=net-dns/avahi-0.6.12[dbus] ) - jack? ( >=media-sound/jack-audio-connection-kit-0.117 ) - tcpd? ( sys-apps/tcp-wrappers ) - lirc? ( app-misc/lirc ) - dbus? ( >=sys-apps/dbus-1.0.0 ) - gnome? ( >=gnome-base/gconf-2.4.0 ) - bluetooth? ( - >=net-wireless/bluez-4 - >=sys-apps/dbus-1.0.0 - ) - asyncns? ( net-libs/libasyncns ) - udev? ( || ( >=sys-fs/udev-171[hwdb] >=sys-fs/udev-143[extras] ) ) - realtime? ( sys-auth/rtkit ) - equalizer? ( sci-libs/fftw:3.0 ) - orc? ( >=dev-lang/orc-0.4.9 ) - >=media-libs/audiofile-0.2.6-r1 - >=media-libs/speex-1.2_rc1 - >=media-libs/libsndfile-1.0.20 - sys-libs/gdbm - dev-libs/json-c - >=sys-devel/libtool-2.2.4" # it's a valid RDEPEND, libltdl.so is used - -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) - X? ( - x11-proto/xproto - || ( >=x11-libs/libXtst-1.0.99.2 "${T}/pulseaudio" - - doinitd "${T}/pulseaudio" - fi - - use avahi && sed -i -e '/module-zeroconf-publish/s:^#::' "${ED}/etc/pulse/default.pa" - - dodoc README todo - - if use doc; then - pushd doxygen/html - dohtml * - popd - fi - - # Create the state directory - use prefix || diropts -o pulse -g pulse -m0755 - keepdir /var/run/pulse - - find "${D}" -name '*.la' -delete -} - -pkg_postinst() { - if use system-wide; then - elog "PulseAudio in Gentoo can use a system-wide pulseaudio daemon." - elog "This support is enabled by starting the pulseaudio init.d ." - elog "To be able to access that you need to be in the group pulse-access." - elog "If you choose to use this feature, please make sure that you" - elog "really want to run PulseAudio this way:" - elog " http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode" - elog "For more information about system-wide support, please refer to:" - elog " http://pulseaudio.org/wiki/SystemWideInstance" - if use gnome ; then - elog - elog "By enabling gnome USE flag, you enabled gconf support. Please note" - elog "that you might need to remove the gnome USE flag or disable the" - elog "gconf module on /etc/pulse/system.pa to be able to use PulseAudio" - elog "with a system-wide instance." - fi - elog - elog "To use the ESounD wrapper while using a system-wide daemon, you also" - elog "need to enable auth-anonymous for the esound-unix module, or to copy" - elog "/var/run/pulse/.esd_auth into each home directory." - elog - fi - if use bluetooth; then - elog - elog "The BlueTooth proximity module is not enabled in the default" - elog "configuration file. If you do enable it, you'll have to have" - elog "your BlueTooth controller enabled and inserted at bootup or" - elog "PulseAudio will refuse to start." - elog - elog "Please note that the BlueTooth proximity module seems itself" - elog "still experimental, so please report to upstream if you have" - elog "problems with it." - fi - if use alsa; then - local pkg="media-plugins/alsa-plugins" - if has_version ${pkg} && ! has_version "${pkg}[pulseaudio]"; then - elog - elog "You have alsa support enabled so you probably want to install" - elog "${pkg} with pulseaudio support to have" - elog "alsa using applications route their sound through pulseaudio" - fi - fi - - eselect esd update --if-unset -} diff --git a/media-sound/pulseaudio/pulseaudio-1.0.ebuild b/media-sound/pulseaudio/pulseaudio-1.0.ebuild new file mode 100644 index 000000000000..5d0455509857 --- /dev/null +++ b/media-sound/pulseaudio/pulseaudio-1.0.ebuild @@ -0,0 +1,215 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-1.0.ebuild,v 1.1 2011/09/27 09:48:43 ford_prefect Exp $ + +EAPI=4 + +inherit eutils libtool flag-o-matic versionator + +DESCRIPTION="A networked sound server with an advanced plugin system" +HOMEPAGE="http://www.pulseaudio.org/" + +SRC_URI="http://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz" + +LICENSE="LGPL-2 GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="+alsa avahi +caps equalizer jack lirc oss tcpd +X dbus libsamplerate gnome bluetooth +asyncns +glib test doc +udev ipv6 system-wide realtime +orc" + +RDEPEND="app-admin/eselect-esd + X? ( + >=x11-libs/libX11-1.4.0 + >=x11-libs/libxcb-1.6 + >=x11-libs/xcb-util-0.3.1 + x11-libs/libSM + x11-libs/libICE + x11-libs/libXtst + ) + caps? ( sys-libs/libcap ) + libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) + alsa? ( >=media-libs/alsa-lib-1.0.19 ) + glib? ( >=dev-libs/glib-2.4.0 ) + avahi? ( >=net-dns/avahi-0.6.12[dbus] ) + jack? ( >=media-sound/jack-audio-connection-kit-0.117 ) + tcpd? ( sys-apps/tcp-wrappers ) + lirc? ( app-misc/lirc ) + dbus? ( >=sys-apps/dbus-1.0.0 ) + gnome? ( >=gnome-base/gconf-2.4.0 ) + bluetooth? ( + >=net-wireless/bluez-4 + >=sys-apps/dbus-1.0.0 + ) + asyncns? ( net-libs/libasyncns ) + udev? ( || ( >=sys-fs/udev-171[hwdb] >=sys-fs/udev-143[extras] ) ) + realtime? ( sys-auth/rtkit ) + equalizer? ( sci-libs/fftw:3.0 ) + orc? ( >=dev-lang/orc-0.4.9 ) + >=media-libs/audiofile-0.2.6-r1 + >=media-libs/speex-1.2_rc1 + >=media-libs/libsndfile-1.0.20 + sys-libs/gdbm + dev-libs/json-c + >=sys-devel/libtool-2.2.4" # it's a valid RDEPEND, libltdl.so is used + +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen ) + X? ( + x11-proto/xproto + >=x11-libs/libXtst-1.0.99.2 + ) + dev-libs/libatomic_ops + dev-util/pkgconfig + system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) ) + dev-util/intltool" + +# alsa-utils dep is for the alsasound init.d script (see bug #155707) +# bluez dep is for the bluetooth init.d script +RDEPEND="${RDEPEND} + X? ( gnome-extra/gnome-audio ) + system-wide? ( + sys-apps/openrc + alsa? ( media-sound/alsa-utils ) + bluetooth? ( >=net-wireless/bluez-4 ) + )" + +pkg_setup() { + enewgroup audio 18 # Just make sure it exists + enewgroup pulse-access + enewgroup pulse + enewuser pulse -1 -1 /var/run/pulse pulse,audio +} + +src_configure() { + # It's a binutils bug, once I can find time to fix that I'll add a + # proper dependency and fix this up. — flameeyes + append-ldflags $(no-as-needed) + + econf \ + --enable-largefile \ + $(use_enable glib glib2) \ + --disable-solaris \ + $(use_enable asyncns) \ + $(use_enable oss oss-output) \ + $(use_enable alsa) \ + $(use_enable lirc) \ + $(use_enable tcpd tcpwrap) \ + $(use_enable jack) \ + $(use_enable lirc) \ + $(use_enable avahi) \ + --disable-hal \ + $(use_enable dbus) \ + $(use_enable gnome gconf) \ + $(use_enable libsamplerate samplerate) \ + $(use_enable bluetooth bluez) \ + $(use_enable X x11) \ + $(use_enable test default-build-tests) \ + $(use_enable udev) \ + $(use_enable ipv6) \ + $(use_with caps) \ + --localstatedir="${EPREFIX}"/var \ + --disable-per-user-esound-socket \ + --with-database=gdbm \ + --with-udev-rules-dir="${EPREFIX}/lib/udev/rules.d" + + if use doc; then + pushd doxygen + doxygen doxygen.conf + popd + fi +} + +src_test() { + # We avoid running the toplevel check target because that will run + # po/'s tests too, and they are broken. Officially, it should work + # with intltool 0.41, but that doesn't look like a stable release. + emake -C src check +} + +src_install() { + emake -j1 DESTDIR="${D}" install + + # Drop the script entirely if X is disabled + use X || rm "${ED}"/usr/bin/start-pulseaudio-x11 + + if use system-wide; then + newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio + + use_define() { + local define=${2:-$(echo $1 | tr '[:lower:]' '[:upper:]')} + + use "$1" && echo "-D$define" || echo "-U$define" + } + + unifdef $(use_define avahi) \ + $(use_define alsa) \ + $(use_define bluetooth) \ + $(use_define udev) \ + "${FILESDIR}/pulseaudio.init.d-5" \ + > "${T}/pulseaudio" + + doinitd "${T}/pulseaudio" + fi + + use avahi && sed -i -e '/module-zeroconf-publish/s:^#::' "${ED}/etc/pulse/default.pa" + + dodoc README todo + + if use doc; then + pushd doxygen/html + dohtml * + popd + fi + + # Create the state directory + use prefix || diropts -o pulse -g pulse -m0755 + keepdir /var/run/pulse + + find "${D}" -name '*.la' -delete +} + +pkg_postinst() { + if use system-wide; then + elog "PulseAudio in Gentoo can use a system-wide pulseaudio daemon." + elog "This support is enabled by starting the pulseaudio init.d ." + elog "To be able to access that you need to be in the group pulse-access." + elog "If you choose to use this feature, please make sure that you" + elog "really want to run PulseAudio this way:" + elog " http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode" + elog "For more information about system-wide support, please refer to:" + elog " http://pulseaudio.org/wiki/SystemWideInstance" + if use gnome ; then + elog + elog "By enabling gnome USE flag, you enabled gconf support. Please note" + elog "that you might need to remove the gnome USE flag or disable the" + elog "gconf module on /etc/pulse/system.pa to be able to use PulseAudio" + elog "with a system-wide instance." + fi + elog + elog "To use the ESounD wrapper while using a system-wide daemon, you also" + elog "need to enable auth-anonymous for the esound-unix module, or to copy" + elog "/var/run/pulse/.esd_auth into each home directory." + elog + fi + if use bluetooth; then + elog + elog "The BlueTooth proximity module is not enabled in the default" + elog "configuration file. If you do enable it, you'll have to have" + elog "your BlueTooth controller enabled and inserted at bootup or" + elog "PulseAudio will refuse to start." + elog + elog "Please note that the BlueTooth proximity module seems itself" + elog "still experimental, so please report to upstream if you have" + elog "problems with it." + fi + if use alsa; then + local pkg="media-plugins/alsa-plugins" + if has_version ${pkg} && ! has_version "${pkg}[pulseaudio]"; then + elog + elog "You have alsa support enabled so you probably want to install" + elog "${pkg} with pulseaudio support to have" + elog "alsa using applications route their sound through pulseaudio" + fi + fi + + eselect esd update --if-unset +} diff --git a/media-sound/pulseaudio/pulseaudio-9999.ebuild b/media-sound/pulseaudio/pulseaudio-9999.ebuild index 9b99660e847b..95c3b85d2459 100644 --- a/media-sound/pulseaudio/pulseaudio-9999.ebuild +++ b/media-sound/pulseaudio/pulseaudio-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-9999.ebuild,v 1.11 2011/08/16 10:37:51 ford_prefect Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-9999.ebuild,v 1.12 2011/09/27 09:48:43 ford_prefect Exp $ EAPI=4 @@ -18,7 +18,7 @@ IUSE="+alsa avahi +caps equalizer jack lirc oss tcpd +X dbus libsamplerate gnome RDEPEND="app-admin/eselect-esd X? ( - || ( >=x11-libs/libX11-1.4.0 =x11-libs/libX11-1.4.0 >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.1 x11-libs/libSM @@ -55,7 +55,7 @@ DEPEND="${RDEPEND} doc? ( app-doc/doxygen ) X? ( x11-proto/xproto - || ( >=x11-libs/libXtst-1.0.99.2 =x11-libs/libXtst-1.0.99.2 ) dev-libs/libatomic_ops dev-util/pkgconfig -- cgit v1.2.3-65-gdbad