From b1608ae9aaa6dca37ba38dce3d842e3500a026ed694da9a4f1e02ce2d2b47476 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Sat, 5 Sep 2009 00:49:23 +0000 Subject: [PATCH] checked in OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=18 --- default.pa-for-gdm | 12 --- pulseaudio-0.9.16-test7.tar.bz2 | 3 - pulseaudio.changes | 12 --- pulseaudio.spec | 147 +++++++++++++++++++++----------- 4 files changed, 95 insertions(+), 79 deletions(-) delete mode 100644 default.pa-for-gdm delete mode 100644 pulseaudio-0.9.16-test7.tar.bz2 diff --git a/default.pa-for-gdm b/default.pa-for-gdm deleted file mode 100644 index 62d820b..0000000 --- a/default.pa-for-gdm +++ /dev/null @@ -1,12 +0,0 @@ -load-module module-device-restore -load-module module-card-restore -load-module module-udev-detect -load-module module-native-protocol-unix -load-module module-default-device-restore -load-module module-rescue-streams -load-module module-always-sink -load-module module-intended-roles -load-module module-suspend-on-idle -load-module module-console-kit -load-module module-position-event-sounds - diff --git a/pulseaudio-0.9.16-test7.tar.bz2 b/pulseaudio-0.9.16-test7.tar.bz2 deleted file mode 100644 index cbc4c0b..0000000 --- a/pulseaudio-0.9.16-test7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:91a45769871c34c1cef98a1c91039d9c8731bf1b2ab8fc45b01ba44587d8248f -size 1361557 diff --git a/pulseaudio.changes b/pulseaudio.changes index 5d6fbd8..69b3beb 100644 --- a/pulseaudio.changes +++ b/pulseaudio.changes @@ -1,15 +1,3 @@ -------------------------------------------------------------------- -Wed Sep 2 23:23:47 CEST 2009 - sreeves@novell.com - -- Update to version 0.9.16-test7 - Please see Changelog for full details -- Remove uneeded patches (functionality already in 0.9.16) - set of recommended backported patches (00*.patch) - pulseaudio-am111.patch - pulseaudio-bnc480113-default-sink.patch -- Remove pulseaudio-work-with-old-alsa.patch -- Add package pulseaudio-gdm-hooks - ------------------------------------------------------------------- Mon Aug 24 14:16:24 CEST 2009 - coolo@novell.com diff --git a/pulseaudio.spec b/pulseaudio.spec index eee86a1..cf2ecbf 100644 --- a/pulseaudio.spec +++ b/pulseaudio.spec @@ -1,5 +1,5 @@ # -# spec file for package pulseaudio (Version 0.9.16) +# spec file for package pulseaudio (Version 0.9.15) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,37 +17,73 @@ # norootforbuild -%define drvver 0.9.16 + Name: pulseaudio +%define drvver 0.9.15 Summary: A Networked Sound Server -Version: 0.9.16 -Release: 0.test7 +Version: 0.9.15 +Release: 5 License: GPL v2 or later ; LGPL v2.1 or later Group: System/Sound Daemons -Source: %{name}-%{version}-test7.tar.bz2 -Source1: default.pa-for-gdm +Source: %{name}-%{version}.tar.bz2 Source2: setup-pulseaudio +# PATCH-FIX-UPSTREAM pulseaudio-bnc480113-default-sink.patch bnc#480113 sreeves@novell.com +Patch1: pulseaudio-bnc480113-default-sink.patch +# PATCH-FIX-OPENSUSE pulseaudio-work-with-old-alsa.patch +Patch2: pulseaudio-work-with-old-alsa.patch +# PATCH-FIX-UPSTREAM pulseaudio-am111.patch automake 1.11 support coolo@novell.com +Patch0: pulseaudio-am111.patch +# These 28 patches are backported from upstream git. Drop them when we move to 0.9.16 +Patch3: 0001-alsa-allow-configuration-of-fallback-device-strings.patch +Patch4: 0002-util-if-NULL-is-passed-to-pa_path_get_filename-ju.patch +Patch5: 0003-alsa-don-t-hit-an-assert-when-invalid-module-argume.patch +Patch6: 0004-alsa-fix-wording-we-are-speaking-of-card-profiles.patch +Patch7: 0005-alsa-initialize-buffer-size-before-number-of-period.patch +Patch8: 0006-conf-remove-obsolete-module-idle-time-directive-fro.patch +Patch9: 0007-core-make-sure-soft-mute-status-stays-in-sync-with.patch +Patch10: 0008-endian-fix-LE-BE-order-for-24-bit-accessor-function.patch +Patch11: 0009-log-print-file-name-only-when-we-have-it.patch +Patch12: 0010-man-document-24bit-sample-types-in-man-page.patch +Patch13: 0011-man-document-log-related-daemon.conf-options.patch +Patch14: 0012-man-document-that-tsched-doesn-t-use-fragment-setti.patch +Patch15: 0013-mutex-when-we-fail-to-fill-in-mutex-into-static-mut.patch +Patch16: 0014-oss-don-t-deadlock-when-we-try-to-resume-an-OSS-dev.patch +Patch17: 0015-simple-protocol-don-t-hit-an-assert-when-we-call-co.patch +Patch18: 0016-idxset-add-enumeration-macro-PA_IDXSET_FOREACH.patch +Patch19: 0017-rescue-streams-when-one-stream-move-fails-try-to-co.patch +Patch20: 0018-sample-correctly-pass-s24-32-formats.patch +Patch21: 0019-sample-util-fix-iteration-loop-when-adjusting-volum.patch +Patch22: 0020-sample-util-properly-allocate-silence-block-for-s24.patch +Patch23: 0021-sconv-fix-a-few-minor-conversion-issues.patch +Patch24: 0022-alsa-be-a-bit-more-verbose-when-a-hwparam-call-fail.patch +Patch25: 0023-rescue-make-we-don-t-end-up-in-an-endless-loop-when.patch +Patch26: 0024-core-introduce-pa_-sink-source-_set_fixed_latency.patch +Patch27: 0025-core-cache-requested-latency-only-when-we-are-runni.patch +Patch28: 0026-sample-fix-build-on-BE-archs.patch +Patch29: 0027-alsa-properly-convert-return-values-of-snd_strerror.patch +Patch30: 0028-alsa-remove-debug-code.patch Url: http://pulseaudio.org BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: PolicyKit-devel BuildRequires: alsa-devel BuildRequires: bluez-devel BuildRequires: doxygen BuildRequires: gconf2-devel +BuildRequires: gdbm-devel BuildRequires: glib2-devel BuildRequires: gtk2-devel +BuildRequires: hal-devel BuildRequires: intltool BuildRequires: jack-devel BuildRequires: libatomic-ops-devel BuildRequires: libavahi-devel +BuildRequires: liboil-devel BuildRequires: libopenssl-devel BuildRequires: libsamplerate-devel BuildRequires: libsndfile-devel BuildRequires: libtool -BuildRequires: libtdb-devel -#our libtdb-devel does not have a .pc file -BuildRequires: gdbm-devel BuildRequires: lirc-devel -BuildRequires: libudev-devel >= 143 +BuildRequires: libudev-devel BuildRequires: speex-devel BuildRequires: tcpd-devel BuildRequires: update-desktop-files @@ -55,9 +91,6 @@ BuildRequires: xorg-x11-devel PreReq: pwdutils Recommends: alsa-plugins-pulse Requires: %{name}-lang = %{version} -Requires: udev >= 146 -Requires: rtkit -Requires: kernel >= 2.6.30 Obsoletes: libpulsecore9 <= 0.9.14 Obsoletes: libpulsecore7 <= 0.9.12 @@ -130,13 +163,17 @@ This package includes support for Jack-based applications. %package module-bluetooth License: GPL v2 or later ; LGPL v2.1 or later -Summary: Bluetooth support for the PulseAudio sound server +Summary: Bluetooth proximity support for the PulseAudio sound server Group: System/Sound Daemons Requires: %{name} = %{version} Requires: bluez >= 4.34 %description module-bluetooth -Contains Bluetooth audio (A2DP/HSP/HFP) support for the PulseAudio sound server. +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). + +This package includes support for Bluetooth-based sound devices. %package module-gconf License: GPL v2 or later ; LGPL v2.1 or later @@ -221,23 +258,45 @@ 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). -%package gdm-hooks -Summary: PulseAudio GDM integration -License: GPL v2 or later ; LGPL v2.1 or later -Group: Applications/Multimedia -Requires: %{name} = %{version} -Requires: gdm >= 2.22 -#for the gdm user -Requires(pre): gdm - -%description gdm-hooks -This package contains GDM integration hooks for the PulseAudio sound server. - %lang_package %prep -%setup -q -T -b0 -n pulseaudio-0.9.16-test7 +%setup -q -T -b0 +%patch1 -p1 +%patch2 -p1 +%patch0 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 +%patch15 -p1 +%patch16 -p1 +%patch17 -p1 +%patch18 -p1 +%patch19 -p1 +%patch20 -p1 +%patch21 -p1 +%patch22 -p1 +%patch23 -p1 +%patch24 -p1 +%patch25 -p1 +%patch26 -p1 +%patch27 -p1 +%patch28 -p1 +%patch29 -p1 +%patch30 -p1 %build +%if %suse_version >= 1110 +autoreconf -fi +%endif export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" # libpulse and libpulsecommon need each other - no way with as-needed export SUSE_ASNEEDED=0 @@ -246,8 +305,8 @@ export SUSE_ASNEEDED=0 --disable-rpath \ --with-system-user=pulse \ --with-system-group=pulse \ - --with-access-group=pulse-access \ - --disable-hal + --with-realtime-group=pulse-rt \ + --with-access-group=pulse-access make %{?jobs:-j%jobs} make doxygen @@ -258,10 +317,9 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la $RPM_BUILD_ROOT%{_libdir}/pulse-%{drvver}/ rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a %suse_update_desktop_file pulseaudio %find_lang %{name} +chmod 755 $RPM_BUILD_ROOT%{_bindir}/pulseaudio install %SOURCE2 $RPM_BUILD_ROOT%{_bindir} chmod 755 $RPM_BUILD_ROOT%{_bindir}/setup-pulseaudio -mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/gdm/.pulse -cp $RPM_SOURCE_DIR/default.pa-for-gdm $RPM_BUILD_ROOT%{_localstatedir}/lib/gdm/.pulse/default.pa ln -s esdcompat $RPM_BUILD_ROOT%{_bindir}/esd %clean @@ -271,6 +329,7 @@ rm -rf $RPM_BUILD_ROOT groupadd -r pulse &>/dev/null || : useradd -r -c 'PulseAudio daemon' \ -s /sbin/nologin -d /var/lib/pulseaudio -g pulse -G audio pulse &>/dev/null || : +groupadd -r pulse-rt &>/dev/null || : groupadd -r pulse-access &>/dev/null || : %post -n libpulse0 -p /sbin/ldconfig @@ -296,7 +355,7 @@ groupadd -r pulse-access &>/dev/null || : %config(noreplace) %{_sysconfdir}/pulse/daemon.conf %config(noreplace) %{_sysconfdir}/pulse/default.pa %config(noreplace) %{_sysconfdir}/pulse/system.pa -%config(noreplace) %{_sysconfdir}/dbus-1/system.d/pulseaudio-system.conf +#%attr(4755,root,root) %{_bindir}/pulseaudio %{_bindir}/pulseaudio %{_bindir}/setup-pulseaudio %dir %{_libdir}/pulse-%{drvver}/ @@ -320,7 +379,6 @@ groupadd -r pulse-access &>/dev/null || : %{_libdir}/pulse-%{drvver}/modules/module-cli-protocol-unix.so %{_libdir}/pulse-%{drvver}/modules/module-cli.so %{_libdir}/pulse-%{drvver}/modules/module-combine.so -%{_libdir}/pulse-%{drvver}/modules/module-loopback.so %{_libdir}/pulse-%{drvver}/modules/module-console-kit.so %{_libdir}/pulse-%{drvver}/modules/module-detect.so %{_libdir}/pulse-%{drvver}/modules/module-device-restore.so @@ -360,20 +418,13 @@ groupadd -r pulse-access &>/dev/null || : %{_libdir}/pulse-%{drvver}/modules/module-augment-properties.so %{_libdir}/pulse-%{drvver}/modules/module-cork-music-on-phone.so %{_libdir}/pulse-%{drvver}/modules/module-sine-source.so -%{_libdir}/pulse-%{drvver}/modules/module-intended-roles.so -%{_libdir}/pulse-%{drvver}/modules/module-rygel-media-server.so -%{_libdir}/pulse-%{drvver}/modules/module-udev-detect.so -%dir %{_datadir}/pulseaudio -%dir %{_datadir}/pulseaudio/alsa-mixer -%dir %{_datadir}/pulseaudio/alsa-mixer/paths -%dir %{_datadir}/pulseaudio/alsa-mixer/profile-sets -%{_datadir}/pulseaudio/alsa-mixer/paths/* -%{_datadir}/pulseaudio/alsa-mixer/profile-sets/* +%if %suse_version >= 1100 +%{_datadir}/PolicyKit/policy/org.pulseaudio.policy +%endif %{_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 -/lib/udev/rules.d/90-pulseaudio.rules %files esound-compat %defattr(-,root,root) @@ -459,8 +510,6 @@ groupadd -r pulse-access &>/dev/null || : %{_bindir}/pactl %{_bindir}/paplay %{_bindir}/parec -%{_bindir}/pamon -%{_bindir}/parecord %{_bindir}/pax11publish %{_bindir}/padsp %{_bindir}/pasuspender @@ -473,12 +522,6 @@ groupadd -r pulse-access &>/dev/null || : %{_mandir}/man1/padsp.1.gz %{_mandir}/man1/pax11publish.1.gz -%files gdm-hooks -%defattr(-,root,root) -%dir %{_localstatedir}/lib/gdm -%attr(0700, gdm, gdm) %dir %{_localstatedir}/lib/gdm/.pulse -%attr(0600, gdm, gdm) %{_localstatedir}/lib/gdm/.pulse/default.pa - %files lang -f %{name}.lang %changelog