Hello community, here is the log from the commit of package pulseaudio for openSUSE:Factory checked in at 2012-06-25 14:23:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pulseaudio (Old) and /work/SRC/openSUSE:Factory/.pulseaudio.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pulseaudio", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/pulseaudio/pulseaudio.changes 2012-03-12 08:54:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pulseaudio.new/pulseaudio.changes 2012-06-25 14:43:21.000000000 +0200 @@ -1,0 +2,45 @@ +Mon Jun 18 15:50:43 CEST 2012 - [email protected] + +- Add kmix setup to setup-pulseaudio script + +------------------------------------------------------------------- +Wed Jun 6 14:16:34 CEST 2012 - [email protected] + +- Add the proper exit codes to setup-pulseaudio script + (for avoiding the errors during installation, too) + +------------------------------------------------------------------- +Mon Jun 4 08:37:07 UTC 2012 - [email protected] + +- Remove rpmlintrc, we can't use setBadness for Factory + +------------------------------------------------------------------- +Wed May 30 09:49:36 CEST 2012 - [email protected] + +- Kill leftover PA processes when disabled via setup-pulseaudio +- Set up gstreamer audiosink/src in setup-pulseaudio script, too + +------------------------------------------------------------------- +Tue May 29 13:01:46 CEST 2012 - [email protected] + +- Add the setup for SoX to setup-pulseaudio script + +------------------------------------------------------------------- +Sat May 19 20:45:28 UTC 2012 - [email protected] + +- update to 2.0: + + Alternate sample rates. + + Jack detection. + + Echo cancellation: WebRTC canceller, automatic gain control, + drift compensation. + + Virtual Surround module. + + Xen Paravirtualised audio sink. + + Fixed HURD support. + + A2DP decoder quality improvements. +- Add new BuildRequires: libwebrtc_audio_processing-devel, + BuildRequires: gcc-c++ and if SuSE-Release >= 12.1 + BuildRequires: systemd-devel +- Drop pulseaudio-remove_broken_assert.patch, fixed upstream. +- Futureproof spec for soname changes. + +------------------------------------------------------------------- Old: ---- pulseaudio-1.1.tar.xz pulseaudio-remove_broken_assert.patch New: ---- pulseaudio-2.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pulseaudio.spec ++++++ --- /var/tmp/diff_new_pack.ihBi1W/_old 2012-06-25 14:43:24.000000000 +0200 +++ /var/tmp/diff_new_pack.ihBi1W/_new 2012-06-25 14:43:24.000000000 +0200 @@ -16,11 +16,11 @@ # - Name: pulseaudio -Version: 1.1 +Version: 2.0 Release: 0 -%define drvver 1.1 +%define drvver 2.0 +%define soname 0 Summary: A Networked Sound Server License: GPL-2.0+ ; LGPL-2.1+ Group: System/Sound Daemons @@ -33,12 +33,14 @@ Patch0: disabled-start.diff Patch1: suppress-socket-error-msg.diff Patch2: pulseaudio-wrong-memset.patch -# PATCH-FIX-UPSTREAM pulseaudio-remove_broken_assert.patch fdo#47156 [email protected] -- Fix crash -Patch3: pulseaudio-remove_broken_assert.patch +%if 0%{?suse_version} >= 1210 +BuildRequires: systemd-devel +%endif BuildRequires: alsa-devel BuildRequires: bluez-devel BuildRequires: doxygen BuildRequires: fdupes +BuildRequires: gcc-c++ BuildRequires: gdbm-devel BuildRequires: intltool BuildRequires: jack-devel @@ -47,18 +49,19 @@ BuildRequires: libsamplerate-devel BuildRequires: libsndfile-devel #our libtdb-devel does not have a .pc file +BuildRequires: fftw3-devel +BuildRequires: libcap-devel BuildRequires: libtdb-devel BuildRequires: libtool BuildRequires: libudev-devel >= 143 +BuildRequires: libwebrtc_audio_processing-devel BuildRequires: lirc-devel +BuildRequires: orc BuildRequires: speex-devel BuildRequires: tcpd-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files BuildRequires: xorg-x11-devel -BuildRequires: libcap-devel -BuildRequires: fftw3-devel -BuildRequires: orc # Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 BuildRequires: xz BuildRequires: pkgconfig(gconf-2.0) @@ -173,13 +176,13 @@ This package provides gconf storage of PulseAudio sound server settings. -%package -n libpulse0 +%package -n libpulse%{soname} Summary: Client interface to PulseAudio Group: System/Libraries Provides: pulseaudio-libs = %{version} Obsoletes: pulseaudio-libs < %{version} -%description -n libpulse0 +%description -n libpulse%{soname} pulseaudio is a networked sound server for Linux and other Unix like operating systems and Microsoft Windows. It is intended to be an improved drop-in replacement for the Enlightened Sound Daemon (ESOUND). @@ -187,13 +190,13 @@ This package contains the system libraries for clients of pulseaudio sound server. -%package -n libpulse-mainloop-glib0 +%package -n libpulse-mainloop-glib%{soname} Summary: GLIB 2.0 Main Loop wrapper for PulseAudio Group: System/Sound Daemons Provides: pulseaudio-libs-glib2 = %{version} Obsoletes: pulseaudio-libs-glib2 < %{version} -%description -n libpulse-mainloop-glib0 +%description -n libpulse-mainloop-glib%{soname} pulseaudio is a networked sound server for Linux and other Unix like operating systems and Microsoft Windows. It is intended to be an improved drop-in replacement for the Enlightened Sound Daemon (ESOUND). @@ -204,8 +207,8 @@ %package -n libpulse-devel Summary: Development package for the pulseaudio library Group: Development/Libraries/C and C++ -Requires: libpulse-mainloop-glib0 = %{version} -Requires: libpulse0 = %{version} +Requires: libpulse%{soname} = %{version} +Requires: libpulse-mainloop-glib%{soname} = %{version} Requires: pkgconfig Requires: pkgconfig(glib-2.0) Provides: pulseaudio-devel = %{version} @@ -223,8 +226,8 @@ Summary: PulseAudio utilities Group: System/Sound Daemons Requires: %{name} = %{version} -Requires: libpulse-mainloop-glib0 = %{version} -Requires: libpulse0 = %{version} +Requires: libpulse%{soname} = %{version} +Requires: libpulse-mainloop-glib%{soname} = %{version} %description utils pulseaudio is a networked sound server for Linux and other Unix like @@ -257,8 +260,7 @@ translation-update-upstream %patch0 %patch1 -p1 -%patch2 -p1 -%patch3 +%patch2 %build autoreconf @@ -277,9 +279,14 @@ %install %make_install -rm -rf %{buildroot}%{_libdir}/*.la %{buildroot}%{_libdir}/pulse-%{drvver}/modules/*.la +rm -rf \ + "%{buildroot}%{_libdir}"/*.la \ + "%{buildroot}%{_libdir}/pulse-%{drvver}/modules"/*.la \ + "%{buildroot}%{_libdir}/pulseaudio"/*.la + # configure --disable-static had no effect; delete manually. -rm -rf %{buildroot}%{_libdir}/*.a +rm -rf "%{buildroot}%{_libdir}"/*.a + # openSUSE 11.3 cannot find the .desktop files %suse_update_desktop_file pulseaudio %suse_update_desktop_file pulseaudio-kde @@ -297,7 +304,7 @@ %fdupes -s doxygen/html %clean -rm -rf %{buildroot} +%{?buildroot:%__rm -rf '%{buildroot}'} %pre groupadd -r pulse &>/dev/null || : @@ -305,13 +312,13 @@ -s /sbin/nologin -d /var/lib/pulseaudio -g pulse -G audio pulse &>/dev/null || : groupadd -r pulse-access &>/dev/null || : -%post -n libpulse0 -p /sbin/ldconfig +%post -n libpulse%{soname} -p /sbin/ldconfig -%postun -n libpulse0 -p /sbin/ldconfig +%postun -n libpulse%{soname} -p /sbin/ldconfig -%post -n libpulse-mainloop-glib0 -p /sbin/ldconfig +%post -n libpulse-mainloop-glib%{soname} -p /sbin/ldconfig -%postun -n libpulse-mainloop-glib0 -p /sbin/ldconfig +%postun -n libpulse-mainloop-glib%{soname} -p /sbin/ldconfig %post /sbin/ldconfig @@ -331,7 +338,8 @@ %{_datadir}/pulseaudio/alsa-mixer %{_localstatedir}/adm/fillup-templates/sysconfig.sound-pulseaudio %{_libdir}/libpulsecore-%{drvver}.so -%{_libdir}/libpulsedsp.so +%dir %{_libdir}/pulseaudio +%{_libdir}/pulseaudio/libpulsedsp.so %dir %{_libdir}/pulse-%{drvver}/ %dir %{_libdir}/pulse-%{drvver}/modules/ %{_libdir}/pulse-%{drvver}/modules/libalsa-util.so @@ -355,7 +363,6 @@ %{_libdir}/pulse-%{drvver}/modules/module-combine.so %{_libdir}/pulse-%{drvver}/modules/module-combine-sink.so %{_libdir}/pulse-%{drvver}/modules/module-console-kit.so -%{_libdir}/pulse-%{drvver}/modules/module-cork-music-on-phone.so %{_libdir}/pulse-%{drvver}/modules/module-dbus-protocol.so %{_libdir}/pulse-%{drvver}/modules/module-default-device-restore.so %{_libdir}/pulse-%{drvver}/modules/module-detect.so @@ -389,6 +396,7 @@ %{_libdir}/pulse-%{drvver}/modules/module-position-event-sounds.so %{_libdir}/pulse-%{drvver}/modules/module-remap-sink.so %{_libdir}/pulse-%{drvver}/modules/module-rescue-streams.so +%{_libdir}/pulse-%{drvver}/modules/module-role-cork.so %{_libdir}/pulse-%{drvver}/modules/module-rtp-recv.so %{_libdir}/pulse-%{drvver}/modules/module-rtp-send.so %{_libdir}/pulse-%{drvver}/modules/module-rygel-media-server.so @@ -399,17 +407,23 @@ %{_libdir}/pulse-%{drvver}/modules/module-stream-restore.so %{_libdir}/pulse-%{drvver}/modules/module-suspend-on-idle.so %{_libdir}/pulse-%{drvver}/modules/module-switch-on-connect.so +%{_libdir}/pulse-%{drvver}/modules/module-switch-on-port-available.so +%if 0%{?suse_version} >= 1210 +%{_libdir}/pulse-%{drvver}/modules/module-systemd-login.so +%endif %{_libdir}/pulse-%{drvver}/modules/module-tunnel-sink.so %{_libdir}/pulse-%{drvver}/modules/module-tunnel-source.so %{_libdir}/pulse-%{drvver}/modules/module-udev-detect.so %{_libdir}/pulse-%{drvver}/modules/module-virtual-sink.so %{_libdir}/pulse-%{drvver}/modules/module-virtual-source.so +%{_libdir}/pulse-%{drvver}/modules/module-virtual-surround-sink.so %{_libdir}/pulse-%{drvver}/modules/module-volume-restore.so /lib/udev/rules.d/90-pulseaudio.rules -%{_mandir}/man1/pulseaudio.1.gz -%{_mandir}/man5/default.pa.5.gz -%{_mandir}/man5/pulse-client.conf.5.gz -%{_mandir}/man5/pulse-daemon.conf.5.gz +%doc %{_mandir}/man1/pulseaudio.1* +%doc %{_mandir}/man5/default.pa.5* +%doc %{_mandir}/man5/pulse-client.conf.5* +%doc %{_mandir}/man5/pulse-daemon.conf.5* +%doc %{_mandir}/man5/pulse-cli-syntax.5* %dir %{_sysconfdir}/pulse/ %config(noreplace) %{_sysconfdir}/pulse/daemon.conf %config(noreplace) %{_sysconfdir}/pulse/default.pa @@ -423,7 +437,7 @@ %defattr(-,root,root) %{_bindir}/esdcompat %{_bindir}/esd -%{_mandir}/man1/esdcompat.1.gz +%doc %{_mandir}/man1/esdcompat.1* %files gdm-hooks %defattr(-,root,root) @@ -431,14 +445,16 @@ %attr(0700, gdm, gdm) %dir %{_localstatedir}/lib/gdm/.pulse %attr(0600, gdm, gdm) %{_localstatedir}/lib/gdm/.pulse/default.pa -%files -n libpulse0 +%files -n libpulse%{soname} %defattr(-,root,root) %doc README LICENSE GPL LGPL %dir %{_sysconfdir}/pulse/ %config(noreplace) %{_sysconfdir}/pulse/client.conf -%{_libdir}/libpulse.so.* -%{_libdir}/libpulsecommon-%{drvver}.so +%{_libdir}/libpulse.so.%{soname} +%{_libdir}/libpulse.so.%{soname}.* %{_libdir}/libpulse-simple.so.* +%dir %{_libdir}/pulseaudio +%{_libdir}/pulseaudio/libpulsecommon-%{drvver}.so %files -n libpulse-devel %defattr(-,root,root) @@ -453,9 +469,10 @@ %{_libdir}/cmake/PulseAudio/PulseAudio*.cmake %{_datadir}/vala -%files -n libpulse-mainloop-glib0 +%files -n libpulse-mainloop-glib%{soname} %defattr(-,root,root) -%{_libdir}/libpulse-mainloop-glib.so.* +%{_libdir}/libpulse-mainloop-glib.so.%{soname} +%{_libdir}/libpulse-mainloop-glib.so.%{soname}.* %files module-bluetooth %defattr(-,root,root) @@ -493,8 +510,8 @@ %{_libdir}/pulse-%{drvver}/modules/module-x11-cork-request.so %{_libdir}/pulse-%{drvver}/modules/module-x11-publish.so %{_libdir}/pulse-%{drvver}/modules/module-x11-xsmp.so -%{_mandir}/man1/start-pulseaudio-kde.1.gz -%{_mandir}/man1/start-pulseaudio-x11.1.gz +%doc %{_mandir}/man1/start-pulseaudio-kde.1* +%doc %{_mandir}/man1/start-pulseaudio-x11.1* %files module-zeroconf %defattr(-,root,root) @@ -517,13 +534,13 @@ %{_bindir}/pax11publish %{_bindir}/padsp %{_bindir}/pasuspender -%{_mandir}/man1/pacat.1.gz -%{_mandir}/man1/pacmd.1.gz -%{_mandir}/man1/pactl.1.gz -%{_mandir}/man1/paplay.1.gz -%{_mandir}/man1/pasuspender.1.gz -%{_mandir}/man1/padsp.1.gz -%{_mandir}/man1/pax11publish.1.gz +%doc %{_mandir}/man1/pacat.1* +%doc %{_mandir}/man1/pacmd.1* +%doc %{_mandir}/man1/pactl.1* +%doc %{_mandir}/man1/paplay.1* +%doc %{_mandir}/man1/pasuspender.1* +%doc %{_mandir}/man1/padsp.1* +%doc %{_mandir}/man1/pax11publish.1* %files lang -f %{name}.lang ++++++ pulseaudio-wrong-memset.patch ++++++ --- /var/tmp/diff_new_pack.ihBi1W/_old 2012-06-25 14:43:24.000000000 +0200 +++ /var/tmp/diff_new_pack.ihBi1W/_new 2012-06-25 14:43:24.000000000 +0200 @@ -1,21 +1,17 @@ -Index: pulseaudio-1.1/src/modules/rtp/rtp.c -=================================================================== ---- pulseaudio-1.1.orig/src/modules/rtp/rtp.c -+++ pulseaudio-1.1/src/modules/rtp/rtp.c -@@ -286,7 +286,7 @@ int pa_rtp_recv(pa_rtp_context *c, pa_me +--- src/modules/rtp/rtp.c.orig 2012-05-20 09:23:37.081609264 +0200 ++++ src/modules/rtp/rtp.c 2012-05-20 09:24:08.991608129 +0200 +@@ -286,7 +286,7 @@ if (!found_tstamp) { - pa_log_warn("Couldn't find SO_TIMESTAMP data in auxiliary recvmsg() data!"); + pa_log_warn("Couldn't find SCM_TIMESTAMP data in auxiliary recvmsg() data!"); - memset(tstamp, 0, sizeof(tstamp)); + memset(tstamp, 0, sizeof(struct timeval)); } return 0; -Index: pulseaudio-1.1/src/modules/echo-cancel/adrian-aec.c -=================================================================== ---- pulseaudio-1.1.orig/src/modules/echo-cancel/adrian-aec.c -+++ pulseaudio-1.1/src/modules/echo-cancel/adrian-aec.c -@@ -163,7 +163,7 @@ static void AEC_leaky(AEC *a) +--- src/modules/echo-cancel/adrian-aec.c.orig 2012-05-20 09:24:20.836607707 +0200 ++++ src/modules/echo-cancel/adrian-aec.c 2012-05-20 09:26:07.641603903 +0200 +@@ -163,7 +163,7 @@ } else if (1 == a->hangover) { --(a->hangover); // My Leaky NLMS is to erase vector w when hangover expires ++++++ setup-pulseaudio ++++++ --- /var/tmp/diff_new_pack.ihBi1W/_old 2012-06-25 14:43:24.000000000 +0200 +++ /var/tmp/diff_new_pack.ihBi1W/_new 2012-06-25 14:43:24.000000000 +0200 @@ -13,7 +13,7 @@ echo "" echo "You need to be root for this command to succeed" echo "You may need to re-login for changes to take effect" - exit + exit 1 } check_root() { @@ -57,11 +57,24 @@ fi } +setup_gconf_vendor() { + if [ -x /usr/bin/gconftool-2 ]; then + /usr/bin/gconftool-2 --direct --config-source \ + xml:readwrite:/etc/gconf/gconf.xml.vendor \ + "$@" + fi +} + enable_phonon() { echo "Enabling PulseAudio for Phonon..." delete_variable PHONON_PULSEAUDIO_DISABLE } +enable_kmix() { + echo "Enabling PulseAudio for Kmix..." + delete_variable KMIX_PULSEAUDIO_DISABLE +} + enable_alsa() { echo "Enabling PulseAudio for ALSA..." set_variable ALSA_CONFIG_PATH /etc/alsa-pulse.conf @@ -156,6 +169,24 @@ EOF } +enable_sox() { + echo "Enabling PulseAudio for SoX..." + set_variable AUDIODRIVER pulseaudio +} + +enable_gstreamer() { + # set autoaudiosink/src, which should pick up PA + echo "Setting auto sink/src for gstreamer" + setup_gconf_vendor -s -t str \ + /system/gstreamer/0.10/default/audiosink autoaudiosink + setup_gconf_vendor -s -t str \ + /system/gstreamer/0.10/default/musicaudiosink autoaudiosink + setup_gconf_vendor -s -t str \ + /system/gstreamer/0.10/default/chataudiosink autoaudiosink + setup_gconf_vendor -s -t str \ + /system/gstreamer/0.10/default/audiosrc autoaudiosrc +} + enable_autospawn() { echo "Enabling PulseAudio autospawn..." if grep -q ^autospawn /etc/pulse/client.conf; then @@ -175,6 +206,11 @@ set_variable PHONON_PULSEAUDIO_DISABLE 1 } +disable_kmix() { + echo "Disabling PulseAudio for Kmix..." + set_variable KMIX_PULSEAUDIO_DISABLE 1 +} + disable_libao() { if test -f /etc/libao.conf; then echo "Disabling PulseAudio for libao..." @@ -236,6 +272,23 @@ /usr/bin/sed --in-place /"(Parameter.set 'Audio_Required_Format 'snd)"/d /etc/festival.scm } +disable_sox() { + echo "Disabling PulseAudio for SoX..." + set_variable AUDIODRIVER alsa +} + +disable_gstreamer() { + echo "Setting alsasink/src for gstreamer" + setup_gconf_vendor -s -t str \ + /system/gstreamer/0.10/default/audiosink alsasink + setup_gconf_vendor -s -t str \ + /system/gstreamer/0.10/default/musicaudiosink alsasink + setup_gconf_vendor -s -t str \ + /system/gstreamer/0.10/default/chataudiosink alsasink + setup_gconf_vendor -s -t str \ + /system/gstreamer/0.10/default/audiosrc alsasrc +} + disable_autospawn() { echo "Disabling PulseAudio autospawn..." if grep -q ^autospawn /etc/pulse/client.conf; then @@ -243,6 +296,8 @@ else echo "autospawn = no" >> /etc/pulse/client.conf fi + # kill leftover PA processes + killall pulseaudio > /dev/null 2>&1 } enable_all() { @@ -255,9 +310,12 @@ enable_timidity enable_xine enable_festival - enable_autospawn enable_phonon + enable_kmix enable_speechd + enable_sox + enable_gstreamer + enable_autospawn } disable_all() { @@ -270,24 +328,27 @@ disable_timidity disable_xine disable_festival - disable_autospawn disable_phonon + disable_kmix disable_speechd + disable_sox + disable_gstreamer + disable_autospawn } case $1 in --enable) - check_root || exit + check_root || exit 1 ENABLE=1 enable_all ;; --disable) - check_root || exit + check_root || exit 1 ENABLE=0 disable_all ;; --auto) - check_root || exit + check_root || exit 1 if [ -f /etc/sysconfig/sound ]; then . /etc/sysconfig/sound fi @@ -298,7 +359,7 @@ else disable_all fi - exit + exit 0 ;; --status) if [ -f /etc/sysconfig/sound ]; then @@ -311,7 +372,7 @@ else echo "disabled" fi - exit + exit 0 ;; *) show_help @@ -332,3 +393,4 @@ echo "PULSEAUDIO_ENABLE=\"no\"" >> /etc/sysconfig/sound fi fi +exit 0 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
