From: Arun Raghavan Date: Thu, 20 Oct 2011 16:15:56 +0000 (+0000) Subject: New stable releases. Bunch of bug fixes. Remove old versions since some of the proble... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9e092a1fa68ee8993f1d1a3a33aa1fa25c0d43bd;p=gentoo.git New stable releases. Bunch of bug fixes. Remove old versions since some of the problems were license related. Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64 --- diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog index a2ef8ac701ea..260a7d41bd77 100644 --- a/media-sound/pulseaudio/ChangeLog +++ b/media-sound/pulseaudio/ChangeLog @@ -1,6 +1,14 @@ # 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.250 2011/10/08 11:28:50 ford_prefect Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.251 2011/10/20 16:15:56 ford_prefect Exp $ + +*pulseaudio-1.1 (20 Oct 2011) + + 20 Oct 2011; Arun Raghavan + -pulseaudio-1.0-r1.ebuild, -pulseaudio-1.0-r2.ebuild, +pulseaudio-1.1.ebuild, + +files/pulseaudio-1.1-python3-fix.patch: + New stable releases. Bunch of bug fixes. Remove old versions since some of + the problems were license related. *pulseaudio-1.0-r2 (08 Oct 2011) diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest index e4974c4283de..2fea323c0142 100644 --- a/media-sound/pulseaudio/Manifest +++ b/media-sound/pulseaudio/Manifest @@ -5,24 +5,24 @@ AUX pulseaudio-0.9.21-armv5-build-fix.patch 3387 RMD160 a3c3d2cd97478fc7ee53eb9a AUX pulseaudio-0.9.22-xcb-atom-2.patch 4381 RMD160 9f46c2d75c7c89f23919ef890829af4533166304 SHA1 c427582c9724b034c0e72f76685e32e44f281868 SHA256 7c256858654529302ec242dadf2a6123da7077154fe31adc26ca96f8824becd4 AUX pulseaudio-0.9.22-xcb-atom.patch 3026 RMD160 3b88da261896e393294e6d11ebdc0986fb7cedde SHA1 23ea548e6a3853c1052c8e4516d396132cfb7221 SHA256 b7c528c3f20743d4337878138b0d0f12073a50b4d435c72812d06c472ebb1104 AUX pulseaudio-1.0-version-fix.patch 1756 RMD160 e7897bdeb833cc402b33d004e4713ef3a25a17d0 SHA1 c0631f979b4ebf351b3a9b815b88f3e26fdfba21 SHA256 a8a84f768d2aded658b1cf2b75e95a67051380edec9dac8494692e6870c982a7 +AUX pulseaudio-1.1-python3-fix.patch 5200 RMD160 c00325ed5417406f57f755f772eeae7e5335f8d9 SHA1 c0440858890ad01a09fbcb59647fb0df331cc4e1 SHA256 cd7b6a4702e11afe91d6f5f3c7e10d1db540709c5c4ad478aa550a23233ec3f6 AUX pulseaudio.conf.d 275 RMD160 6317cb5be41a768428056c0057d8f5b1f189e804 SHA1 22ed7f1de0f2a18a608c5e9a91635ee66addac4d SHA256 c03661e8cc902d27ff6b52f291207f2b008957571b942abdd92a873a52aae0dd AUX pulseaudio.init.d-4 2493 RMD160 9f6b2f487298a5576b60b53095ee697095b88c89 SHA1 80f0e5e621d9312a7b24129fe843dd7ce085756d SHA256 dc8caa43aa297d2ca4019eef5b3cb64b3a57741e611620490f8d79091790f363 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-1.0.tar.xz 1305008 RMD160 eecacfcaa8e181a694589a889e26352a214f7440 SHA1 24a408e762b2df4334e9ae4f644ac1b893c7ef86 SHA256 e63464f8a0975446e2b4cfe768b615a66735c8d092b2366d2bdc7a2a04a249be +DIST pulseaudio-1.1.tar.xz 1306168 RMD160 26faa0831a97ce02b1d9b256f5171ece797c721b SHA1 5ff451389951f79949a461b95168558cc4120e73 SHA256 6fe531136f6ebce2d35872a2d2c914278cdc5dcdd5eea516dc52c81f9001f5ee 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-1.0-r1.ebuild 6037 RMD160 b34bf746547a296dc90d100b04a7f6b80b29c868 SHA1 f18647654cfa01ab246f47d437cb4f30b0817978 SHA256 4db0caac66bf64bc074cb8135dccca3f43523d0d7f0492df08bfc558aeaf5c1f -EBUILD pulseaudio-1.0-r2.ebuild 6101 RMD160 2ddb08f6de6730be7435115b149c37c21aa39819 SHA1 dcac2cb696b8bd5307ea9c51a711b8018a5338ce SHA256 63bab9cf77cad85b5cb1e503b53c321cfc5e03e11496139f1e40d2ddb6d27d7b +EBUILD pulseaudio-1.1.ebuild 6098 RMD160 d07d1899a8cc1d128938ce6ad33447a0a97669f5 SHA1 516fa1e12622f63be0610116db5b766a3e1831f6 SHA256 049d3f700e642cfbc2987014f5e3a1059add296902f09818e5da2bbd7712e21b EBUILD pulseaudio-9999.ebuild 6025 RMD160 3a4b4c878beb9e76506398e14996fb2d00dfcf03 SHA1 8fdd2b0606d791f164e8214441ac3e98e6609050 SHA256 2a62648f22c244615383bbf02bd5bca781f4c2457c222286c9ef81434a75da35 -MISC ChangeLog 48158 RMD160 1d960a6ede8202bc5ad33630ca7a776d4b770950 SHA1 194015073f0e8ee0136fceac2913dd1284a3c9fa SHA256 85370e411d64ce542234aaa216536ceb39d98b88f3e471dc28a9fd0270278806 +MISC ChangeLog 48482 RMD160 d8c42a04875ea4ce61cf1ff752406f7a01b6a7c8 SHA1 6c8b0ffe307416cbfd379d2bfdad8af865bf9216 SHA256 124e158e35659ba2e7a387f423359f4d388d84378e3a76b24e5c87f55aafada6 MISC metadata.xml 2225 RMD160 270fc66edbe5134853cc06c1feaca8d94a8c50fd SHA1 1c8edb3e83bb3791d860e3b007e7dab37bdf3459 SHA256 57429e87e6e2902c0a81aa480f603ffa894234434c03da1ffef89d52493d848b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk6QNAgACgkQ+Vqt1inD4uzS1QCdFqa3aCI9Pf5xcnjwP7HE0CXN -4gYAniwSsbHd4ypFW/6ZmEjCig/z704H -=2DVo +iEYEARECAAYFAk6gSW0ACgkQ+Vqt1inD4uzl4QCgl25oUhAGYx+WGynbvQorzLkJ +DFwAn2u0o/cWjRrqxb9XQK3NcIn/9nx0 +=O/Tu -----END PGP SIGNATURE----- diff --git a/media-sound/pulseaudio/files/pulseaudio-1.1-python3-fix.patch b/media-sound/pulseaudio/files/pulseaudio-1.1-python3-fix.patch new file mode 100644 index 000000000000..52017c3cad48 --- /dev/null +++ b/media-sound/pulseaudio/files/pulseaudio-1.1-python3-fix.patch @@ -0,0 +1,122 @@ +commit b453e13edef8be95d70d837466e911b883faf476 +Author: Maarten Bosmans +Date: Mon Oct 10 12:28:22 2011 +0200 + + qpaeq: Make it python3 and python2 compatible + +diff --git a/src/utils/qpaeq b/src/utils/qpaeq +index a8a9fda..951e70f 100755 +--- a/src/utils/qpaeq ++++ b/src/utils/qpaeq +@@ -22,12 +22,11 @@ try: + from PyQt4 import QtGui,QtCore + import dbus.mainloop.qt + import dbus +-except ImportError,e: +- print 'There was an error importing need libraries' +- print 'Make sure you haveqt4 and dbus forthon installed' +- print 'The error that occured was' +- print '\t%s' %(str(e)) +- import sys ++except ImportError as e: ++ sys.stderr.write('There was an error importing need libraries\n' ++ 'Make sure you haveqt4 and dbus forthon installed\n' ++ 'The error that occured was:\n' ++ '\t%s\n' % (str(e))) + sys.exit(-1) + + from functools import partial +@@ -47,10 +46,10 @@ def connect(): + server_lookup = bus.get_object('org.PulseAudio1', '/org/pulseaudio/server_lookup1') + address = server_lookup.Get('org.PulseAudio.ServerLookup1', 'Address', dbus_interface='org.freedesktop.DBus.Properties') + return dbus.connection.Connection(address) +- except Exception,e: +- print 'There was an error connecting to pulseaudio, please make sure you have the pulseaudio dbus' +- print 'and equalizer modules loaded, exiting...' +- import sys ++ except Exception as e: ++ sys.stderr.write('There was an error connecting to pulseaudio, ' ++ 'please make sure you have the pulseaudio dbus ' ++ 'and equalizer modules loaded, exiting...\n') + sys.exit(-1) + + +@@ -148,7 +147,7 @@ class QPaeq(QtGui.QWidget): + + self.channel_box.clear() + self.channel_box.addItem('All',self.filter_state.channels) +- for i in xrange(self.filter_state.channels): ++ for i in range(self.filter_state.channels): + self.channel_box.addItem('%d' %(i+1,),i) + self.setMinimumSize(self.sizeHint()) + +@@ -221,7 +220,7 @@ class QPaeq(QtGui.QWidget): + self.filter_state.readback() + + #TODO: add back in preamp! +- #print frequencies ++ #print(frequencies) + #main_layout.addLayout(self.create_slider(partial(self.update_coefficient,0), + # 'Preamp')[0] + #) +@@ -243,7 +242,7 @@ class QPaeq(QtGui.QWidget): + self.update_profiles() + self.update_sinks() + def update_profiles(self): +- #print 'update profiles called!' ++ #print('update profiles called!') + manager_props=dbus.Interface(self.manager_obj,dbus_interface=prop_iface) + self.profiles=manager_props.Get(self.manager_iface,'Profiles') + self.profile_box.blockSignals(True) +@@ -262,7 +261,7 @@ class QPaeq(QtGui.QWidget): + self.sink_box.blockSignals(False) + self.sink_box.setMinimumSize(self.sink_box.sizeHint()) + def read_filter(self): +- #print self.filter_frequencies ++ #print(self.filter_frequencies) + self.filter_state.readback() + def reset(self): + coefs=dbus.Array([1/math.sqrt(2.0)]*(self.filter_state.filter_rate//2+1)) +@@ -480,18 +479,16 @@ class FilterState(QtCore.QObject): + return [0]+xs+[self.sample_rate//2] + def _set_frequency_values(self,freqs): + self.frequencies=freqs +- #print 'base',self.frequencies +- self.filter_frequencies=map(lambda x: int(round(x)), \ +- self.translate_rates(self.filter_rate,self.sample_rate, +- self.frequencies) \ +- ) ++ #print('base',self.frequencies) ++ self.filter_frequencies=[int(round(x)) for x in self.translate_rates(self.filter_rate,self.sample_rate, ++ self.frequencies)] + self.coefficients=[0.0]*len(self.frequencies) + self.preamp=1.0 + def set_frequency_values(self,freqs): + self._set_frequency_values(self.freq_proper(freqs)) + @staticmethod + def translate_rates(dst,src,rates): +- return list(map(lambda x: x*dst/src,rates)) ++ return list([x*dst/src for x in rates]) + def seed(self): + self.sink.SeedFilter(self.channel,self.filter_frequencies,self.coefficients,self.preamp) + self.sync_timer.start(SYNC_TIMEOUT) +@@ -504,7 +501,7 @@ class FilterState(QtCore.QObject): + self.sink.SetFilter(self.channel,dbus.Array(coefs),self.preamp) + self.sync_timer.start(SYNC_TIMEOUT) + def save_state(self): +- print 'saving state' ++ print('saving state') + self.sink.SaveState() + def load_profile(self,profile): + self.sink.LoadProfile(self.channel,dbus.String(profile)) +@@ -540,8 +537,8 @@ def subdivide(xs, t_points): + p_drop=len(xs)-t_points + p_drop_left=p_drop//2 + p_drop_right=p_drop-p_drop_left +- #print 'xs',xs +- #print 'dropping %d, %d left, %d right' %(p_drop,p_drop_left,p_drop_right) ++ #print('xs',xs) ++ #print('dropping %d, %d left, %d right' %(p_drop,p_drop_left,p_drop_right)) + c=len(xs)//2 + left=xs[0:p_drop_left*2:2]+xs[p_drop_left*2:c] + right=list(reversed(xs[c:])) diff --git a/media-sound/pulseaudio/pulseaudio-1.0-r1.ebuild b/media-sound/pulseaudio/pulseaudio-1.0-r1.ebuild deleted file mode 100644 index 7e71c5ee48e5..000000000000 --- a/media-sound/pulseaudio/pulseaudio-1.0-r1.ebuild +++ /dev/null @@ -1,206 +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-1.0-r1.ebuild,v 1.1 2011/09/28 14:31:56 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) \ - $(use_with equalizer fftw) \ - --localstatedir="${EPREFIX}"/var \ - --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 - 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." - 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-r2.ebuild b/media-sound/pulseaudio/pulseaudio-1.1.ebuild similarity index 98% rename from media-sound/pulseaudio/pulseaudio-1.0-r2.ebuild rename to media-sound/pulseaudio/pulseaudio-1.1.ebuild index 2c008395bd98..ff5db0a0481e 100644 --- a/media-sound/pulseaudio/pulseaudio-1.0-r2.ebuild +++ b/media-sound/pulseaudio/pulseaudio-1.1.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-1.0-r2.ebuild,v 1.1 2011/10/08 11:28:50 ford_prefect Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-1.1.ebuild,v 1.1 2011/10/20 16:15:56 ford_prefect Exp $ EAPI=4 @@ -80,7 +80,7 @@ pkg_setup() { } src_prepare() { - epatch "${FILESDIR}/${P}-version-fix.patch" + epatch "${FILESDIR}/${P}-python3-fix.patch" } src_configure() {