| 1 |
ssuominen 11/01/04 12:15:15 |
| 2 |
|
| 3 |
Modified: ChangeLog pulseaudio-0.9.22.ebuild |
| 4 |
Log: |
| 5 |
Remove deprecated hal support wrt #349050. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha10/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.204 media-sound/pulseaudio/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/pulseaudio/ChangeLog?rev=1.204&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/pulseaudio/ChangeLog?rev=1.204&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/pulseaudio/ChangeLog?r1=1.203&r2=1.204 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v |
| 19 |
retrieving revision 1.203 |
| 20 |
retrieving revision 1.204 |
| 21 |
diff -u -r1.203 -r1.204 |
| 22 |
--- ChangeLog 22 Dec 2010 06:22:26 -0000 1.203 |
| 23 |
+++ ChangeLog 4 Jan 2011 12:15:15 -0000 1.204 |
| 24 |
@@ -1,6 +1,9 @@ |
| 25 |
# ChangeLog for media-sound/pulseaudio |
| 26 |
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.203 2010/12/22 06:22:26 ford_prefect Exp $ |
| 28 |
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.204 2011/01/04 12:15:15 ssuominen Exp $ |
| 30 |
+ |
| 31 |
+ 04 Jan 2011; Samuli Suominen <ssuominen@g.o> pulseaudio-0.9.22.ebuild: |
| 32 |
+ Remove deprecated hal support wrt #349050. |
| 33 |
|
| 34 |
22 Dec 2010; Arun Raghavan <ford_prefect@g.o> |
| 35 |
pulseaudio-0.9.19.ebuild, pulseaudio-0.9.21.ebuild, |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.7 media-sound/pulseaudio/pulseaudio-0.9.22.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild?rev=1.7&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild?rev=1.7&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild?r1=1.6&r2=1.7 |
| 44 |
|
| 45 |
Index: pulseaudio-0.9.22.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild,v |
| 48 |
retrieving revision 1.6 |
| 49 |
retrieving revision 1.7 |
| 50 |
diff -u -r1.6 -r1.7 |
| 51 |
--- pulseaudio-0.9.22.ebuild 22 Dec 2010 06:22:26 -0000 1.6 |
| 52 |
+++ pulseaudio-0.9.22.ebuild 4 Jan 2011 12:15:15 -0000 1.7 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
-# Copyright 1999-2010 Gentoo Foundation |
| 55 |
+# Copyright 1999-2011 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild,v 1.6 2010/12/22 06:22:26 ford_prefect Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.22.ebuild,v 1.7 2011/01/04 12:15:15 ssuominen Exp $ |
| 59 |
|
| 60 |
EAPI=3 |
| 61 |
|
| 62 |
@@ -14,7 +14,7 @@ |
| 63 |
LICENSE="LGPL-2 GPL-2" |
| 64 |
SLOT="0" |
| 65 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" |
| 66 |
-IUSE="+alsa avahi +caps jack lirc oss tcpd +X hal dbus libsamplerate gnome bluetooth +asyncns +glib test doc +udev ipv6 system-wide realtime" |
| 67 |
+IUSE="+alsa avahi +caps jack lirc oss tcpd +X dbus libsamplerate gnome bluetooth +asyncns +glib test doc +udev ipv6 system-wide realtime" |
| 68 |
|
| 69 |
RDEPEND="app-admin/eselect-esd |
| 70 |
X? ( |
| 71 |
@@ -34,10 +34,6 @@ |
| 72 |
lirc? ( app-misc/lirc ) |
| 73 |
dbus? ( >=sys-apps/dbus-1.0.0 ) |
| 74 |
gnome? ( >=gnome-base/gconf-2.4.0 ) |
| 75 |
- hal? ( |
| 76 |
- >=sys-apps/hal-0.5.11 |
| 77 |
- >=sys-apps/dbus-1.0.0 |
| 78 |
- ) |
| 79 |
bluetooth? ( |
| 80 |
>=net-wireless/bluez-4 |
| 81 |
>=sys-apps/dbus-1.0.0 |
| 82 |
@@ -77,13 +73,6 @@ |
| 83 |
enewgroup pulse-access |
| 84 |
enewgroup pulse |
| 85 |
enewuser pulse -1 -1 /var/run/pulse pulse,audio |
| 86 |
- |
| 87 |
- if use udev && use hal; then |
| 88 |
- elog "Please note that enabling both udev and hal will build both" |
| 89 |
- elog "discover modules, but only udev will be used automatically." |
| 90 |
- elog "If you wish to use hal you have to enable it explicitly" |
| 91 |
- elog "or you might just disable the hal USE flag entirely." |
| 92 |
- fi |
| 93 |
} |
| 94 |
|
| 95 |
src_prepare() { |
| 96 |
@@ -113,7 +102,7 @@ |
| 97 |
$(use_enable jack) \ |
| 98 |
$(use_enable lirc) \ |
| 99 |
$(use_enable avahi) \ |
| 100 |
- $(use_enable hal) \ |
| 101 |
+ --disable-hal \ |
| 102 |
$(use_enable dbus) \ |
| 103 |
$(use_enable gnome gconf) \ |
| 104 |
$(use_enable libsamplerate samplerate) \ |
| 105 |
@@ -158,8 +147,7 @@ |
| 106 |
use "$1" && echo "-D$define" || echo "-U$define" |
| 107 |
} |
| 108 |
|
| 109 |
- unifdef $(use_define hal) \ |
| 110 |
- $(use_define avahi) \ |
| 111 |
+ unifdef $(use_define avahi) \ |
| 112 |
$(use_define alsa) \ |
| 113 |
$(use_define bluetooth) \ |
| 114 |
$(use_define udev) \ |
| 115 |
@@ -171,10 +159,6 @@ |
| 116 |
|
| 117 |
use avahi && sed -i -e '/module-zeroconf-publish/s:^#::' "${ED}/etc/pulse/default.pa" |
| 118 |
|
| 119 |
- if use hal && ! use udev; then |
| 120 |
- sed -i -e 's:-udev:-hal:' "${ED}/etc/pulse/default.pa" || die |
| 121 |
- fi |
| 122 |
- |
| 123 |
dodoc README ChangeLog todo || die |
| 124 |
|
| 125 |
if use doc; then |
Archives