From 7f029b9bdd0ebc3549e4e8f01f39403be0e88715f3ba6621b689e90c623c2349 Mon Sep 17 00:00:00 2001 From: Scott Reeves Date: Fri, 4 Sep 2009 23:09:50 +0000 Subject: [PATCH 1/3] Copy from home:sreeves1:branches:multimedia:libs/pulseaudio via accept of submit request 19980 Request was accepted with message: ok OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=17 --- default.pa-for-gdm | 12 +++ pulseaudio-0.9.16-test7.tar.bz2 | 3 + pulseaudio.changes | 12 +++ pulseaudio.spec | 147 +++++++++++--------------------- 4 files changed, 79 insertions(+), 95 deletions(-) create mode 100644 default.pa-for-gdm create mode 100644 pulseaudio-0.9.16-test7.tar.bz2 diff --git a/default.pa-for-gdm b/default.pa-for-gdm new file mode 100644 index 0000000..62d820b --- /dev/null +++ b/default.pa-for-gdm @@ -0,0 +1,12 @@ +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 new file mode 100644 index 0000000..cbc4c0b --- /dev/null +++ b/pulseaudio-0.9.16-test7.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:91a45769871c34c1cef98a1c91039d9c8731bf1b2ab8fc45b01ba44587d8248f +size 1361557 diff --git a/pulseaudio.changes b/pulseaudio.changes index 69b3beb..5d6fbd8 100644 --- a/pulseaudio.changes +++ b/pulseaudio.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +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 cf2ecbf..eee86a1 100644 --- a/pulseaudio.spec +++ b/pulseaudio.spec @@ -1,5 +1,5 @@ # -# spec file for package pulseaudio (Version 0.9.15) +# spec file for package pulseaudio (Version 0.9.16) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,73 +17,37 @@ # norootforbuild - +%define drvver 0.9.16 Name: pulseaudio -%define drvver 0.9.15 Summary: A Networked Sound Server -Version: 0.9.15 -Release: 5 +Version: 0.9.16 +Release: 0.test7 License: GPL v2 or later ; LGPL v2.1 or later Group: System/Sound Daemons -Source: %{name}-%{version}.tar.bz2 +Source: %{name}-%{version}-test7.tar.bz2 +Source1: default.pa-for-gdm 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 +BuildRequires: libudev-devel >= 143 BuildRequires: speex-devel BuildRequires: tcpd-devel BuildRequires: update-desktop-files @@ -91,6 +55,9 @@ 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 @@ -163,17 +130,13 @@ This package includes support for Jack-based applications. %package module-bluetooth License: GPL v2 or later ; LGPL v2.1 or later -Summary: Bluetooth proximity support for the PulseAudio sound server +Summary: Bluetooth support for the PulseAudio sound server Group: System/Sound Daemons Requires: %{name} = %{version} Requires: bluez >= 4.34 %description module-bluetooth -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. +Contains Bluetooth audio (A2DP/HSP/HFP) support for the PulseAudio sound server. %package module-gconf License: GPL v2 or later ; LGPL v2.1 or later @@ -258,45 +221,23 @@ 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 -%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 +%setup -q -T -b0 -n pulseaudio-0.9.16-test7 %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 @@ -305,8 +246,8 @@ export SUSE_ASNEEDED=0 --disable-rpath \ --with-system-user=pulse \ --with-system-group=pulse \ - --with-realtime-group=pulse-rt \ - --with-access-group=pulse-access + --with-access-group=pulse-access \ + --disable-hal make %{?jobs:-j%jobs} make doxygen @@ -317,9 +258,10 @@ 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 @@ -329,7 +271,6 @@ 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 @@ -355,7 +296,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 -#%attr(4755,root,root) %{_bindir}/pulseaudio +%config(noreplace) %{_sysconfdir}/dbus-1/system.d/pulseaudio-system.conf %{_bindir}/pulseaudio %{_bindir}/setup-pulseaudio %dir %{_libdir}/pulse-%{drvver}/ @@ -379,6 +320,7 @@ 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 @@ -418,13 +360,20 @@ 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 -%if %suse_version >= 1100 -%{_datadir}/PolicyKit/policy/org.pulseaudio.policy -%endif +%{_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/* %{_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) @@ -510,6 +459,8 @@ groupadd -r pulse-access &>/dev/null || : %{_bindir}/pactl %{_bindir}/paplay %{_bindir}/parec +%{_bindir}/pamon +%{_bindir}/parecord %{_bindir}/pax11publish %{_bindir}/padsp %{_bindir}/pasuspender @@ -522,6 +473,12 @@ 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 From b1608ae9aaa6dca37ba38dce3d842e3500a026ed694da9a4f1e02ce2d2b47476 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Sat, 5 Sep 2009 00:49:23 +0000 Subject: [PATCH 2/3] 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 From dfc71024485ec077c6f151608d0f3e1721a7a6bd902e0585e1ab02c5280331ff Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Sat, 5 Sep 2009 00:49:24 +0000 Subject: [PATCH 3/3] Updating link to change in openSUSE:Factory/pulseaudio revision 48.0 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=ea9b218a371eafa98158d6168206b3aa --- ...iguration-of-fallback-device-strings.patch | 342 ----------- ...is-passed-to-pa_path_get_filename-ju.patch | 40 -- ...an-assert-when-invalid-module-argume.patch | 41 -- ...ing-we-are-speaking-of-card-profiles.patch | 25 - ...-buffer-size-before-number-of-period.patch | 84 --- ...olete-module-idle-time-directive-fro.patch | 43 -- ...-soft-mute-status-stays-in-sync-with.patch | 80 --- ...E-order-for-24-bit-accessor-function.patch | 48 -- ...print-file-name-only-when-we-have-it.patch | 25 - ...ument-24bit-sample-types-in-man-page.patch | 34 -- ...ment-log-related-daemon.conf-options.patch | 52 -- ...at-tsched-doesn-t-use-fragment-setti.patch | 26 - ...ail-to-fill-in-mutex-into-static-mut.patch | 25 - ...ock-when-we-try-to-resume-an-OSS-dev.patch | 55 -- ...-don-t-hit-an-assert-when-we-call-co.patch | 25 - ...-enumeration-macro-PA_IDXSET_FOREACH.patch | 25 - ...when-one-stream-move-fails-try-to-co.patch | 48 -- ...sample-correctly-pass-s24-32-formats.patch | 34 -- ...-iteration-loop-when-adjusting-volum.patch | 40 -- ...perly-allocate-silence-block-for-s24.patch | 34 -- ...nv-fix-a-few-minor-conversion-issues.patch | 61 -- ...ore-verbose-when-a-hwparam-call-fail.patch | 121 ---- ...don-t-end-up-in-an-endless-loop-when.patch | 135 ----- ...e-pa_-sink-source-_set_fixed_latency.patch | 239 -------- ...ested-latency-only-when-we-are-runni.patch | 49 -- 0026-sample-fix-build-on-BE-archs.patch | 25 - ...onvert-return-values-of-snd_strerror.patch | 535 ------------------ 0028-alsa-remove-debug-code.patch | 25 - default.pa-for-gdm | 12 + pulseaudio-0.9.15.tar.bz2 | 3 - pulseaudio-0.9.16-test7.tar.bz2 | 3 + pulseaudio-am111.patch | 13 - pulseaudio-bnc480113-default-sink.patch | 41 -- pulseaudio-work-with-old-alsa.patch | 13 - pulseaudio.changes | 12 + pulseaudio.spec | 146 ++--- 36 files changed, 79 insertions(+), 2480 deletions(-) delete mode 100644 0001-alsa-allow-configuration-of-fallback-device-strings.patch delete mode 100644 0002-util-if-NULL-is-passed-to-pa_path_get_filename-ju.patch delete mode 100644 0003-alsa-don-t-hit-an-assert-when-invalid-module-argume.patch delete mode 100644 0004-alsa-fix-wording-we-are-speaking-of-card-profiles.patch delete mode 100644 0005-alsa-initialize-buffer-size-before-number-of-period.patch delete mode 100644 0006-conf-remove-obsolete-module-idle-time-directive-fro.patch delete mode 100644 0007-core-make-sure-soft-mute-status-stays-in-sync-with.patch delete mode 100644 0008-endian-fix-LE-BE-order-for-24-bit-accessor-function.patch delete mode 100644 0009-log-print-file-name-only-when-we-have-it.patch delete mode 100644 0010-man-document-24bit-sample-types-in-man-page.patch delete mode 100644 0011-man-document-log-related-daemon.conf-options.patch delete mode 100644 0012-man-document-that-tsched-doesn-t-use-fragment-setti.patch delete mode 100644 0013-mutex-when-we-fail-to-fill-in-mutex-into-static-mut.patch delete mode 100644 0014-oss-don-t-deadlock-when-we-try-to-resume-an-OSS-dev.patch delete mode 100644 0015-simple-protocol-don-t-hit-an-assert-when-we-call-co.patch delete mode 100644 0016-idxset-add-enumeration-macro-PA_IDXSET_FOREACH.patch delete mode 100644 0017-rescue-streams-when-one-stream-move-fails-try-to-co.patch delete mode 100644 0018-sample-correctly-pass-s24-32-formats.patch delete mode 100644 0019-sample-util-fix-iteration-loop-when-adjusting-volum.patch delete mode 100644 0020-sample-util-properly-allocate-silence-block-for-s24.patch delete mode 100644 0021-sconv-fix-a-few-minor-conversion-issues.patch delete mode 100644 0022-alsa-be-a-bit-more-verbose-when-a-hwparam-call-fail.patch delete mode 100644 0023-rescue-make-we-don-t-end-up-in-an-endless-loop-when.patch delete mode 100644 0024-core-introduce-pa_-sink-source-_set_fixed_latency.patch delete mode 100644 0025-core-cache-requested-latency-only-when-we-are-runni.patch delete mode 100644 0026-sample-fix-build-on-BE-archs.patch delete mode 100644 0027-alsa-properly-convert-return-values-of-snd_strerror.patch delete mode 100644 0028-alsa-remove-debug-code.patch create mode 100644 default.pa-for-gdm delete mode 100644 pulseaudio-0.9.15.tar.bz2 create mode 100644 pulseaudio-0.9.16-test7.tar.bz2 delete mode 100644 pulseaudio-am111.patch delete mode 100644 pulseaudio-bnc480113-default-sink.patch delete mode 100644 pulseaudio-work-with-old-alsa.patch diff --git a/0001-alsa-allow-configuration-of-fallback-device-strings.patch b/0001-alsa-allow-configuration-of-fallback-device-strings.patch deleted file mode 100644 index 09d2e37..0000000 --- a/0001-alsa-allow-configuration-of-fallback-device-strings.patch +++ /dev/null @@ -1,342 +0,0 @@ -From 4f2a3cb6019d551ca98aa2034854985df2670a30 Mon Sep 17 00:00:00 2001 -From: Lennart Poettering -Date: Wed, 29 Apr 2009 01:58:18 +0200 -Subject: [PATCH] alsa: allow configuration of fallback device strings in profiles - -This has the benefit that we can properly support ALSA devices where -only the raw 'hw' device exists but no 'front' although it's a proper -2ch stereo device. ---- - src/modules/alsa/alsa-util.c | 126 +++++++++++++++++++++++++++++------------ - src/modules/alsa/alsa-util.h | 1 + - 2 files changed, 90 insertions(+), 37 deletions(-) - -diff --git a/src/modules/alsa/alsa-util.c b/src/modules/alsa/alsa-util.c -index d2dc6e8..2ea0c3d 100644 ---- a/src/modules/alsa/alsa-util.c -+++ b/src/modules/alsa/alsa-util.c -@@ -526,7 +526,7 @@ int pa_alsa_set_sw_params(snd_pcm_t *pcm, snd_pcm_uframes_t avail_min) { - - static const struct pa_alsa_profile_info device_table[] = { - {{ 1, { PA_CHANNEL_POSITION_MONO }}, -- "hw", -+ "hw", NULL, - N_("Analog Mono"), - "analog-mono", - 1, -@@ -534,7 +534,7 @@ static const struct pa_alsa_profile_info device_table[] = { - "Capture", "Mic" }, - - {{ 2, { PA_CHANNEL_POSITION_LEFT, PA_CHANNEL_POSITION_RIGHT }}, -- "front", -+ "front", "hw", - N_("Analog Stereo"), - "analog-stereo", - 10, -@@ -542,7 +542,7 @@ static const struct pa_alsa_profile_info device_table[] = { - "Capture", "Mic" }, - - {{ 2, { PA_CHANNEL_POSITION_LEFT, PA_CHANNEL_POSITION_RIGHT }}, -- "iec958", -+ "iec958", NULL, - N_("Digital Stereo (IEC958)"), - "iec958-stereo", - 5, -@@ -550,7 +550,7 @@ static const struct pa_alsa_profile_info device_table[] = { - "IEC958 In", NULL }, - - {{ 2, { PA_CHANNEL_POSITION_LEFT, PA_CHANNEL_POSITION_RIGHT }}, -- "hdmi", -+ "hdmi", NULL, - N_("Digital Stereo (HDMI)"), - "hdmi-stereo", - 4, -@@ -559,7 +559,7 @@ static const struct pa_alsa_profile_info device_table[] = { - - {{ 4, { PA_CHANNEL_POSITION_FRONT_LEFT, PA_CHANNEL_POSITION_FRONT_RIGHT, - PA_CHANNEL_POSITION_REAR_LEFT, PA_CHANNEL_POSITION_REAR_RIGHT }}, -- "surround40", -+ "surround40", NULL, - N_("Analog Surround 4.0"), - "analog-surround-40", - 7, -@@ -568,7 +568,7 @@ static const struct pa_alsa_profile_info device_table[] = { - - {{ 4, { PA_CHANNEL_POSITION_FRONT_LEFT, PA_CHANNEL_POSITION_FRONT_RIGHT, - PA_CHANNEL_POSITION_REAR_LEFT, PA_CHANNEL_POSITION_REAR_RIGHT }}, -- "a52", -+ "a52", NULL, - N_("Digital Surround 4.0 (IEC958/AC3)"), - "iec958-ac3-surround-40", - 2, -@@ -578,7 +578,7 @@ static const struct pa_alsa_profile_info device_table[] = { - {{ 5, { PA_CHANNEL_POSITION_FRONT_LEFT, PA_CHANNEL_POSITION_FRONT_RIGHT, - PA_CHANNEL_POSITION_REAR_LEFT, PA_CHANNEL_POSITION_REAR_RIGHT, - PA_CHANNEL_POSITION_LFE }}, -- "surround41", -+ "surround41", NULL, - N_("Analog Surround 4.1"), - "analog-surround-41", - 7, -@@ -588,7 +588,7 @@ static const struct pa_alsa_profile_info device_table[] = { - {{ 5, { PA_CHANNEL_POSITION_FRONT_LEFT, PA_CHANNEL_POSITION_FRONT_RIGHT, - PA_CHANNEL_POSITION_REAR_LEFT, PA_CHANNEL_POSITION_REAR_RIGHT, - PA_CHANNEL_POSITION_CENTER }}, -- "surround50", -+ "surround50", NULL, - N_("Analog Surround 5.0"), - "analog-surround-50", - 7, -@@ -598,7 +598,7 @@ static const struct pa_alsa_profile_info device_table[] = { - {{ 6, { PA_CHANNEL_POSITION_FRONT_LEFT, PA_CHANNEL_POSITION_FRONT_RIGHT, - PA_CHANNEL_POSITION_REAR_LEFT, PA_CHANNEL_POSITION_REAR_RIGHT, - PA_CHANNEL_POSITION_CENTER, PA_CHANNEL_POSITION_LFE }}, -- "surround51", -+ "surround51", NULL, - N_("Analog Surround 5.1"), - "analog-surround-51", - 8, -@@ -608,7 +608,7 @@ static const struct pa_alsa_profile_info device_table[] = { - {{ 6, { PA_CHANNEL_POSITION_FRONT_LEFT, PA_CHANNEL_POSITION_FRONT_RIGHT, - PA_CHANNEL_POSITION_REAR_LEFT, PA_CHANNEL_POSITION_REAR_RIGHT, - PA_CHANNEL_POSITION_FRONT_CENTER, PA_CHANNEL_POSITION_LFE}}, -- "a52", -+ "a52", NULL, - N_("Digital Surround 5.1 (IEC958/AC3)"), - "iec958-ac3-surround-51", - 3, -@@ -619,16 +619,72 @@ static const struct pa_alsa_profile_info device_table[] = { - PA_CHANNEL_POSITION_REAR_LEFT, PA_CHANNEL_POSITION_REAR_RIGHT, - PA_CHANNEL_POSITION_CENTER, PA_CHANNEL_POSITION_LFE, - PA_CHANNEL_POSITION_SIDE_LEFT, PA_CHANNEL_POSITION_SIDE_RIGHT }}, -- "surround71", -+ "surround71", NULL, - N_("Analog Surround 7.1"), - "analog-surround-71", - 7, - "Master", "PCM", - "Capture", "Mic" }, - -- {{ 0, { 0 }}, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL } -+ {{ 0, { 0 }}, NULL, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL } - }; - -+static snd_pcm_t *open_by_device_string_with_fallback( -+ const char *prefix, -+ const char *prefix_fallback, -+ const char *dev_id, -+ char **dev, -+ pa_sample_spec *ss, -+ pa_channel_map* map, -+ int mode, -+ uint32_t *nfrags, -+ snd_pcm_uframes_t *period_size, -+ snd_pcm_uframes_t tsched_size, -+ pa_bool_t *use_mmap, -+ pa_bool_t *use_tsched, -+ pa_bool_t require_exact_channel_number) { -+ -+ snd_pcm_t *pcm_handle; -+ char *d; -+ -+ d = pa_sprintf_malloc("%s:%s", prefix, dev_id); -+ -+ pcm_handle = pa_alsa_open_by_device_string( -+ d, -+ dev, -+ ss, -+ map, -+ mode, -+ nfrags, -+ period_size, -+ tsched_size, -+ use_mmap, -+ use_tsched, -+ require_exact_channel_number); -+ pa_xfree(d); -+ -+ if (!pcm_handle && prefix_fallback) { -+ -+ d = pa_sprintf_malloc("%s:%s", prefix_fallback, dev_id); -+ -+ pcm_handle = pa_alsa_open_by_device_string( -+ d, -+ dev, -+ ss, -+ map, -+ mode, -+ nfrags, -+ period_size, -+ tsched_size, -+ use_mmap, -+ use_tsched, -+ require_exact_channel_number); -+ pa_xfree(d); -+ } -+ -+ return pcm_handle; -+} -+ - snd_pcm_t *pa_alsa_open_by_device_id_auto( - const char *dev_id, - char **dev, -@@ -669,14 +725,14 @@ snd_pcm_t *pa_alsa_open_by_device_id_auto( - - pa_log_debug("Checking for %s (%s)", device_table[i].name, device_table[i].alsa_name); - -- d = pa_sprintf_malloc("%s:%s", device_table[i].alsa_name, dev_id); -- - try_ss.channels = device_table[i].map.channels; - try_ss.rate = ss->rate; - try_ss.format = ss->format; - -- pcm_handle = pa_alsa_open_by_device_string( -- d, -+ pcm_handle = open_by_device_string_with_fallback( -+ device_table[i].alsa_name, -+ device_table[i].alsa_name_fallback, -+ dev_id, - dev, - &try_ss, - map, -@@ -688,8 +744,6 @@ snd_pcm_t *pa_alsa_open_by_device_id_auto( - use_tsched, - TRUE); - -- pa_xfree(d); -- - if (pcm_handle) { - - *ss = try_ss; -@@ -701,6 +755,7 @@ snd_pcm_t *pa_alsa_open_by_device_id_auto( - - return pcm_handle; - } -+ - } - - if (direction > 0) { -@@ -773,7 +828,6 @@ snd_pcm_t *pa_alsa_open_by_device_id_profile( - pa_bool_t *use_tsched, - const pa_alsa_profile_info *profile) { - -- char *d; - snd_pcm_t *pcm_handle; - pa_sample_spec try_ss; - -@@ -785,14 +839,14 @@ snd_pcm_t *pa_alsa_open_by_device_id_profile( - pa_assert(period_size); - pa_assert(profile); - -- d = pa_sprintf_malloc("%s:%s", profile->alsa_name, dev_id); -- - try_ss.channels = profile->map.channels; - try_ss.rate = ss->rate; - try_ss.format = ss->format; - -- pcm_handle = pa_alsa_open_by_device_string( -- d, -+ pcm_handle = open_by_device_string_with_fallback( -+ profile->alsa_name, -+ profile->alsa_name_fallback, -+ dev_id, - dev, - &try_ss, - map, -@@ -804,8 +858,6 @@ snd_pcm_t *pa_alsa_open_by_device_id_profile( - use_tsched, - TRUE); - -- pa_xfree(d); -- - if (!pcm_handle) - return NULL; - -@@ -858,6 +910,8 @@ snd_pcm_t *pa_alsa_open_by_device_string( - goto fail; - } - -+ pa_log_debug("Managed to open %s", d); -+ - if ((err = pa_alsa_set_hw_params(pcm_handle, ss, nfrags, period_size, tsched_size, use_mmap, use_tsched, require_exact_channel_number)) < 0) { - - if (!reformat) { -@@ -926,26 +980,25 @@ int pa_alsa_probe_profiles( - snd_pcm_t *pcm_i = NULL; - - if (i->alsa_name) { -- char *id; - pa_sample_spec try_ss; - pa_channel_map try_map; - - pa_log_debug("Checking for playback on %s (%s)", i->name, i->alsa_name); -- id = pa_sprintf_malloc("%s:%s", i->alsa_name, dev_id); - - try_ss = *ss; - try_ss.channels = i->map.channels; - try_map = i->map; - -- pcm_i = pa_alsa_open_by_device_string( -- id, NULL, -+ pcm_i = open_by_device_string_with_fallback( -+ i->alsa_name, -+ i->alsa_name_fallback, -+ dev_id, -+ NULL, - &try_ss, &try_map, - SND_PCM_STREAM_PLAYBACK, - NULL, NULL, 0, NULL, NULL, - TRUE); - -- pa_xfree(id); -- - if (!pcm_i) - continue; - } -@@ -954,26 +1007,25 @@ int pa_alsa_probe_profiles( - snd_pcm_t *pcm_j = NULL; - - if (j->alsa_name) { -- char *jd; - pa_sample_spec try_ss; - pa_channel_map try_map; - - pa_log_debug("Checking for capture on %s (%s)", j->name, j->alsa_name); -- jd = pa_sprintf_malloc("%s:%s", j->alsa_name, dev_id); - - try_ss = *ss; - try_ss.channels = j->map.channels; - try_map = j->map; - -- pcm_j = pa_alsa_open_by_device_string( -- jd, NULL, -+ pcm_j = open_by_device_string_with_fallback( -+ j->alsa_name, -+ j->alsa_name_fallback, -+ dev_id, -+ NULL, - &try_ss, &try_map, - SND_PCM_STREAM_CAPTURE, - NULL, NULL, 0, NULL, NULL, - TRUE); - -- pa_xfree(jd); -- - if (!pcm_j) - continue; - } -diff --git a/src/modules/alsa/alsa-util.h b/src/modules/alsa/alsa-util.h -index c8acc7c..c3a8117 100644 ---- a/src/modules/alsa/alsa-util.h -+++ b/src/modules/alsa/alsa-util.h -@@ -56,6 +56,7 @@ int pa_alsa_set_sw_params(snd_pcm_t *pcm, snd_pcm_uframes_t avail_min); - typedef struct pa_alsa_profile_info { - pa_channel_map map; - const char *alsa_name; -+ const char *alsa_name_fallback; - const char *description; /* internationalized */ - const char *name; - unsigned priority; --- -1.6.0.2 - diff --git a/0002-util-if-NULL-is-passed-to-pa_path_get_filename-ju.patch b/0002-util-if-NULL-is-passed-to-pa_path_get_filename-ju.patch deleted file mode 100644 index 3ccf220..0000000 --- a/0002-util-if-NULL-is-passed-to-pa_path_get_filename-ju.patch +++ /dev/null @@ -1,40 +0,0 @@ -From c7ec01326190a0bcdcca77307728a7dabb9fb1d2 Mon Sep 17 00:00:00 2001 -From: Lennart Poettering -Date: Sun, 19 Apr 2009 19:02:16 +0200 -Subject: [PATCH] util: if NULL is passed to pa_path_get_filename() just hand it through - ---- - src/pulse/util.c | 3 ++- - src/pulse/util.h | 2 +- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/pulse/util.c b/src/pulse/util.c -index 54a188d..6f1e40a 100644 ---- a/src/pulse/util.c -+++ b/src/pulse/util.c -@@ -219,7 +219,8 @@ char *pa_get_binary_name(char *s, size_t l) { - char *pa_path_get_filename(const char *p) { - char *fn; - -- pa_assert(p); -+ if (!p) -+ return NULL; - - if ((fn = strrchr(p, PA_PATH_SEP_CHAR))) - return fn+1; -diff --git a/src/pulse/util.h b/src/pulse/util.h -index f6dd40c..ad85653 100644 ---- a/src/pulse/util.h -+++ b/src/pulse/util.h -@@ -51,7 +51,7 @@ char *pa_get_home_dir(char *s, size_t l); - char *pa_get_binary_name(char *s, size_t l); - - /** Return a pointer to the filename inside a path (which is the last -- * component). */ -+ * component). If passed NULL will return NULL. */ - char *pa_path_get_filename(const char *p); - - /** Wait t milliseconds */ --- -1.6.0.2 - diff --git a/0003-alsa-don-t-hit-an-assert-when-invalid-module-argume.patch b/0003-alsa-don-t-hit-an-assert-when-invalid-module-argume.patch deleted file mode 100644 index 4baf0db..0000000 --- a/0003-alsa-don-t-hit-an-assert-when-invalid-module-argume.patch +++ /dev/null @@ -1,41 +0,0 @@ -From a5fad31238a9379a589c7a5c629352a8c914f709 Mon Sep 17 00:00:00 2001 -From: Lennart Poettering -Date: Fri, 1 May 2009 04:11:30 +0200 -Subject: [PATCH] alsa: don't hit an assert when invalid module arguments are passed - ---- - src/modules/alsa/alsa-sink.c | 3 ++- - src/modules/alsa/alsa-source.c | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c -index 2fbcd7b..360cb4d 100644 ---- a/src/modules/alsa/alsa-sink.c -+++ b/src/modules/alsa/alsa-sink.c -@@ -1770,7 +1770,8 @@ pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const char*driver, pa_ca - - fail: - -- userdata_free(u); -+ if (u) -+ userdata_free(u); - - return NULL; - } -diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c -index c59fc75..19c6cfc 100644 ---- a/src/modules/alsa/alsa-source.c -+++ b/src/modules/alsa/alsa-source.c -@@ -1621,7 +1621,8 @@ pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const char*driver, p - - fail: - -- userdata_free(u); -+ if (u) -+ userdata_free(u); - - return NULL; - } --- -1.6.0.2 - diff --git a/0004-alsa-fix-wording-we-are-speaking-of-card-profiles.patch b/0004-alsa-fix-wording-we-are-speaking-of-card-profiles.patch deleted file mode 100644 index 9d92798..0000000 --- a/0004-alsa-fix-wording-we-are-speaking-of-card-profiles.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 5657be51e1aff934be7be723dd4c80deaae7cfb6 Mon Sep 17 00:00:00 2001 -From: Lennart Poettering -Date: Tue, 26 May 2009 22:29:33 +0200 -Subject: [PATCH] alsa: fix wording, we are speaking of card profiles, not output profiles - ---- - src/modules/alsa/module-alsa-card.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/modules/alsa/module-alsa-card.c b/src/modules/alsa/module-alsa-card.c -index fdc952d..dd8636e 100644 ---- a/src/modules/alsa/module-alsa-card.c -+++ b/src/modules/alsa/module-alsa-card.c -@@ -135,7 +135,7 @@ static void enumerate_cb( - bonus += 20000; - } - -- pa_log_info("Found output profile '%s'", t); -+ pa_log_info("Found profile '%s'", t); - - p = pa_card_profile_new(n, t, sizeof(struct profile_data)); - --- -1.6.0.2 - diff --git a/0005-alsa-initialize-buffer-size-before-number-of-period.patch b/0005-alsa-initialize-buffer-size-before-number-of-period.patch deleted file mode 100644 index 621972e..0000000 --- a/0005-alsa-initialize-buffer-size-before-number-of-period.patch +++ /dev/null @@ -1,84 +0,0 @@ -From fab8c8290dbfe5c24718afac033c2e11976e4754 Mon Sep 17 00:00:00 2001 -From: Lennart Poettering -Date: Fri, 1 May 2009 04:16:17 +0200 -Subject: [PATCH] alsa: initialize buffer size before number of periods to improve compat with some backends - ---- - src/modules/alsa/alsa-util.c | 33 ++++++++++++++++++++------------- - 1 files changed, 20 insertions(+), 13 deletions(-) - -diff --git a/src/modules/alsa/alsa-util.c b/src/modules/alsa/alsa-util.c -index 2ea0c3d..34cb6d6 100644 ---- a/src/modules/alsa/alsa-util.c -+++ b/src/modules/alsa/alsa-util.c -@@ -332,7 +332,6 @@ int pa_alsa_set_hw_params( - int ret = -1; - snd_pcm_uframes_t _period_size = period_size ? *period_size : 0; - unsigned int _periods = periods ? *periods : 0; -- snd_pcm_uframes_t buffer_size; - unsigned int r = ss->rate; - unsigned int c = ss->channels; - pa_sample_format_t f = ss->format; -@@ -388,39 +387,47 @@ int pa_alsa_set_hw_params( - goto finish; - - if (_period_size && tsched_size && _periods) { -+ - /* Adjust the buffer sizes, if we didn't get the rate we were asking for */ - _period_size = (snd_pcm_uframes_t) (((uint64_t) _period_size * r) / ss->rate); - tsched_size = (snd_pcm_uframes_t) (((uint64_t) tsched_size * r) / ss->rate); - - if (_use_tsched) { -- _period_size = tsched_size; -- _periods = 1; -+ snd_pcm_uframes_t buffer_size; - - pa_assert_se(snd_pcm_hw_params_get_buffer_size_max(hwparams, &buffer_size) == 0); - pa_log_debug("Maximum hw buffer size is %u ms", (unsigned) buffer_size * 1000 / r); -+ -+ _period_size = tsched_size; -+ _periods = 1; - } - -- buffer_size = _periods * _period_size; -+ if (_period_size > 0 && _periods > 0) { -+ snd_pcm_uframes_t buffer_size; -+ -+ buffer_size = _periods * _period_size; -+ -+ if ((ret = snd_pcm_hw_params_set_buffer_size_near(pcm_handle, hwparams, &buffer_size)) < 0) -+ pa_log_info("snd_pcm_hw_params_set_buffer_size_near() failed: %s", pa_alsa_strerror(ret)); -+ } - - if (_periods > 0) { - -- /* First we pass 0 as direction to get exactly what we asked -- * for. That this is necessary is presumably a bug in ALSA */ -+ /* First we pass 0 as direction to get exactly what we -+ * asked for. That this is necessary is presumably a bug -+ * in ALSA. All in all this is mostly a hint to ALSA, so -+ * we don't care if this fails. */ - - dir = 0; -- if ((ret = snd_pcm_hw_params_set_periods_near(pcm_handle, hwparams, &_periods, &dir)) < 0) { -+ if (snd_pcm_hw_params_set_periods_near(pcm_handle, hwparams, &_periods, &dir) < 0) { - dir = 1; -- if ((ret = snd_pcm_hw_params_set_periods_near(pcm_handle, hwparams, &_periods, &dir)) < 0) { -+ if (snd_pcm_hw_params_set_periods_near(pcm_handle, hwparams, &_periods, &dir) < 0) { - dir = -1; - if ((ret = snd_pcm_hw_params_set_periods_near(pcm_handle, hwparams, &_periods, &dir)) < 0) -- goto finish; -+ pa_log_info("snd_pcm_hw_params_set_periods_near() failed: %s", pa_alsa_strerror(ret)); - } - } - } -- -- if (_period_size > 0) -- if ((ret = snd_pcm_hw_params_set_buffer_size_near(pcm_handle, hwparams, &buffer_size)) < 0) -- goto finish; - } - - if ((ret = snd_pcm_hw_params(pcm_handle, hwparams)) < 0) --- -1.6.0.2 - diff --git a/0006-conf-remove-obsolete-module-idle-time-directive-fro.patch b/0006-conf-remove-obsolete-module-idle-time-directive-fro.patch deleted file mode 100644 index e065ffb..0000000 --- a/0006-conf-remove-obsolete-module-idle-time-directive-fro.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 56f457c10d0bd45714a1d2d033ecedab9b46439a Mon Sep 17 00:00:00 2001 -From: Lennart Poettering -Date: Sun, 7 Jun 2009 00:44:16 +0200 -Subject: [PATCH] conf: remove obsolete module-idle-time directive from default config file/man page - ---- - man/pulse-daemon.conf.5.xml.in | 7 ------- - src/daemon/daemon.conf.in | 1 - - 2 files changed, 0 insertions(+), 8 deletions(-) - -diff --git a/man/pulse-daemon.conf.5.xml.in b/man/pulse-daemon.conf.5.xml.in -index afa7ca0..7d184a6 100644 ---- a/man/pulse-daemon.conf.5.xml.in -+++ b/man/pulse-daemon.conf.5.xml.in -@@ -228,13 +228,6 @@ USA. - - - -- -- --- -1.6.0.2 - diff --git a/0011-man-document-log-related-daemon.conf-options.patch b/0011-man-document-log-related-daemon.conf-options.patch deleted file mode 100644 index 3264d46..0000000 --- a/0011-man-document-log-related-daemon.conf-options.patch +++ /dev/null @@ -1,52 +0,0 @@ -From c4a763d19a700c49a63509b0be576630ce408793 Mon Sep 17 00:00:00 2001 -From: Lennart Poettering -Date: Sun, 7 Jun 2009 00:44:49 +0200 -Subject: [PATCH] man: document log related daemon.conf options - ---- - man/pulse-daemon.conf.5.xml.in | 21 +++++++++++++++++++-- - 1 files changed, 19 insertions(+), 2 deletions(-) - -diff --git a/man/pulse-daemon.conf.5.xml.in b/man/pulse-daemon.conf.5.xml.in -index b667291..94ee8fa 100644 ---- a/man/pulse-daemon.conf.5.xml.in -+++ b/man/pulse-daemon.conf.5.xml.in -@@ -260,9 +260,9 @@ USA. - - - - - -@@ -289,6 +289,23 @@ USA. - might alter this setting.

- - -+ -+ -+ -+ -+ -+ - - -
--- -1.6.0.2 - diff --git a/0012-man-document-that-tsched-doesn-t-use-fragment-setti.patch b/0012-man-document-that-tsched-doesn-t-use-fragment-setti.patch deleted file mode 100644 index 3802121..0000000 --- a/0012-man-document-that-tsched-doesn-t-use-fragment-setti.patch +++ /dev/null @@ -1,26 +0,0 @@ -From ecb72ee5387c9348dd2dff9cbbfca63bad393f0b Mon Sep 17 00:00:00 2001 -From: Lennart Poettering -Date: Sun, 7 Jun 2009 00:45:21 +0200 -Subject: [PATCH] man: document that tsched doesn't use fragment settings - ---- - man/pulse-daemon.conf.5.xml.in | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/man/pulse-daemon.conf.5.xml.in b/man/pulse-daemon.conf.5.xml.in -index 94ee8fa..1622f23 100644 ---- a/man/pulse-daemon.conf.5.xml.in -+++ b/man/pulse-daemon.conf.5.xml.in -@@ -413,7 +413,8 @@ USA. - these buffer metrics for machines with high scheduling - latencies. Not all possible values that may be configured here are - available in all hardware. The driver will to find the nearest -- setting supported.

-+ setting supported. Modern drivers that support timer-based -+ scheduling ignore these options.

- -