diff --git a/asound.conf.pulseaudio b/asound.conf.pulseaudio new file mode 100644 index 0000000..356b031 --- /dev/null +++ b/asound.conf.pulseaudio @@ -0,0 +1,249 @@ +# +# openmamba system default Advanced Linux Sound Architecture (ALSA) configuration for Pulseaudio +# + +pcm.!default { + type pulse +} + +ctl.!default { + type pulse +} + +# Jack Loop 1 + +############ ALSA Side ############ + +###################################### +# Playback Device for Alsa Programs. # +###################################### + +pcm.jack_playback_1 { + type plug + slave.pcm "hw:Loopback,0,0" +} + +##################################### +# Capture Device for Alsa Programs. # +##################################### + +pcm.jack_capture_1 { + type plug + slave.pcm "hw:Loopback,0,1" +} + +######################################### +# Full-Duplex Device for Alsa Programs. # +######################################### + +pcm.jack_link_1 { + type asym + playback.pcm "jack_playback_1" + capture.pcm "jack_capture_1" + hint { + show on + description "ALSA Jack Interface 1" + } +} + + +############ JACK Side ############ + +#################################### +# ALSA Input for Jack Connections. # +#################################### + +pcm.alsa_input_1 { + type plug + slave.pcm "hw:Loopback,1,0" +} + +##################################### +# ALSA Output for Jack Connections. # +##################################### + +pcm.alsa_output_1 { + type plug + slave.pcm "hw:Loopback,1,1" +} + +# Jack Loop 2 + +############ ALSA Side ############ + +###################################### +# Playback Device for Alsa Programs. # +###################################### + +pcm.jack_playback_2 { + type plug + slave.pcm "hw:Loopback,0,2" +} + +##################################### +# Capture Device for Alsa Programs. # +##################################### + +pcm.jack_capture_2 { + type plug + slave.pcm "hw:Loopback,0,3" +} + +######################################### +# Full-Duplex Device for Alsa Programs. # +######################################### + +pcm.jack_link_2 { + type asym + playback.pcm "jack_playback_2" + capture.pcm "jack_capture_2" + hint { + show on + description "ALSA Jack Interface 2" + } +} + + +############ JACK Side ############ + +#################################### +# ALSA Input for Jack Connections. # +#################################### + +pcm.alsa_input_2 { + type plug + slave.pcm "hw:Loopback,1,2" +} + +##################################### +# ALSA Output for Jack Connections. # +##################################### + +pcm.alsa_output_2 { + type plug + slave.pcm "hw:Loopback,1,3" +} + + + + +############### +# Jack Loop 3 ############################################## +############### + +############ ALSA Side ############ + +###################################### +# Playback Device for Alsa Programs. # +###################################### + +pcm.jack_playback_3 { + type plug + slave.pcm "hw:Loopback,0,4" +} + +##################################### +# Capture Device for Alsa Programs. # +##################################### + +pcm.jack_capture_3 { + type plug + slave.pcm "hw:Loopback,0,5" +} + +######################################### +# Full-Duplex Device for Alsa Programs. # +######################################### + +pcm.jack_link_3 { + type asym + playback.pcm "jack_playback_3" + capture.pcm "jack_capture_3" + hint { + show on + description "ALSA Jack Interface 3" + } +} + + +############ JACK Side ############ + +#################################### +# ALSA Input for Jack Connections. # +#################################### + +pcm.alsa_input_3 { + type plug + slave.pcm "hw:Loopback,1,4" +} + +##################################### +# ALSA Output for Jack Connections. # +##################################### + +pcm.alsa_output_3 { + type plug + slave.pcm "hw:Loopback,1,5" +} + + + + +############### +# Jack Loop 4 ############################################## +############### + +############ ALSA Side ############ + +###################################### +# Playback Device for Alsa Programs. # +###################################### + +pcm.jack_playback_4 { + type plug + slave.pcm "hw:Loopback,0,6" +} + +##################################### +# Capture Device for Alsa Programs. # +##################################### + +pcm.jack_capture_4 { + type plug + slave.pcm "hw:Loopback,0,7" +} + +######################################### +# Full-Duplex Device for Alsa Programs. # +######################################### + +pcm.jack_link_4 { + type asym + playback.pcm "jack_playback_4" + capture.pcm "jack_capture_4" + hint { + show on + description "ALSA Jack Interface 4" + } +} + + +############ JACK Side ############ + +#################################### +# ALSA Input for Jack Connections. # +#################################### + +pcm.alsa_input_4 { + type plug + slave.pcm "hw:Loopback,1,6" +} + +##################################### +# ALSA Output for Jack Connections. # +##################################### + +pcm.alsa_output_4 { + type plug + slave.pcm "hw:Loopback,1,7" +} diff --git a/pulseaudio.spec b/pulseaudio.spec index e52c429..096a81b 100644 --- a/pulseaudio.spec +++ b/pulseaudio.spec @@ -1,7 +1,7 @@ %define majver %(echo %{version} | cut -d. -f 1-2) Name: pulseaudio Version: 5.0 -Release: 1mamba +Release: 2mamba Summary: Improved Linux sound server Group: System/Libraries Vendor: openmamba @@ -11,14 +11,16 @@ URL: http://pulseaudio.org/ Source0: http://freedesktop.org/software/pulseaudio/releases/pulseaudio-%{version}.tar.xz Source1: pulseaudio.png Source2: default.pa-for-gdm +Source3: asound.conf.pulseaudio Patch0: pulseaudio-0.9.22-desktop.patch Patch25: pulseaudio-0.9.14-mixer-select.patch License: LGPL ## AUTOBUILDREQ-BEGIN -BuildRequires: GConf-devel -BuildRequires: ORBit2-devel +BuildRequires: elfutils-devel BuildRequires: glibc-devel +BuildRequires: libGConf-devel BuildRequires: libICE-devel +BuildRequires: libORBit2-devel BuildRequires: libSM-devel BuildRequires: libX11-devel BuildRequires: libXau-devel @@ -32,6 +34,7 @@ BuildRequires: libavahi-devel BuildRequires: libcap-devel BuildRequires: libdbus-devel BuildRequires: libdbus-glib-devel +BuildRequires: libelf-devel BuildRequires: libffi-devel BuildRequires: libfftw-devel BuildRequires: libflac-devel @@ -45,23 +48,21 @@ BuildRequires: liblzma-devel BuildRequires: libogg-devel BuildRequires: libopenssl-devel BuildRequires: liborc-devel -BuildRequires: libpcre-devel BuildRequires: libsamplerate-devel BuildRequires: libsbc-devel BuildRequires: libselinux-devel -BuildRequires: libsepol-devel BuildRequires: libsndfile-devel BuildRequires: libspeex-devel BuildRequires: libssp-devel +BuildRequires: libsystemd-devel BuildRequires: libtdb-devel +BuildRequires: libudev-devel BuildRequires: libuuid-devel BuildRequires: libvorbis-devel BuildRequires: libwrap-devel BuildRequires: libxcb-devel BuildRequires: libz-devel BuildRequires: lirc-devel -BuildRequires: systemd-devel -BuildRequires: udev-devel ## AUTOBUILDREQ-END BuildRequires: automake BuildRequires: doxygen @@ -85,6 +86,7 @@ BuildConflicts: hal-devel Requires: lib%{name}-core = %{version}-%{release} Requires: rtkit Requires: udev +Requires(post): /usr/sbin/alternatives BuildRoot: %{_tmppath}/%{name}-%{version}-root # ---{ pulseaudio 0.9.22 }--- @@ -342,6 +344,7 @@ mkdir -p %{buildroot}%{_localstatedir}/run/pulse mkdir -p %{buildroot}%{_datadir}/pixmaps install -m 644 %{S:1} %{buildroot}%{_datadir}/pixmaps +install -m 0644 %{S:3} %{buildroot}%{_sysconfdir}/asound.conf.pulseaudio %find_lang %{name} @@ -355,10 +358,21 @@ install -m 644 %{S:1} %{buildroot}%{_datadir}/pixmaps %{_sbindir}/groupadd -r pulse-access || : exit 0 -%post -p /sbin/ldconfig +%post +/sbin/ldconfig +if [ $1 -ge 1 ]; then + /usr/sbin/alternatives --install \ + /etc/asound.conf asound.conf /etc/asound.conf.pulseaudio 30 + /usr/sbin/alternatives --auto asound.conf +fi +: %postun /sbin/ldconfig +if [ $1 -eq 0 ]; then + /usr/sbin/update-alternatives --remove asound.conf /etc/asound.conf.pulseaudio +fi +: %post -n lib%{name}-glib -p /sbin/ldconfig %postun -n lib%{name}-glib -p /sbin/ldconfig @@ -376,6 +390,7 @@ exit 0 %files %defattr(-,root,root) %{_sysconfdir}/bash_completion.d/pulseaudio-bash-completion.sh +%{_sysconfdir}/asound.conf.pulseaudio %dir %{_sysconfdir}/pulse %config(noreplace) %{_sysconfdir}/pulse/daemon.conf %config(noreplace) %{_sysconfdir}/pulse/default.pa @@ -517,7 +532,7 @@ exit 0 %files esound-compat %defattr(-,root,root) %{_bindir}/esdcompat -%{_mandir}/man1/esdcompat.1.gz +%{_mandir}/man1/esdcompat.1* %files -n lib%{name}-glib %defattr(-,root,root) @@ -613,6 +628,9 @@ exit 0 %{_libdir}/pulse-%{majver}/modules/*.a %changelog +* Sat Aug 23 2014 Silvan Calarco 5.0-2mamba +- add as alternative asound.conf sink and make the default + * Mon Mar 10 2014 Silvan Calarco 5.0-1mamba - update to 5.0