From 2f3b2553892487727449f5f150601643c65b500d949a1e6b2a9a458da02701c5 Mon Sep 17 00:00:00 2001 From: Scott Reeves Date: Fri, 25 Sep 2009 06:13:47 +0000 Subject: [PATCH 1/5] Accepting request 21056 from home:sreeves1:branches:multimedia:libs Copy from home:sreeves1:branches:multimedia:libs/pulseaudio via accept of submit request 21056 revision 2. OBS-URL: https://build.opensuse.org/request/show/21056 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=22 --- pulseaudio-0.9.17.tar.bz2 | 3 --- pulseaudio-0.9.18.tar.bz2 | 3 +++ pulseaudio.changes | 7 +++++++ pulseaudio.spec | 9 ++++++--- 4 files changed, 16 insertions(+), 6 deletions(-) delete mode 100644 pulseaudio-0.9.17.tar.bz2 create mode 100644 pulseaudio-0.9.18.tar.bz2 diff --git a/pulseaudio-0.9.17.tar.bz2 b/pulseaudio-0.9.17.tar.bz2 deleted file mode 100644 index 3221410..0000000 --- a/pulseaudio-0.9.17.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7bc2f83419fde9ce81565409e107b42cd49e33d835d097d7c8a8019dc3037ef7 -size 1368593 diff --git a/pulseaudio-0.9.18.tar.bz2 b/pulseaudio-0.9.18.tar.bz2 new file mode 100644 index 0000000..2728dab --- /dev/null +++ b/pulseaudio-0.9.18.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cf4195f06f0ec48f1ef616bd5db5b5ff3c7a3697f18ac88e5b765b6014926f79 +size 1377122 diff --git a/pulseaudio.changes b/pulseaudio.changes index e4413da..889034e 100644 --- a/pulseaudio.changes +++ b/pulseaudio.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 24 16:43:16 UTC 2009 - sreeves@novell.com + +- Update to 0.9.18 + Bugfix update - see Changelog for full details + Translation update. + ------------------------------------------------------------------- Fri Sep 18 22:05:47 UTC 2009 - sreeves@novell.com diff --git a/pulseaudio.spec b/pulseaudio.spec index 548ae34..7894c3f 100644 --- a/pulseaudio.spec +++ b/pulseaudio.spec @@ -1,5 +1,5 @@ # -# spec file for package pulseaudio (Version 0.9.17) +# spec file for package pulseaudio (Version 0.9.18) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,11 +17,11 @@ # norootforbuild -%define drvver 0.9.17 +%define drvver 0.9.18 Name: pulseaudio Summary: A Networked Sound Server -Version: 0.9.17 +Version: 0.9.18 Release: 1 License: LGPL v2.1 or later Group: System/Sound Daemons @@ -193,10 +193,12 @@ improved drop-in replacement for the Enlightened Sound Daemon (ESOUND). Summary: Development package for the pulseaudio library License: GPL v2 or later ; LGPL v2.1 or later Group: Development/Libraries/C and C++ +BuildRequires: vala Requires: libpulse0 = %{version} Requires: libpulse-mainloop-glib0 = %{version} Requires: libpulse-browse0 = %{version} Requires: pkgconfig glib2-devel +Requires: vala Provides: pulseaudio-devel = %{version}-%{release} Obsoletes: pulseaudio-devel < %{version} @@ -452,6 +454,7 @@ groupadd -r pulse-access &>/dev/null || : %{_libdir}/libpulse-simple.so %{_libdir}/libpulse-browse.so %{_libdir}/pkgconfig/libpulse*.pc +%{_datadir}/vala/vapi/libpulse.vapi %files utils %defattr(-,root,root) From 93d9ef22e45859e5599696383f27e4daa9a3a7208f9724f1e11d221f2528459c Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Thu, 1 Oct 2009 14:54:18 +0000 Subject: [PATCH 2/5] Accepting request 21254 from home:llunak:branches:multimedia:libs Copy from home:llunak:branches:multimedia:libs/pulseaudio via accept of submit request 21254 revision 2. Request was accepted with message: thanks OBS-URL: https://build.opensuse.org/request/show/21254 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=23 --- disabled-start.diff | 15 +++++++++++++++ pulseaudio.changes | 5 +++++ pulseaudio.spec | 2 ++ setup-pulseaudio | 22 +++++++++++++++++++++- 4 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 disabled-start.diff diff --git a/disabled-start.diff b/disabled-start.diff new file mode 100644 index 0000000..276d605 --- /dev/null +++ b/disabled-start.diff @@ -0,0 +1,15 @@ +--- src/daemon/start-pulseaudio-x11.in.sav 2009-06-08 00:35:57.000000000 +0200 ++++ src/daemon/start-pulseaudio-x11.in 2009-09-28 19:33:07.388014651 +0200 +@@ -19,6 +19,12 @@ + + set -e + ++. /etc/sysconfig/sound ++ ++if [ x"$PULSEAUDIO_ENABLE" = x"no" ] ; then ++ exit 1 ++fi ++ + [ -z "$PULSE_SERVER" ] + + @PA_BINARY@ --start "$@" diff --git a/pulseaudio.changes b/pulseaudio.changes index 889034e..3595573 100644 --- a/pulseaudio.changes +++ b/pulseaudio.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 28 17:36:58 UTC 2009 - llunak@novell.com + +- make 'setup-pulseaudio --disable' actually really disable PA (bnc#537780) + ------------------------------------------------------------------- Thu Sep 24 16:43:16 UTC 2009 - sreeves@novell.com diff --git a/pulseaudio.spec b/pulseaudio.spec index 7894c3f..6b02888 100644 --- a/pulseaudio.spec +++ b/pulseaudio.spec @@ -28,6 +28,7 @@ Group: System/Sound Daemons Source: %{name}-%{version}.tar.bz2 Source1: default.pa-for-gdm Source2: setup-pulseaudio +Patch1: disabled-start.diff Url: http://pulseaudio.org BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: alsa-devel @@ -239,6 +240,7 @@ This package contains GDM integration hooks for the PulseAudio sound server. %lang_package %prep %setup -q -T -b0 +%patch1 %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" diff --git a/setup-pulseaudio b/setup-pulseaudio index a2a489d..d9df611 100644 --- a/setup-pulseaudio +++ b/setup-pulseaudio @@ -105,6 +105,15 @@ enable_xine() { echo "" } +enable_autospawn() { + echo "Enabling PulseAudio autospawn..." + if grep -q ^autospawn /etc/pulse/client.conf; then + perl -pi -e "s|^autospawn.*|autospawn = yes|g;" /etc/pulse/client.conf + else + echo "autospawn = yes" >> /etc/pulse/client.conf + fi +} + disable_alsa() { echo "Disabling PulseAudio for ALSA..." perl -pi -e "s|ALSA_CONFIG_PATH=/etc/alsa-pulse.conf||g;" /etc/environment @@ -155,6 +164,15 @@ disable_xine() { echo "" } +disable_autospawn() { + echo "Disabling PulseAudio autospawn..." + if grep -q ^autospawn /etc/pulse/client.conf; then + perl -pi -e "s|^autospawn.*|autospawn = no|g;" /etc/pulse/client.conf + else + echo "autospawn = no" >> /etc/pulse/client.conf + fi +} + case $1 in --enable) check_root || exit @@ -167,6 +185,7 @@ case $1 in enable_sdl enable_timidity enable_xine + enable_autospawn ;; --disable) check_root || exit @@ -179,6 +198,7 @@ case $1 in disable_sdl disable_timidity disable_xine + disable_autospawn ;; --status) STATUS=`grep PULSEAUDIO_ENABLE /etc/sysconfig/sound | cut -f2 -d= | cut -f2 -d\"` @@ -195,7 +215,7 @@ case $1 in esac # Now, update /etc/sysconfig/sound with the PA status -if grep PULSEAUDIO_ENABLE /etc/sysconfig/sound; then +if grep -q PULSEAUDIO_ENABLE /etc/sysconfig/sound; then if [ "x$ENABLE" = "x1" ]; then perl -pi -e "s|PULSEAUDIO_ENABLE=\"no\"|PULSEAUDIO_ENABLE=\"yes\"|g;" /etc/sysconfig/sound else From 376752c78e7dbb405da9c1abcc944d485c670c531d24c8ff1ae1f7fc10deccdd Mon Sep 17 00:00:00 2001 From: Scott Reeves Date: Tue, 6 Oct 2009 21:52:26 +0000 Subject: [PATCH 3/5] Accepting request 21940 from home:sreeves1:branches:multimedia:libs Copy from home:sreeves1:branches:multimedia:libs/pulseaudio via accept of submit request 21940 revision 4. OBS-URL: https://build.opensuse.org/request/show/21940 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=24 --- pulseaudio-0.9.18.tar.bz2 | 3 --- pulseaudio-0.9.19.tar.bz2 | 3 +++ pulseaudio.changes | 6 ++++++ pulseaudio.spec | 10 +++++----- 4 files changed, 14 insertions(+), 8 deletions(-) delete mode 100644 pulseaudio-0.9.18.tar.bz2 create mode 100644 pulseaudio-0.9.19.tar.bz2 diff --git a/pulseaudio-0.9.18.tar.bz2 b/pulseaudio-0.9.18.tar.bz2 deleted file mode 100644 index 2728dab..0000000 --- a/pulseaudio-0.9.18.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cf4195f06f0ec48f1ef616bd5db5b5ff3c7a3697f18ac88e5b765b6014926f79 -size 1377122 diff --git a/pulseaudio-0.9.19.tar.bz2 b/pulseaudio-0.9.19.tar.bz2 new file mode 100644 index 0000000..7206c09 --- /dev/null +++ b/pulseaudio-0.9.19.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d40a43b0736436fd76815dbbd12f97d93fbaee671744f839ae040d2b58531dc0 +size 1381146 diff --git a/pulseaudio.changes b/pulseaudio.changes index 3595573..92abb45 100644 --- a/pulseaudio.changes +++ b/pulseaudio.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 6 19:10:19 UTC 2009 - sreeves@novell.com + +- Update to 0.9.19 + Bugfix update - see Changelog for full details + ------------------------------------------------------------------- Mon Sep 28 17:36:58 UTC 2009 - llunak@novell.com diff --git a/pulseaudio.spec b/pulseaudio.spec index 6b02888..6d19b5f 100644 --- a/pulseaudio.spec +++ b/pulseaudio.spec @@ -1,5 +1,5 @@ # -# spec file for package pulseaudio (Version 0.9.18) +# spec file for package pulseaudio (Version 0.9.19) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,11 +17,11 @@ # norootforbuild -%define drvver 0.9.18 +%define drvver 0.9.19 Name: pulseaudio Summary: A Networked Sound Server -Version: 0.9.18 +Version: 0.9.19 Release: 1 License: LGPL v2.1 or later Group: System/Sound Daemons @@ -194,12 +194,10 @@ improved drop-in replacement for the Enlightened Sound Daemon (ESOUND). Summary: Development package for the pulseaudio library License: GPL v2 or later ; LGPL v2.1 or later Group: Development/Libraries/C and C++ -BuildRequires: vala Requires: libpulse0 = %{version} Requires: libpulse-mainloop-glib0 = %{version} Requires: libpulse-browse0 = %{version} Requires: pkgconfig glib2-devel -Requires: vala Provides: pulseaudio-devel = %{version}-%{release} Obsoletes: pulseaudio-devel < %{version} @@ -456,6 +454,8 @@ groupadd -r pulse-access &>/dev/null || : %{_libdir}/libpulse-simple.so %{_libdir}/libpulse-browse.so %{_libdir}/pkgconfig/libpulse*.pc +%dir %{_datadir}/vala +%dir %{_datadir}/vala/vapi %{_datadir}/vala/vapi/libpulse.vapi %files utils From 71916ec644389682b4e9213437b0f282cb95220a3a7b861eaa8aac76d42bacfb Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 8 Oct 2009 15:53:49 +0000 Subject: [PATCH 4/5] checked in OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=25 --- disabled-start.diff | 15 --------------- pulseaudio-0.9.17.tar.bz2 | 3 +++ pulseaudio-0.9.19.tar.bz2 | 3 --- pulseaudio.changes | 18 ------------------ pulseaudio.spec | 11 +++-------- setup-pulseaudio | 22 +--------------------- 6 files changed, 7 insertions(+), 65 deletions(-) delete mode 100644 disabled-start.diff create mode 100644 pulseaudio-0.9.17.tar.bz2 delete mode 100644 pulseaudio-0.9.19.tar.bz2 diff --git a/disabled-start.diff b/disabled-start.diff deleted file mode 100644 index 276d605..0000000 --- a/disabled-start.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- src/daemon/start-pulseaudio-x11.in.sav 2009-06-08 00:35:57.000000000 +0200 -+++ src/daemon/start-pulseaudio-x11.in 2009-09-28 19:33:07.388014651 +0200 -@@ -19,6 +19,12 @@ - - set -e - -+. /etc/sysconfig/sound -+ -+if [ x"$PULSEAUDIO_ENABLE" = x"no" ] ; then -+ exit 1 -+fi -+ - [ -z "$PULSE_SERVER" ] - - @PA_BINARY@ --start "$@" diff --git a/pulseaudio-0.9.17.tar.bz2 b/pulseaudio-0.9.17.tar.bz2 new file mode 100644 index 0000000..3221410 --- /dev/null +++ b/pulseaudio-0.9.17.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7bc2f83419fde9ce81565409e107b42cd49e33d835d097d7c8a8019dc3037ef7 +size 1368593 diff --git a/pulseaudio-0.9.19.tar.bz2 b/pulseaudio-0.9.19.tar.bz2 deleted file mode 100644 index 7206c09..0000000 --- a/pulseaudio-0.9.19.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d40a43b0736436fd76815dbbd12f97d93fbaee671744f839ae040d2b58531dc0 -size 1381146 diff --git a/pulseaudio.changes b/pulseaudio.changes index 92abb45..e4413da 100644 --- a/pulseaudio.changes +++ b/pulseaudio.changes @@ -1,21 +1,3 @@ -------------------------------------------------------------------- -Tue Oct 6 19:10:19 UTC 2009 - sreeves@novell.com - -- Update to 0.9.19 - Bugfix update - see Changelog for full details - -------------------------------------------------------------------- -Mon Sep 28 17:36:58 UTC 2009 - llunak@novell.com - -- make 'setup-pulseaudio --disable' actually really disable PA (bnc#537780) - -------------------------------------------------------------------- -Thu Sep 24 16:43:16 UTC 2009 - sreeves@novell.com - -- Update to 0.9.18 - Bugfix update - see Changelog for full details - Translation update. - ------------------------------------------------------------------- Fri Sep 18 22:05:47 UTC 2009 - sreeves@novell.com diff --git a/pulseaudio.spec b/pulseaudio.spec index 6d19b5f..548ae34 100644 --- a/pulseaudio.spec +++ b/pulseaudio.spec @@ -1,5 +1,5 @@ # -# spec file for package pulseaudio (Version 0.9.19) +# spec file for package pulseaudio (Version 0.9.17) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,18 +17,17 @@ # norootforbuild -%define drvver 0.9.19 +%define drvver 0.9.17 Name: pulseaudio Summary: A Networked Sound Server -Version: 0.9.19 +Version: 0.9.17 Release: 1 License: LGPL v2.1 or later Group: System/Sound Daemons Source: %{name}-%{version}.tar.bz2 Source1: default.pa-for-gdm Source2: setup-pulseaudio -Patch1: disabled-start.diff Url: http://pulseaudio.org BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: alsa-devel @@ -238,7 +237,6 @@ This package contains GDM integration hooks for the PulseAudio sound server. %lang_package %prep %setup -q -T -b0 -%patch1 %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" @@ -454,9 +452,6 @@ groupadd -r pulse-access &>/dev/null || : %{_libdir}/libpulse-simple.so %{_libdir}/libpulse-browse.so %{_libdir}/pkgconfig/libpulse*.pc -%dir %{_datadir}/vala -%dir %{_datadir}/vala/vapi -%{_datadir}/vala/vapi/libpulse.vapi %files utils %defattr(-,root,root) diff --git a/setup-pulseaudio b/setup-pulseaudio index d9df611..a2a489d 100644 --- a/setup-pulseaudio +++ b/setup-pulseaudio @@ -105,15 +105,6 @@ enable_xine() { echo "" } -enable_autospawn() { - echo "Enabling PulseAudio autospawn..." - if grep -q ^autospawn /etc/pulse/client.conf; then - perl -pi -e "s|^autospawn.*|autospawn = yes|g;" /etc/pulse/client.conf - else - echo "autospawn = yes" >> /etc/pulse/client.conf - fi -} - disable_alsa() { echo "Disabling PulseAudio for ALSA..." perl -pi -e "s|ALSA_CONFIG_PATH=/etc/alsa-pulse.conf||g;" /etc/environment @@ -164,15 +155,6 @@ disable_xine() { echo "" } -disable_autospawn() { - echo "Disabling PulseAudio autospawn..." - if grep -q ^autospawn /etc/pulse/client.conf; then - perl -pi -e "s|^autospawn.*|autospawn = no|g;" /etc/pulse/client.conf - else - echo "autospawn = no" >> /etc/pulse/client.conf - fi -} - case $1 in --enable) check_root || exit @@ -185,7 +167,6 @@ case $1 in enable_sdl enable_timidity enable_xine - enable_autospawn ;; --disable) check_root || exit @@ -198,7 +179,6 @@ case $1 in disable_sdl disable_timidity disable_xine - disable_autospawn ;; --status) STATUS=`grep PULSEAUDIO_ENABLE /etc/sysconfig/sound | cut -f2 -d= | cut -f2 -d\"` @@ -215,7 +195,7 @@ case $1 in esac # Now, update /etc/sysconfig/sound with the PA status -if grep -q PULSEAUDIO_ENABLE /etc/sysconfig/sound; then +if grep PULSEAUDIO_ENABLE /etc/sysconfig/sound; then if [ "x$ENABLE" = "x1" ]; then perl -pi -e "s|PULSEAUDIO_ENABLE=\"no\"|PULSEAUDIO_ENABLE=\"yes\"|g;" /etc/sysconfig/sound else From 1a0e4ba1e96e3fdb40607727e2514123ea84889d793273fcf68ebcbd603d510c Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 8 Oct 2009 15:53:50 +0000 Subject: [PATCH 5/5] Updating link to change in openSUSE:Factory/pulseaudio revision 50.0 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=68959b52fa645e7b00fb50b997891a4a --- disabled-start.diff | 15 +++++++++++++++ pulseaudio-0.9.17.tar.bz2 | 3 --- pulseaudio-0.9.19.tar.bz2 | 3 +++ pulseaudio.changes | 18 ++++++++++++++++++ pulseaudio.spec | 11 ++++++++--- setup-pulseaudio | 22 +++++++++++++++++++++- 6 files changed, 65 insertions(+), 7 deletions(-) create mode 100644 disabled-start.diff delete mode 100644 pulseaudio-0.9.17.tar.bz2 create mode 100644 pulseaudio-0.9.19.tar.bz2 diff --git a/disabled-start.diff b/disabled-start.diff new file mode 100644 index 0000000..276d605 --- /dev/null +++ b/disabled-start.diff @@ -0,0 +1,15 @@ +--- src/daemon/start-pulseaudio-x11.in.sav 2009-06-08 00:35:57.000000000 +0200 ++++ src/daemon/start-pulseaudio-x11.in 2009-09-28 19:33:07.388014651 +0200 +@@ -19,6 +19,12 @@ + + set -e + ++. /etc/sysconfig/sound ++ ++if [ x"$PULSEAUDIO_ENABLE" = x"no" ] ; then ++ exit 1 ++fi ++ + [ -z "$PULSE_SERVER" ] + + @PA_BINARY@ --start "$@" diff --git a/pulseaudio-0.9.17.tar.bz2 b/pulseaudio-0.9.17.tar.bz2 deleted file mode 100644 index 3221410..0000000 --- a/pulseaudio-0.9.17.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7bc2f83419fde9ce81565409e107b42cd49e33d835d097d7c8a8019dc3037ef7 -size 1368593 diff --git a/pulseaudio-0.9.19.tar.bz2 b/pulseaudio-0.9.19.tar.bz2 new file mode 100644 index 0000000..7206c09 --- /dev/null +++ b/pulseaudio-0.9.19.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d40a43b0736436fd76815dbbd12f97d93fbaee671744f839ae040d2b58531dc0 +size 1381146 diff --git a/pulseaudio.changes b/pulseaudio.changes index e4413da..92abb45 100644 --- a/pulseaudio.changes +++ b/pulseaudio.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Tue Oct 6 19:10:19 UTC 2009 - sreeves@novell.com + +- Update to 0.9.19 + Bugfix update - see Changelog for full details + +------------------------------------------------------------------- +Mon Sep 28 17:36:58 UTC 2009 - llunak@novell.com + +- make 'setup-pulseaudio --disable' actually really disable PA (bnc#537780) + +------------------------------------------------------------------- +Thu Sep 24 16:43:16 UTC 2009 - sreeves@novell.com + +- Update to 0.9.18 + Bugfix update - see Changelog for full details + Translation update. + ------------------------------------------------------------------- Fri Sep 18 22:05:47 UTC 2009 - sreeves@novell.com diff --git a/pulseaudio.spec b/pulseaudio.spec index 548ae34..6d19b5f 100644 --- a/pulseaudio.spec +++ b/pulseaudio.spec @@ -1,5 +1,5 @@ # -# spec file for package pulseaudio (Version 0.9.17) +# spec file for package pulseaudio (Version 0.9.19) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,17 +17,18 @@ # norootforbuild -%define drvver 0.9.17 +%define drvver 0.9.19 Name: pulseaudio Summary: A Networked Sound Server -Version: 0.9.17 +Version: 0.9.19 Release: 1 License: LGPL v2.1 or later Group: System/Sound Daemons Source: %{name}-%{version}.tar.bz2 Source1: default.pa-for-gdm Source2: setup-pulseaudio +Patch1: disabled-start.diff Url: http://pulseaudio.org BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: alsa-devel @@ -237,6 +238,7 @@ This package contains GDM integration hooks for the PulseAudio sound server. %lang_package %prep %setup -q -T -b0 +%patch1 %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" @@ -452,6 +454,9 @@ groupadd -r pulse-access &>/dev/null || : %{_libdir}/libpulse-simple.so %{_libdir}/libpulse-browse.so %{_libdir}/pkgconfig/libpulse*.pc +%dir %{_datadir}/vala +%dir %{_datadir}/vala/vapi +%{_datadir}/vala/vapi/libpulse.vapi %files utils %defattr(-,root,root) diff --git a/setup-pulseaudio b/setup-pulseaudio index a2a489d..d9df611 100644 --- a/setup-pulseaudio +++ b/setup-pulseaudio @@ -105,6 +105,15 @@ enable_xine() { echo "" } +enable_autospawn() { + echo "Enabling PulseAudio autospawn..." + if grep -q ^autospawn /etc/pulse/client.conf; then + perl -pi -e "s|^autospawn.*|autospawn = yes|g;" /etc/pulse/client.conf + else + echo "autospawn = yes" >> /etc/pulse/client.conf + fi +} + disable_alsa() { echo "Disabling PulseAudio for ALSA..." perl -pi -e "s|ALSA_CONFIG_PATH=/etc/alsa-pulse.conf||g;" /etc/environment @@ -155,6 +164,15 @@ disable_xine() { echo "" } +disable_autospawn() { + echo "Disabling PulseAudio autospawn..." + if grep -q ^autospawn /etc/pulse/client.conf; then + perl -pi -e "s|^autospawn.*|autospawn = no|g;" /etc/pulse/client.conf + else + echo "autospawn = no" >> /etc/pulse/client.conf + fi +} + case $1 in --enable) check_root || exit @@ -167,6 +185,7 @@ case $1 in enable_sdl enable_timidity enable_xine + enable_autospawn ;; --disable) check_root || exit @@ -179,6 +198,7 @@ case $1 in disable_sdl disable_timidity disable_xine + disable_autospawn ;; --status) STATUS=`grep PULSEAUDIO_ENABLE /etc/sysconfig/sound | cut -f2 -d= | cut -f2 -d\"` @@ -195,7 +215,7 @@ case $1 in esac # Now, update /etc/sysconfig/sound with the PA status -if grep PULSEAUDIO_ENABLE /etc/sysconfig/sound; then +if grep -q PULSEAUDIO_ENABLE /etc/sysconfig/sound; then if [ "x$ENABLE" = "x1" ]; then perl -pi -e "s|PULSEAUDIO_ENABLE=\"no\"|PULSEAUDIO_ENABLE=\"yes\"|g;" /etc/sysconfig/sound else