1 |
ford_prefect 11/09/28 14:31:56 |
2 |
|
3 |
Modified: pulseaudio-9999.ebuild ChangeLog |
4 |
Added: pulseaudio-1.0-r1.ebuild |
5 |
Removed: pulseaudio-1.0.ebuild |
6 |
Log: |
7 |
Make sure the esound module doesn't break things and some log fixes. |
8 |
|
9 |
(Portage version: 2.2.0_alpha59/cvs/Linux x86_64) |
10 |
|
11 |
Revision Changes Path |
12 |
1.14 media-sound/pulseaudio/pulseaudio-9999.ebuild |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/pulseaudio/pulseaudio-9999.ebuild?rev=1.14&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/pulseaudio/pulseaudio-9999.ebuild?rev=1.14&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/pulseaudio/pulseaudio-9999.ebuild?r1=1.13&r2=1.14 |
17 |
|
18 |
Index: pulseaudio-9999.ebuild |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-9999.ebuild,v |
21 |
retrieving revision 1.13 |
22 |
retrieving revision 1.14 |
23 |
diff -u -r1.13 -r1.14 |
24 |
--- pulseaudio-9999.ebuild 27 Sep 2011 13:45:29 -0000 1.13 |
25 |
+++ pulseaudio-9999.ebuild 28 Sep 2011 14:31:56 -0000 1.14 |
26 |
@@ -1,6 +1,6 @@ |
27 |
# Copyright 1999-2011 Gentoo Foundation |
28 |
# Distributed under the terms of the GNU General Public License v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-9999.ebuild,v 1.13 2011/09/27 13:45:29 ford_prefect Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-9999.ebuild,v 1.14 2011/09/28 14:31:56 ford_prefect Exp $ |
31 |
|
32 |
EAPI=4 |
33 |
|
34 |
@@ -110,7 +110,6 @@ |
35 |
$(use_with caps) \ |
36 |
$(use_with equalizer fftw) \ |
37 |
--localstatedir="${EPREFIX}"/var \ |
38 |
- --disable-per-user-esound-socket \ |
39 |
--with-database=gdbm \ |
40 |
--with-udev-rules-dir="${EPREFIX}/lib/udev/rules.d" |
41 |
|
42 |
@@ -187,22 +186,13 @@ |
43 |
elog "gconf module on /etc/pulse/system.pa to be able to use PulseAudio" |
44 |
elog "with a system-wide instance." |
45 |
fi |
46 |
- elog |
47 |
- elog "To use the ESounD wrapper while using a system-wide daemon, you also" |
48 |
- elog "need to enable auth-anonymous for the esound-unix module, or to copy" |
49 |
- elog "/var/run/pulse/.esd_auth into each home directory." |
50 |
- elog |
51 |
fi |
52 |
if use bluetooth; then |
53 |
elog |
54 |
- elog "The BlueTooth proximity module is not enabled in the default" |
55 |
+ elog "The Bluetooth proximity module is not enabled in the default" |
56 |
elog "configuration file. If you do enable it, you'll have to have" |
57 |
- elog "your BlueTooth controller enabled and inserted at bootup or" |
58 |
+ elog "your Bluetooth controller enabled and inserted at bootup or" |
59 |
elog "PulseAudio will refuse to start." |
60 |
- elog |
61 |
- elog "Please note that the BlueTooth proximity module seems itself" |
62 |
- elog "still experimental, so please report to upstream if you have" |
63 |
- elog "problems with it." |
64 |
fi |
65 |
if use alsa; then |
66 |
local pkg="media-plugins/alsa-plugins" |
67 |
|
68 |
|
69 |
|
70 |
1.249 media-sound/pulseaudio/ChangeLog |
71 |
|
72 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/pulseaudio/ChangeLog?rev=1.249&view=markup |
73 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/pulseaudio/ChangeLog?rev=1.249&content-type=text/plain |
74 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/pulseaudio/ChangeLog?r1=1.248&r2=1.249 |
75 |
|
76 |
Index: ChangeLog |
77 |
=================================================================== |
78 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v |
79 |
retrieving revision 1.248 |
80 |
retrieving revision 1.249 |
81 |
diff -u -r1.248 -r1.249 |
82 |
--- ChangeLog 27 Sep 2011 13:45:29 -0000 1.248 |
83 |
+++ ChangeLog 28 Sep 2011 14:31:56 -0000 1.249 |
84 |
@@ -1,6 +1,12 @@ |
85 |
# ChangeLog for media-sound/pulseaudio |
86 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
87 |
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.248 2011/09/27 13:45:29 ford_prefect Exp $ |
88 |
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.249 2011/09/28 14:31:56 ford_prefect Exp $ |
89 |
+ |
90 |
+*pulseaudio-1.0-r1 (28 Sep 2011) |
91 |
+ |
92 |
+ 28 Sep 2011; Arun Raghavan <ford_prefect@g.o> -pulseaudio-1.0.ebuild, |
93 |
+ +pulseaudio-1.0-r1.ebuild, pulseaudio-9999.ebuild: |
94 |
+ Make sure the esound module doesn't break things and some log fixes. |
95 |
|
96 |
27 Sep 2011; Arun Raghavan <ford_prefect@g.o> pulseaudio-1.0.ebuild, |
97 |
pulseaudio-9999.ebuild: |
98 |
|
99 |
|
100 |
|
101 |
1.1 media-sound/pulseaudio/pulseaudio-1.0-r1.ebuild |
102 |
|
103 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/pulseaudio/pulseaudio-1.0-r1.ebuild?rev=1.1&view=markup |
104 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/pulseaudio/pulseaudio-1.0-r1.ebuild?rev=1.1&content-type=text/plain |
105 |
|
106 |
Index: pulseaudio-1.0-r1.ebuild |
107 |
=================================================================== |
108 |
# Copyright 1999-2011 Gentoo Foundation |
109 |
# Distributed under the terms of the GNU General Public License v2 |
110 |
# $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 $ |
111 |
|
112 |
EAPI=4 |
113 |
|
114 |
inherit eutils libtool flag-o-matic versionator |
115 |
|
116 |
DESCRIPTION="A networked sound server with an advanced plugin system" |
117 |
HOMEPAGE="http://www.pulseaudio.org/" |
118 |
|
119 |
SRC_URI="http://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz" |
120 |
|
121 |
LICENSE="LGPL-2 GPL-2" |
122 |
SLOT="0" |
123 |
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" |
124 |
IUSE="+alsa avahi +caps equalizer jack lirc oss tcpd +X dbus libsamplerate gnome bluetooth +asyncns +glib test doc +udev ipv6 system-wide realtime +orc" |
125 |
|
126 |
RDEPEND="app-admin/eselect-esd |
127 |
X? ( |
128 |
>=x11-libs/libX11-1.4.0 |
129 |
>=x11-libs/libxcb-1.6 |
130 |
>=x11-libs/xcb-util-0.3.1 |
131 |
x11-libs/libSM |
132 |
x11-libs/libICE |
133 |
x11-libs/libXtst |
134 |
) |
135 |
caps? ( sys-libs/libcap ) |
136 |
libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) |
137 |
alsa? ( >=media-libs/alsa-lib-1.0.19 ) |
138 |
glib? ( >=dev-libs/glib-2.4.0 ) |
139 |
avahi? ( >=net-dns/avahi-0.6.12[dbus] ) |
140 |
jack? ( >=media-sound/jack-audio-connection-kit-0.117 ) |
141 |
tcpd? ( sys-apps/tcp-wrappers ) |
142 |
lirc? ( app-misc/lirc ) |
143 |
dbus? ( >=sys-apps/dbus-1.0.0 ) |
144 |
gnome? ( >=gnome-base/gconf-2.4.0 ) |
145 |
bluetooth? ( |
146 |
>=net-wireless/bluez-4 |
147 |
>=sys-apps/dbus-1.0.0 |
148 |
) |
149 |
asyncns? ( net-libs/libasyncns ) |
150 |
udev? ( || ( >=sys-fs/udev-171[hwdb] >=sys-fs/udev-143[extras] ) ) |
151 |
realtime? ( sys-auth/rtkit ) |
152 |
equalizer? ( sci-libs/fftw:3.0 ) |
153 |
orc? ( >=dev-lang/orc-0.4.9 ) |
154 |
>=media-libs/audiofile-0.2.6-r1 |
155 |
>=media-libs/speex-1.2_rc1 |
156 |
>=media-libs/libsndfile-1.0.20 |
157 |
sys-libs/gdbm |
158 |
dev-libs/json-c |
159 |
>=sys-devel/libtool-2.2.4" # it's a valid RDEPEND, libltdl.so is used |
160 |
|
161 |
DEPEND="${RDEPEND} |
162 |
doc? ( app-doc/doxygen ) |
163 |
X? ( |
164 |
x11-proto/xproto |
165 |
>=x11-libs/libXtst-1.0.99.2 |
166 |
) |
167 |
dev-libs/libatomic_ops |
168 |
dev-util/pkgconfig |
169 |
system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) ) |
170 |
dev-util/intltool" |
171 |
|
172 |
# alsa-utils dep is for the alsasound init.d script (see bug #155707) |
173 |
# bluez dep is for the bluetooth init.d script |
174 |
RDEPEND="${RDEPEND} |
175 |
X? ( gnome-extra/gnome-audio ) |
176 |
system-wide? ( |
177 |
sys-apps/openrc |
178 |
alsa? ( media-sound/alsa-utils ) |
179 |
bluetooth? ( >=net-wireless/bluez-4 ) |
180 |
)" |
181 |
|
182 |
pkg_setup() { |
183 |
enewgroup audio 18 # Just make sure it exists |
184 |
enewgroup pulse-access |
185 |
enewgroup pulse |
186 |
enewuser pulse -1 -1 /var/run/pulse pulse,audio |
187 |
} |
188 |
|
189 |
src_configure() { |
190 |
# It's a binutils bug, once I can find time to fix that I'll add a |
191 |
# proper dependency and fix this up. — flameeyes |
192 |
append-ldflags $(no-as-needed) |
193 |
|
194 |
econf \ |
195 |
--enable-largefile \ |
196 |
$(use_enable glib glib2) \ |
197 |
--disable-solaris \ |
198 |
$(use_enable asyncns) \ |
199 |
$(use_enable oss oss-output) \ |
200 |
$(use_enable alsa) \ |
201 |
$(use_enable lirc) \ |
202 |
$(use_enable tcpd tcpwrap) \ |
203 |
$(use_enable jack) \ |
204 |
$(use_enable lirc) \ |
205 |
$(use_enable avahi) \ |
206 |
--disable-hal \ |
207 |
$(use_enable dbus) \ |
208 |
$(use_enable gnome gconf) \ |
209 |
$(use_enable libsamplerate samplerate) \ |
210 |
$(use_enable bluetooth bluez) \ |
211 |
$(use_enable X x11) \ |
212 |
$(use_enable test default-build-tests) \ |
213 |
$(use_enable udev) \ |
214 |
$(use_enable ipv6) \ |
215 |
$(use_with caps) \ |
216 |
$(use_with equalizer fftw) \ |
217 |
--localstatedir="${EPREFIX}"/var \ |
218 |
--with-database=gdbm \ |
219 |
--with-udev-rules-dir="${EPREFIX}/lib/udev/rules.d" |
220 |
|
221 |
if use doc; then |
222 |
pushd doxygen |
223 |
doxygen doxygen.conf |
224 |
popd |
225 |
fi |
226 |
} |
227 |
|
228 |
src_test() { |
229 |
# We avoid running the toplevel check target because that will run |
230 |
# po/'s tests too, and they are broken. Officially, it should work |
231 |
# with intltool 0.41, but that doesn't look like a stable release. |
232 |
emake -C src check |
233 |
} |
234 |
|
235 |
src_install() { |
236 |
emake -j1 DESTDIR="${D}" install |
237 |
|
238 |
# Drop the script entirely if X is disabled |
239 |
use X || rm "${ED}"/usr/bin/start-pulseaudio-x11 |
240 |
|
241 |
if use system-wide; then |
242 |
newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio |
243 |
|
244 |
use_define() { |
245 |
local define=${2:-$(echo $1 | tr '[:lower:]' '[:upper:]')} |
246 |
|
247 |
use "$1" && echo "-D$define" || echo "-U$define" |
248 |
} |
249 |
|
250 |
unifdef $(use_define avahi) \ |
251 |
$(use_define alsa) \ |
252 |
$(use_define bluetooth) \ |
253 |
$(use_define udev) \ |
254 |
"${FILESDIR}/pulseaudio.init.d-5" \ |
255 |
> "${T}/pulseaudio" |
256 |
|
257 |
doinitd "${T}/pulseaudio" |
258 |
fi |
259 |
|
260 |
use avahi && sed -i -e '/module-zeroconf-publish/s:^#::' "${ED}/etc/pulse/default.pa" |
261 |
|
262 |
dodoc README todo |
263 |
|
264 |
if use doc; then |
265 |
pushd doxygen/html |
266 |
dohtml * |
267 |
popd |
268 |
fi |
269 |
|
270 |
# Create the state directory |
271 |
use prefix || diropts -o pulse -g pulse -m0755 |
272 |
keepdir /var/run/pulse |
273 |
|
274 |
find "${D}" -name '*.la' -delete |
275 |
} |
276 |
|
277 |
pkg_postinst() { |
278 |
if use system-wide; then |
279 |
elog "PulseAudio in Gentoo can use a system-wide pulseaudio daemon." |
280 |
elog "This support is enabled by starting the pulseaudio init.d ." |
281 |
elog "To be able to access that you need to be in the group pulse-access." |
282 |
elog "If you choose to use this feature, please make sure that you" |
283 |
elog "really want to run PulseAudio this way:" |
284 |
elog " http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode" |
285 |
elog "For more information about system-wide support, please refer to:" |
286 |
elog " http://pulseaudio.org/wiki/SystemWideInstance" |
287 |
if use gnome ; then |
288 |
elog |
289 |
elog "By enabling gnome USE flag, you enabled gconf support. Please note" |
290 |
elog "that you might need to remove the gnome USE flag or disable the" |
291 |
elog "gconf module on /etc/pulse/system.pa to be able to use PulseAudio" |
292 |
elog "with a system-wide instance." |
293 |
fi |
294 |
fi |
295 |
if use bluetooth; then |
296 |
elog |
297 |
elog "The Bluetooth proximity module is not enabled in the default" |
298 |
elog "configuration file. If you do enable it, you'll have to have" |
299 |
elog "your Bluetooth controller enabled and inserted at bootup or" |
300 |
elog "PulseAudio will refuse to start." |
301 |
fi |
302 |
if use alsa; then |
303 |
local pkg="media-plugins/alsa-plugins" |
304 |
if has_version ${pkg} && ! has_version "${pkg}[pulseaudio]"; then |
305 |
elog |
306 |
elog "You have alsa support enabled so you probably want to install" |
307 |
elog "${pkg} with pulseaudio support to have" |
308 |
elog "alsa using applications route their sound through pulseaudio" |
309 |
fi |
310 |
fi |
311 |
|
312 |
eselect esd update --if-unset |
313 |
} |