Author: patrys Date: Sun May 24 16:10:15 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- 0.9.15
- merged from DEVEL
---- Files affected:
packages/pulseaudio:
pulseaudio-path.patch (1.2 -> 1.3) , pulseaudio.spec (1.58 -> 1.59)
---- Diffs:
================================================================
Index: packages/pulseaudio/pulseaudio-path.patch
diff -u packages/pulseaudio/pulseaudio-path.patch:1.2
packages/pulseaudio/pulseaudio-path.patch:1.3
--- packages/pulseaudio/pulseaudio-path.patch:1.2 Mon Sep 15 22:48:13 2008
+++ packages/pulseaudio/pulseaudio-path.patch Sun May 24 18:10:10 2009
@@ -4,10 +4,10 @@
AC_ARG_WITH(
[module-dir],
-- AS_HELP_STRING([--with-module-dir],[Directory where to install the
modules to (defaults to ${libdir}/pulse-${PA_MAJORMINOR}/modules/]),
-- [modlibexecdir=$withval],
[modlibexecdir="${libdir}/pulse-${PA_MAJORMINOR}/modules/"])
-+ AS_HELP_STRING([--with-module-dir],[Directory where to install the
modules to (defaults to ${libdir}/pulse-${PA_MAJORMINOR}/modules]),
-+ [modlibexecdir=$withval],
[modlibexecdir="${libdir}/pulse-${PA_MAJORMINOR}/modules"])
+- AS_HELP_STRING([--with-module-dir],[Directory where to install the
modules to (defaults to ${libdir}/pulse-${PA_MAJORMINORMICRO}/modules/]),
+- [modlibexecdir=$withval],
[modlibexecdir="${libdir}/pulse-${PA_MAJORMINORMICRO}/modules/"])
++ AS_HELP_STRING([--with-module-dir],[Directory where to install the
modules to (defaults to ${libdir}/pulse-${PA_MAJORMINORMICRO}/modules]),
++ [modlibexecdir=$withval],
[modlibexecdir="${libdir}/pulse-${PA_MAJORMINORMICRO}/modules"])
AC_SUBST(modlibexecdir)
================================================================
Index: packages/pulseaudio/pulseaudio.spec
diff -u packages/pulseaudio/pulseaudio.spec:1.58
packages/pulseaudio/pulseaudio.spec:1.59
--- packages/pulseaudio/pulseaudio.spec:1.58 Sat Apr 11 22:49:08 2009
+++ packages/pulseaudio/pulseaudio.spec Sun May 24 18:10:10 2009
@@ -4,21 +4,21 @@
#
# Conditional build:
%bcond_without lirc # without lirc module
-%bcond_without static_libs # don't build static libraries
+%bcond_with static_libs # build static libraries
#
+%define filterout_ld -Wl,--as-needed
Summary: Modular sound server
Summary(pl.UTF-8): Modularny serwer dźwięku
Name: pulseaudio
-Version: 0.9.14
+Version: 0.9.15
Release: 1
License: GPL v2+ (server and libpulsecore), LGPL v2+ (libpulse)
Group: Libraries
Source0:
http://0pointer.de/lennart/projects/pulseaudio/%{name}-%{version}.tar.gz
-# Source0-md5: 0ed1115222d1d8c64cc14961cccb2eb0
+# Source0-md5: 4510364eeab219fd100bd1b373b1a002
Source1: %{name}.init
Source2: %{name}.sysconfig
Patch0: %{name}-suid.patch
-Patch1: %{name}-link.patch
Patch2: %{name}-path.patch
URL: http://pulseaudio.org/
BuildRequires: GConf2-devel >= 2.4.0
@@ -49,6 +49,7 @@
BuildRequires: speex-devel >= 1:1.2-beta3
BuildRequires: xorg-lib-libSM-devel
BuildRequires: xorg-lib-libX11-devel
+BuildRequires: xorg-lib-libXtst-devel
Requires(post,preun): /sbin/chkconfig
Requires(postun): /usr/sbin/groupdel
Requires(postun): /usr/sbin/userdel
@@ -187,8 +188,7 @@
Group: Libraries
Requires: %{name} = %{version}-%{release}
Requires: GConf2 >= 2.4.0
-Suggests: padevchooser
-Suggests: pavucontrol
+Suggests: gnome-media-volume-control
%description gconf
GConf adapter for PulseAudio.
@@ -244,7 +244,6 @@
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%patch2 -p1
%build
@@ -260,7 +259,7 @@
--with-realtime-group=pulse-rt \
--with-access-group=pulse-access \
%{!?with_lirc:--disable-lirc} \
- %{!?with_static_libs:--disable-static}
+ --%{?with_static_libs:en}%{!?with_static_libs:dis}able-static
%{__make}
%install
@@ -352,39 +351,25 @@
%dir %{_libdir}/pulse
%dir %{_libdir}/pulse-*
%dir %{_libdir}/pulse-*/modules
-%attr(755,root,root) %{_libdir}/pulse-*/modules/libauth-cookie.so
-%attr(755,root,root) %{_libdir}/pulse-*/modules/libauthkey.so
%attr(755,root,root) %{_libdir}/pulse-*/modules/libavahi-wrap.so
%attr(755,root,root) %{_libdir}/pulse-*/modules/libcli.so
-%attr(755,root,root) %{_libdir}/pulse-*/modules/libdbus-util.so
-%attr(755,root,root) %{_libdir}/pulse-*/modules/libiochannel.so
-%attr(755,root,root) %{_libdir}/pulse-*/modules/libioline.so
-%attr(755,root,root) %{_libdir}/pulse-*/modules/libipacl.so
%attr(755,root,root) %{_libdir}/pulse-*/modules/liboss-util.so
-%attr(755,root,root) %{_libdir}/pulse-*/modules/libpacket.so
-%attr(755,root,root) %{_libdir}/pulse-*/modules/libparseaddr.so
-%attr(755,root,root) %{_libdir}/pulse-*/modules/libpdispatch.so
%attr(755,root,root) %{_libdir}/pulse-*/modules/libprotocol-cli.so
%attr(755,root,root) %{_libdir}/pulse-*/modules/libprotocol-esound.so
%attr(755,root,root) %{_libdir}/pulse-*/modules/libprotocol-http.so
%attr(755,root,root) %{_libdir}/pulse-*/modules/libprotocol-native.so
%attr(755,root,root) %{_libdir}/pulse-*/modules/libprotocol-simple.so
-%attr(755,root,root) %{_libdir}/pulse-*/modules/libpstream.so
-%attr(755,root,root) %{_libdir}/pulse-*/modules/libpstream-util.so
+%attr(755,root,root) %{_libdir}/pulse-*/modules/libraop.so
%attr(755,root,root) %{_libdir}/pulse-*/modules/librtp.so
-%attr(755,root,root) %{_libdir}/pulse-*/modules/libsocket-client.so
-%attr(755,root,root) %{_libdir}/pulse-*/modules/libsocket-server.so
-%attr(755,root,root) %{_libdir}/pulse-*/modules/libsocket-util.so
-%attr(755,root,root) %{_libdir}/pulse-*/modules/libstrlist.so
-%attr(755,root,root) %{_libdir}/pulse-*/modules/libtagstruct.so
-%attr(755,root,root) %{_libdir}/pulse-*/modules/libx11prop.so
-%attr(755,root,root) %{_libdir}/pulse-*/modules/libx11wrap.so
%attr(755,root,root) %{_libdir}/pulse-*/modules/module-always-sink.so
+%attr(755,root,root) %{_libdir}/pulse-*/modules/module-augment-properties.so
+%attr(755,root,root) %{_libdir}/pulse-*/modules/module-card-restore.so
%attr(755,root,root) %{_libdir}/pulse-*/modules/module-cli.so
%attr(755,root,root) %{_libdir}/pulse-*/modules/module-cli-protocol-tcp.so
%attr(755,root,root) %{_libdir}/pulse-*/modules/module-cli-protocol-unix.so
%attr(755,root,root) %{_libdir}/pulse-*/modules/module-console-kit.so
%attr(755,root,root) %{_libdir}/pulse-*/modules/module-combine.so
+%attr(755,root,root) %{_libdir}/pulse-*/modules/module-cork-music-on-phone.so
%attr(755,root,root)
%{_libdir}/pulse-*/modules/module-default-device-restore.so
%attr(755,root,root) %{_libdir}/pulse-*/modules/module-detect.so
%attr(755,root,root) %{_libdir}/pulse-*/modules/module-device-restore.so
@@ -408,17 +393,21 @@
%attr(755,root,root) %{_libdir}/pulse-*/modules/module-position-event-sounds.so
%attr(755,root,root) %{_libdir}/pulse-*/modules/module-remap-sink.so
%attr(755,root,root) %{_libdir}/pulse-*/modules/module-rescue-streams.so
+%attr(755,root,root) %{_libdir}/pulse-*/modules/module-raop-discover.so
+%attr(755,root,root) %{_libdir}/pulse-*/modules/module-raop-sink.so
%attr(755,root,root) %{_libdir}/pulse-*/modules/module-rtp-recv.so
%attr(755,root,root) %{_libdir}/pulse-*/modules/module-rtp-send.so
%attr(755,root,root) %{_libdir}/pulse-*/modules/module-simple-protocol-tcp.so
%attr(755,root,root) %{_libdir}/pulse-*/modules/module-simple-protocol-unix.so
%attr(755,root,root) %{_libdir}/pulse-*/modules/module-sine.so
+%attr(755,root,root) %{_libdir}/pulse-*/modules/module-sine-source.so
%attr(755,root,root) %{_libdir}/pulse-*/modules/module-stream-restore.so
%attr(755,root,root) %{_libdir}/pulse-*/modules/module-suspend-on-idle.so
%attr(755,root,root) %{_libdir}/pulse-*/modules/module-tunnel-sink.so
%attr(755,root,root) %{_libdir}/pulse-*/modules/module-tunnel-source.so
%attr(755,root,root) %{_libdir}/pulse-*/modules/module-volume-restore.so
%attr(755,root,root) %{_libdir}/pulse-*/modules/module-x11-bell.so
+%attr(755,root,root) %{_libdir}/pulse-*/modules/module-x11-cork-request.so
%attr(755,root,root) %{_libdir}/pulse-*/modules/module-x11-publish.so
%attr(755,root,root) %{_libdir}/pulse-*/modules/module-x11-xsmp.so
%attr(755,root,root) %{_libdir}/pulse-*/modules/module-zeroconf-discover.so
@@ -443,12 +432,12 @@
%attr(755,root,root) %{_libdir}/libpulse-browse.so.*.*.*
%attr(755,root,root) %{_libdir}/libpulse-mainloop-glib.so.*.*.*
%attr(755,root,root) %{_libdir}/libpulse-simple.so.*.*.*
-%attr(755,root,root) %{_libdir}/libpulsecore.so.*.*.*
+%attr(755,root,root) %{_libdir}/libpulsecommon-%{version}.so
+%attr(755,root,root) %{_libdir}/libpulsecore-%{version}.so
%attr(755,root,root) %ghost %{_libdir}/libpulse.so.0
%attr(755,root,root) %ghost %{_libdir}/libpulse-browse.so.0
%attr(755,root,root) %ghost %{_libdir}/libpulse-mainloop-glib.so.0
%attr(755,root,root) %ghost %{_libdir}/libpulse-simple.so.0
-%attr(755,root,root) %ghost %{_libdir}/libpulsecore.so.9
%attr(755,root,root) %{_libdir}/libpulsedsp.so
%dir %{_sysconfdir}/pulse
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pulse/client.conf
@@ -459,12 +448,12 @@
%attr(755,root,root) %{_libdir}/libpulse-browse.so
%attr(755,root,root) %{_libdir}/libpulse-mainloop-glib.so
%attr(755,root,root) %{_libdir}/libpulse-simple.so
-%attr(755,root,root) %{_libdir}/libpulsecore.so
%{_libdir}/libpulse.la
%{_libdir}/libpulse-browse.la
%{_libdir}/libpulse-mainloop-glib.la
%{_libdir}/libpulse-simple.la
-%{_libdir}/libpulsecore.la
+%{_libdir}/libpulsecommon-%{version}.la
+%{_libdir}/libpulsecore-%{version}.la
%{_includedir}/pulse
%{_pkgconfigdir}/libpulse.pc
%{_pkgconfigdir}/libpulse-browse.pc
@@ -478,7 +467,8 @@
%{_libdir}/libpulse-browse.a
%{_libdir}/libpulse-mainloop-glib.a
%{_libdir}/libpulse-simple.a
-%{_libdir}/libpulsecore.a
+%{_libdir}/libpulsecommon-%{version}.a
+%{_libdir}/libpulsecore-%{version}.a
%endif
%files esound-compat
@@ -490,6 +480,7 @@
%files alsa
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/pulse-*/modules/libalsa-util.so
+%attr(755,root,root) %{_libdir}/pulse-*/modules/module-alsa-card.so
%attr(755,root,root) %{_libdir}/pulse-*/modules/module-alsa-sink.so
%attr(755,root,root) %{_libdir}/pulse-*/modules/module-alsa-source.so
@@ -498,6 +489,7 @@
%attr(4755,root,root) %{_libdir}/pulse/proximity-helper
%attr(755,root,root) %{_libdir}/pulse-*/modules/libbluetooth-ipc.so
%attr(755,root,root) %{_libdir}/pulse-*/modules/libbluetooth-sbc.so
+%attr(755,root,root) %{_libdir}/pulse-*/modules/libbluetooth-util.so
%attr(755,root,root) %{_libdir}/pulse-*/modules/module-bluetooth-device.so
%attr(755,root,root) %{_libdir}/pulse-*/modules/module-bluetooth-discover.so
%attr(755,root,root) %{_libdir}/pulse-*/modules/module-bluetooth-proximity.so
@@ -528,8 +520,17 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.59 2009/05/24 16:10:10 patrys
+- 0.9.15
+- merged from DEVEL
+
Revision 1.58 2009/04/11 20:49:08 wolvverine
- add S:padevchooser,pavucontrol for Gnome
+
+Revision 1.57.2.1 2009/04/07 10:03:35 patrys
+- 0.9.15-test7
+- don't use --as-needed as pulse has circular deps to maintain both a stable
and an unstable API
+- don't build static by default
Revision 1.57 2009/01/21 19:59:11 arekm
- up to 0.9.14
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pulseaudio/pulseaudio-path.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pulseaudio/pulseaudio.spec?r1=1.58&r2=1.59&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
