SHA256
1
0
forked from pool/pulseaudio
OBS User unknown 2009-05-27 23:38:59 +00:00 committed by Git OBS Bridge
parent 176433cd18
commit d85fa4e5f5
8 changed files with 186 additions and 146 deletions

View File

@ -1,71 +0,0 @@
##!/usr/bin/pulseaudio -nF
#
# This file is part of polypaudio.
#
# polypaudio is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# polypaudio is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with polypaudio; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
### Load audio drivers statically
load-module module-alsa-sink device=default
load-module module-alsa-source device=default
#load-module module-oss device="/dev/dsp" sink_name=output source_name=input
#load-module module-oss-mmap device="/dev/dsp" sink_name=output source_name=input
#load-module module-null-sink
#load-module module-pipe-sink
### Automatically load driver modules depending on the hardware available
#load-module module-detect
### Load audio drivers automatically on access
#add-autoload-sink output module-oss device="/dev/dsp" sink_name=output source_name=input
#add-autoload-source input module-oss device="/dev/dsp" sink_name=output source_name=input
#add-autoload-sink output module-oss-mmap device="/dev/dsp" sink_name=output source_name=input
#add-autoload-source input module-oss-mmap device="/dev/dsp" sink_name=output source_name=input
#add-autoload-sink output module-alsa-sink sink_name=output
#add-autoload-source input module-alsa-source source_name=input
### Load several protocols
load-module module-esound-protocol-unix
load-module module-esound-protocol-tcp
load-module module-native-protocol-unix
#load-module module-native-protocol-tcp
### Load the RTP reciever module
#load-module module-rtp-recv
### Load the RTP sender module
#load-module module-null-sink sink_name=rtp
#load-module module-rtp-send source=rtp.monitor
### Automatically restore the volume of playback streams
load-module module-volume-restore
### Make some devices default
#set-default-sink output
#set-default-source input
.nofail
### Load something to the sample cache
#load-sample x11-bell /usr/share/sounds/gtk-events/activate.wav
#load-sample-dir-lazy /usr/share/sounds/*.wav
### Load X11 bell module
# load-module module-x11-bell sample=x11-bell
### Publish connection data in the X11 root window
# load-module module-x11-publish

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e602e36f73ae3642495fcfc471f785c3db92e77a828e3395fd5edf5217f1b537
size 943571

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3b10eefbd5d08bcfc9168c6456444e5010ff8699cd82f2b78c5d5c6342804d2c
size 1195310

View File

@ -0,0 +1,41 @@
Index: pulseaudio-0.9.15/src/pulsecore/namereg.c
===================================================================
--- pulseaudio-0.9.15.orig/src/pulsecore/namereg.c
+++ pulseaudio-0.9.15/src/pulsecore/namereg.c
@@ -244,14 +244,35 @@ pa_source* pa_namereg_set_default_source
pa_sink *pa_namereg_get_default_sink(pa_core *c) {
pa_sink *s;
+ pa_sink *best_sink;
+ uint32_t idx;
pa_assert(c);
+ pa_log_info ("Enter - pa_namereg_get_default_sink");
if (c->default_sink)
return c->default_sink;
- if ((s = pa_idxset_first(c->sinks, NULL)))
+ pa_log_info ("trying to chose best default sink");
+ s = NULL;
+ for (best_sink = pa_idxset_first(c->sinks, &idx); best_sink; best_sink = pa_idxset_next(c->sinks, &idx)) {
+ char * proplist = pa_proplist_to_string(best_sink->proplist);
+ pa_log_info ("%s", proplist);
+ if (!strstr(proplist, "HDMI") && !strstr(proplist, "SPDIF") && !strstr(proplist, "Digital")) {
+ pa_log_info ("found non HDMI and non SPDIF and non Digital");
+ s = best_sink;
+ pa_xfree(proplist);
+ break;
+ }
+ pa_xfree(proplist);
+ }
+ if (s)
return pa_namereg_set_default_sink(c, s);
+ else
+ {
+ if ((s = pa_idxset_first(c->sinks, NULL)))
+ return pa_namereg_set_default_sink(c, s);
+ }
return NULL;
}

View File

@ -1,10 +0,0 @@
--- a/src/daemon/daemon.conf.in 2008-01-24 06:14:22.000000000 +0530
+++ b/src/daemon/daemon.conf.in.new 2008-05-11 14:02:03.000000000 +0530
@@ -65,5 +65,5 @@
; default-sample-rate = 44100
; default-sample-channels = 2
-; default-fragments = 4
-; default-fragment-size-msec = 25
+ default-fragments = 16
+ default-fragment-size-msec = 21

View File

@ -0,0 +1,13 @@
Index: pulseaudio-0.9.15/configure.ac
===================================================================
--- pulseaudio-0.9.15.orig/configure.ac
+++ pulseaudio-0.9.15/configure.ac
@@ -648,7 +648,7 @@ AC_ARG_ENABLE([alsa],
[alsa=auto])
if test "x${alsa}" != xno ; then
- PKG_CHECK_MODULES(ASOUNDLIB, [ alsa >= 1.0.19 ],
+ PKG_CHECK_MODULES(ASOUNDLIB, [ alsa >= 1.0.18 ],
[
HAVE_ALSA=1
AC_DEFINE([HAVE_ALSA], 1, [Have ALSA?])

View File

@ -1,3 +1,40 @@
-------------------------------------------------------------------
Tue May 12 02:04:14 CEST 2009 - sreeves@novell.com
- Packaging changes:
+ add udev-extras to buildRequires
+ Only require alsa 1.0.18 as that version is patched on
11.1 to have needed functionality of 1.0.19
(pulseaudio-work-with-old-alsa.patch)
-------------------------------------------------------------------
Sat Apr 25 00:18:03 CEST 2009 - sreeves@novell.com
- Update to version 0.9.15:
Please see Changelog for full details
- Add more checks for "Digital" output for choosing default sink
(pulseaudio-bnc480113-default-sink.patch)
- Drop pulseaudio-defaults-daemon-conf.patch: use upstream defaults
for default-fragments* in daemon.conf
- Packaging changes:
+ Move libpulsecore into main rpm as it's an internal only
library
+ Remove unused old replacment for default.pa
+ Move start-pulseaudio-x11 into pulseaudio-module-x11 package
-------------------------------------------------------------------
Wed Mar 25 01:29:40 CET 2009 - sreeves@suse.de
- Fix for bnc#480113 - default sink
- Fix for bnc#456802 - logging out of control
-------------------------------------------------------------------
Thu Feb 26 18:18:40 CET 2009 - sreeves@suse.de
- Fix for bnc#464994 - error messages when using pulse
- Fix for bnc#461361 - sound crackles
- Fix for bnc#469886 - HDMI sound is muted
-------------------------------------------------------------------
Tue Feb 10 20:32:58 CET 2009 - vuntz@novell.com

View File

@ -1,5 +1,5 @@
#
# spec file for package pulseaudio (Version 0.9.14)
# spec file for package pulseaudio (Version 0.9.15)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -19,24 +19,52 @@
Name: pulseaudio
%define drvver 0.9
%define drvver 0.9.15
Summary: A Networked Sound Server
Version: 0.9.14
Release: 2
Version: 0.9.15
Release: 1
License: GPL v2 or later; LGPL v2.1 or later
Group: System/Sound Daemons
Source: %{name}-%{version}.tar.bz2
Source1: default.pa
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
Url: http://pulseaudio.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: PolicyKit-devel alsa-devel bluez-devel doxygen gconf2-devel gdbm-devel glib2-devel hal-devel intltool jack-devel libatomic-ops-devel libavahi-devel liboil-devel libsamplerate-devel libsndfile-devel libtool lirc-devel speex-devel tcpd-devel update-desktop-files xorg-x11-devel
Requires: libpulsecore9 = %{version}
Recommends: alsa-plugins-pulse
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: lirc-devel
BuildRequires: libudev-devel
BuildRequires: speex-devel
BuildRequires: tcpd-devel
%if %suse_version > 1110
BuildRequires: udev-extras
%endif
BuildRequires: update-desktop-files
BuildRequires: xorg-x11-devel
PreReq: pwdutils
# PATCH-FIX-UPSTREAM pulseaudio-defaults-daemon-conf.patch
Patch3: pulseaudio-defaults-daemon-conf.patch
Recommends: alsa-plugins-pulse
Requires: %{name}-lang = %{version}
Obsoletes: libpulsecore9 <= 0.9.14
Obsoletes: libpulsecore7 <= 0.9.12
%description
pulseaudio is a networked sound server for Linux and other Unix like
@ -152,6 +180,7 @@ License: GPL v2 or later; LGPL v2.1 or later
Summary: Bluetooth proximity 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
@ -202,25 +231,6 @@ sound server.
Authors:
--------
Lennart Poettering
Pierre Ossman
%package -n libpulsecore9
Summary: System libraries for PulseAudio
License: GPL v2 or later; LGPL v2.1 or later
Group: System/Sound Daemons
Provides: pulseaudio-core-libs = %{version}-%{release}
Obsoletes: pulseaudio-core-libs < %{version}
%description -n libpulsecore9
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).
Authors:
--------
Lennart Poettering
@ -295,7 +305,6 @@ Summary: PulseAudio utilities
License: GPL v2 or later; LGPL v2.1 or later
Group: System/Sound Daemons
Requires: libpulse0 = %{version}
Requires: libpulsecore9 = %{version}
Requires: libpulse-browse0 = %{version}
Requires: libpulse-mainloop-glib0 = %{version}
@ -314,12 +323,19 @@ Authors:
%lang_package
%prep
%setup -q -T -b0
%patch3 -p1
%patch1 -p1
%patch2 -p1
%build
autoreconf -fi
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%configure --disable-ltdl-install --disable-static --disable-rpath --with-system-user=pulse --with-system-group=pulse --with-realtime-group=pulse-rt --with-access-group=pulse-access
%configure \
--disable-static \
--disable-rpath \
--with-system-user=pulse \
--with-system-group=pulse \
--with-realtime-group=pulse-rt \
--with-access-group=pulse-access
make %{?jobs:-j%jobs}
make doxygen
@ -334,7 +350,6 @@ chmod 755 $RPM_BUILD_ROOT%{_bindir}/pulseaudio
install %SOURCE2 $RPM_BUILD_ROOT%{_bindir}
chmod 755 $RPM_BUILD_ROOT%{_bindir}/setup-pulseaudio
ln -s esdcompat $RPM_BUILD_ROOT%{_bindir}/esd
rm $RPM_BUILD_ROOT/%{_libdir}/libpulsecore.so
%clean
rm -rf $RPM_BUILD_ROOT
@ -358,9 +373,9 @@ groupadd -r pulse-access &>/dev/null || :
%postun -n libpulse-browse0 -p /sbin/ldconfig
%post -n libpulsecore9 -p /sbin/ldconfig
%post -p /sbin/ldconfig
%postun -n libpulsecore9 -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root)
@ -369,40 +384,25 @@ groupadd -r pulse-access &>/dev/null || :
%config(noreplace) %{_sysconfdir}/pulse/daemon.conf
%config(noreplace) %{_sysconfdir}/pulse/default.pa
%config(noreplace) %{_sysconfdir}/pulse/system.pa
%{_sysconfdir}/xdg/autostart/pulseaudio.desktop
#%attr(4755,root,root) %{_bindir}/pulseaudio
%{_bindir}/pulseaudio
%{_bindir}/setup-pulseaudio
%{_bindir}/start-pulseaudio-x11
%dir %{_libdir}/pulse-%{drvver}/
%dir %{_libdir}/pulse-%{drvver}/modules/
%{_libdir}/libpulsecore-%{drvver}.so
%{_libdir}/libpulsedsp.so
%{_libdir}/pulse-%{drvver}/modules/libalsa-util.so
%{_libdir}/pulse-%{drvver}/modules/libauth-cookie.so
%{_libdir}/pulse-%{drvver}/modules/libauthkey.so
%{_libdir}/pulse-%{drvver}/modules/libcli.so
%{_libdir}/pulse-%{drvver}/modules/libdbus-util.so
%{_libdir}/pulse-%{drvver}/modules/libiochannel.so
%{_libdir}/pulse-%{drvver}/modules/libioline.so
%{_libdir}/pulse-%{drvver}/modules/libipacl.so
%{_libdir}/pulse-%{drvver}/modules/liboss-util.so
%{_libdir}/pulse-%{drvver}/modules/libpacket.so
%{_libdir}/pulse-%{drvver}/modules/libparseaddr.so
%{_libdir}/pulse-%{drvver}/modules/libpdispatch.so
%{_libdir}/pulse-%{drvver}/modules/libprotocol-cli.so
%{_libdir}/pulse-%{drvver}/modules/libprotocol-esound.so
%{_libdir}/pulse-%{drvver}/modules/libprotocol-http.so
%{_libdir}/pulse-%{drvver}/modules/libprotocol-native.so
%{_libdir}/pulse-%{drvver}/modules/libprotocol-simple.so
%{_libdir}/pulse-%{drvver}/modules/libpstream-util.so
%{_libdir}/pulse-%{drvver}/modules/libpstream.so
%{_libdir}/pulse-%{drvver}/modules/librtp.so
%{_libdir}/pulse-%{drvver}/modules/libsocket-client.so
%{_libdir}/pulse-%{drvver}/modules/libsocket-server.so
%{_libdir}/pulse-%{drvver}/modules/libsocket-util.so
%{_libdir}/pulse-%{drvver}/modules/libstrlist.so
%{_libdir}/pulse-%{drvver}/modules/libtagstruct.so
%{_libdir}/pulse-%{drvver}/modules/module-alsa-sink.so
%{_libdir}/pulse-%{drvver}/modules/module-alsa-source.so
%{_libdir}/pulse-%{drvver}/modules/module-alsa-card.so
%{_libdir}/pulse-%{drvver}/modules/module-always-sink.so
%{_libdir}/pulse-%{drvver}/modules/module-cli-protocol-tcp.so
%{_libdir}/pulse-%{drvver}/modules/module-cli-protocol-unix.so
@ -435,6 +435,7 @@ groupadd -r pulse-access &>/dev/null || :
%{_libdir}/pulse-%{drvver}/modules/module-simple-protocol-tcp.so
%{_libdir}/pulse-%{drvver}/modules/module-simple-protocol-unix.so
%{_libdir}/pulse-%{drvver}/modules/module-stream-restore.so
%{_libdir}/pulse-%{drvver}/modules/module-card-restore.so
%{_libdir}/pulse-%{drvver}/modules/module-sine.so
%{_libdir}/pulse-%{drvver}/modules/module-tunnel-sink.so
%{_libdir}/pulse-%{drvver}/modules/module-tunnel-source.so
@ -443,6 +444,9 @@ groupadd -r pulse-access &>/dev/null || :
%{_libdir}/pulse-%{drvver}/modules/module-default-device-restore.so
%{_libdir}/pulse-%{drvver}/modules/module-ladspa-sink.so
%{_libdir}/pulse-%{drvver}/modules/module-remap-sink.so
%{_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
%{_datadir}/PolicyKit/policy/org.pulseaudio.policy
%{_mandir}/man1/pulseaudio.1.gz
%{_mandir}/man5/default.pa.5.gz
@ -461,17 +465,21 @@ groupadd -r pulse-access &>/dev/null || :
%files module-x11
%defattr(-,root,root)
%{_libdir}/pulse-%{drvver}/modules/libx11prop.so
%{_libdir}/pulse-%{drvver}/modules/libx11wrap.so
%{_sysconfdir}/xdg/autostart/pulseaudio.desktop
%{_bindir}/start-pulseaudio-x11
%{_libdir}/pulse-%{drvver}/modules/module-x11-bell.so
%{_libdir}/pulse-%{drvver}/modules/module-x11-publish.so
%{_libdir}/pulse-%{drvver}/modules/module-x11-xsmp.so
%{_libdir}/pulse-%{drvver}/modules/module-x11-cork-request.so
%files module-zeroconf
%defattr(-,root,root)
%{_libdir}/pulse-%{drvver}/modules/libavahi-wrap.so
%{_libdir}/pulse-%{drvver}/modules/module-zeroconf-publish.so
%{_libdir}/pulse-%{drvver}/modules/module-zeroconf-discover.so
%{_libdir}/pulse-%{drvver}/modules/libraop.so
%{_libdir}/pulse-%{drvver}/modules/module-raop-discover.so
%{_libdir}/pulse-%{drvver}/modules/module-raop-sink.so
%files module-jack
%defattr(-,root,root)
@ -482,6 +490,7 @@ groupadd -r pulse-access &>/dev/null || :
%defattr(-,root,root)
%{_libdir}/pulse-%{drvver}/modules/libbluetooth-ipc.so
%{_libdir}/pulse-%{drvver}/modules/libbluetooth-sbc.so
%{_libdir}/pulse-%{drvver}/modules/libbluetooth-util.so
%{_libdir}/pulse-%{drvver}/modules/module-bluetooth-device.so
%{_libdir}/pulse-%{drvver}/modules/module-bluetooth-discover.so
%{_libdir}/pulse-%{drvver}/modules/module-bluetooth-proximity.so
@ -499,13 +508,9 @@ groupadd -r pulse-access &>/dev/null || :
%dir %{_sysconfdir}/pulse/
%config(noreplace) %{_sysconfdir}/pulse/client.conf
%{_libdir}/libpulse.so.*
%{_libdir}/libpulsecommon-%{drvver}.so
%{_libdir}/libpulse-simple.so.*
%files -n libpulsecore9
%defattr(-,root,root)
%{_libdir}/libpulsecore.so.*
%{_libdir}/libpulsedsp.so
%files -n libpulse-mainloop-glib0
%defattr(-,root,root)
%{_libdir}/libpulse-mainloop-glib.so.*
@ -547,6 +552,31 @@ groupadd -r pulse-access &>/dev/null || :
%files lang -f %{name}.lang
%changelog
* Tue May 12 2009 sreeves@novell.com
- Packaging changes:
+ add udev-extras to buildRequires
+ Only require alsa 1.0.18 as that version is patched on
11.1 to have needed functionality of 1.0.19
(pulseaudio-work-with-old-alsa.patch)
* Sat Apr 25 2009 sreeves@novell.com
- Update to version 0.9.15:
Please see Changelog for full details
- Add more checks for "Digital" output for choosing default sink
(pulseaudio-bnc480113-default-sink.patch)
- Drop pulseaudio-defaults-daemon-conf.patch: use upstream defaults
for default-fragments* in daemon.conf
- Packaging changes:
+ Move libpulsecore into main rpm as it's an internal only
library
+ Remove unused old replacment for default.pa
+ Move start-pulseaudio-x11 into pulseaudio-module-x11 package
* Wed Mar 25 2009 sreeves@suse.de
- Fix for bnc#480113 - default sink
- Fix for bnc#456802 - logging out of control
* Thu Feb 26 2009 sreeves@suse.de
- Fix for bnc#464994 - error messages when using pulse
- Fix for bnc#461361 - sound crackles
- Fix for bnc#469886 - HDMI sound is muted
* Tue Feb 10 2009 vuntz@novell.com
- Update Provides/Obsoletes version for esound-daemon.
* Sat Jan 24 2009 vuntz@novell.com
@ -714,7 +744,7 @@ groupadd -r pulse-access &>/dev/null || :
- Removed 'rm -rf $RPM_BUILD_ROOT' from %%install
* Mon Dec 24 2007 rodrigo@suse.de
- Use /var/lib/pulseaudio as home dir for pulseaudio user.
* Tue Dec 11 2007 rodrigo@suse.de
* Wed Dec 12 2007 rodrigo@suse.de
- Removed special permissions for pulseaudio binary to make it
buildable until the permissions thing is solved.
* Tue Dec 11 2007 rodrigo@suse.de
@ -773,7 +803,7 @@ groupadd -r pulse-access &>/dev/null || :
- fix suspend/resume with alsa backend
- fix the frame size handling in alsa backend
- fix possible NULL dereference
* Sun Oct 15 2006 schwab@suse.de
* Mon Oct 16 2006 schwab@suse.de
- Make sure config.rpath is present.
* Wed Sep 06 2006 tiwai@suse.de
- updated to version 0.9.5: