dist-git conversion

Fix typo that causes a failure to update the common directory. (releng
#2781)
2010-07-28 09:45:16 +00:00 · 2009-11-26 01:26:53 +00:00 · 2008-03-26 09:38:39 +00:00 · 2008-03-19 19:57:19 +00:00 · 2008-01-19 08:41:14 +00:00 · 2008-01-19 08:03:49 +00:00
17 changed files with 301 additions and 2840 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-/alsa-plugins-1.*.tar.bz2
+alsa-plugins-1.0.15.tar.bz2
--- a/1.0.14-buffer-attr.patch
+++ b/1.0.14-buffer-attr.patch
@ -0,0 +1,23 @@
+--- alsa-plugins-1.0.14/pulse/pcm_pulse.c	2007-05-31 10:06:51.000000000 +0200
+++ alsa-plugins-1.0.14.lennart/pulse/pcm_pulse.c	2007-09-24 01:43:01.000000000 +0200
+@@ -57,7 +57,7 @@
+ 
+     if (size > pcm->last_size) {
+         pcm->ptr += size - pcm->last_size;
+-        pcm->ptr %= pcm->buffer_attr.maxlength;
+        pcm->ptr %= pcm->buffer_attr.tlength;
+     }
+ 
+     pcm->last_size = size;
+@@ -533,9 +533,9 @@
+     pcm->ss.rate = io->rate;
+     pcm->ss.channels = io->channels;
+ 
+-    pcm->buffer_attr.maxlength = io->buffer_size * pcm->frame_size;
+    pcm->buffer_attr.maxlength = (io->buffer_size*3)/2 * pcm->frame_size;
+     pcm->buffer_attr.tlength = io->buffer_size * pcm->frame_size;
+-    pcm->buffer_attr.prebuf = io->period_size * pcm->frame_size;
+    pcm->buffer_attr.prebuf = (io->buffer_size-io->period_size) * pcm->frame_size;
+     pcm->buffer_attr.minreq = io->period_size * pcm->frame_size;
+     pcm->buffer_attr.fragsize = io->period_size * pcm->frame_size;
+ 
--- a/1.0.14-pulse-SND_PCM_STATE_PREPARED.patch
+++ b/1.0.14-pulse-SND_PCM_STATE_PREPARED.patch
@ -0,0 +1,22 @@
+diff -up alsa-plugins-1.0.14/pulse/pcm_pulse.c.pulse alsa-plugins-1.0.14/pulse/pcm_pulse.c
+--- alsa-plugins-1.0.14/pulse/pcm_pulse.c.pulse	2008-01-08 09:34:40.000000000 -1000
+++ alsa-plugins-1.0.14/pulse/pcm_pulse.c	2008-01-08 09:38:25.000000000 -1000
+@@ -512,14 +512,16 @@ finish:
+ static int pulse_hw_params(snd_pcm_ioplug_t *io, snd_pcm_hw_params_t *params)
+ {
+     snd_pcm_pulse_t *pcm = io->private_data;
+    snd_pcm_t *base = io->pcm;
+ 	int err = 0;
+ 
+     assert(pcm);
+     assert(pcm->p);
+ 
+-    pa_threaded_mainloop_lock(pcm->p->mainloop);
+    if (!(base && snd_pcm_state(base) == SND_PCM_STATE_PREPARED))
+	assert(!pcm->stream);
+ 
+-    assert(!pcm->stream);
+    pa_threaded_mainloop_lock(pcm->p->mainloop);
+ 
+     pcm->frame_size = (snd_pcm_format_physical_width(io->format) * io->channels) / 8;
+ 
--- a/1.0.14-state-xrun.patch
+++ b/1.0.14-state-xrun.patch
@ -0,0 +1,82 @@
+--- alsa-plugins-1.0.14.lennart/pulse/pcm_pulse.c	2007-09-24 01:43:01.000000000 +0200
+++ alsa-plugins-1.0.14/pulse/pcm_pulse.c	2007-10-01 21:36:53.000000000 +0200
+@@ -36,6 +36,7 @@
+     /* Since ALSA expects a ring buffer we must do some voodoo. */
+     size_t last_size;
+     size_t ptr;
+    int underrun;
+ 
+     size_t offset;
+ 
+@@ -90,7 +91,9 @@
+     if (err < 0) {
+         err = -EIO;
+         goto finish;
+-    }
+    } else
+    	pcm->underrun = 0;
+
+ 
+ finish:
+     pa_threaded_mainloop_unlock(pcm->p->mainloop);
+@@ -200,6 +203,9 @@
+ 
+ 	err = snd_pcm_bytes_to_frames(io->pcm, pcm->ptr);
+ 
+	if (pcm->underrun)
+		err = -EPIPE;
+
+ finish:
+     pa_threaded_mainloop_unlock(pcm->p->mainloop);
+ 
+@@ -231,6 +237,10 @@
+ 
+ 	*delayp = snd_pcm_bytes_to_frames(io->pcm, pa_usec_to_bytes(lat, &pcm->ss));
+ 
+ 	/* Yes, this is evil, and we're not supposed to do this.  */	
+ 	if (pcm->underrun && pcm->io.state == SND_PCM_STATE_RUNNING)
+		pcm->io.state = SND_PCM_STATE_XRUN;
+
+ finish:
+     pa_threaded_mainloop_unlock(pcm->p->mainloop);
+ 
+@@ -273,6 +283,7 @@
+         pulse_poll_deactivate(pcm->p);
+ 
+     err = size;
+    pcm->underrun = 0;
+ 
+ finish:
+     pa_threaded_mainloop_unlock(pcm->p->mainloop);
+@@ -354,6 +365,15 @@
+     pulse_poll_activate(pcm->p);
+ }
+ 
+static void stream_underrun_cb(pa_stream *p, void *userdata) {
+	snd_pcm_pulse_t *pcm = userdata;
+
+	assert(pcm);
+	assert(pcm->p);
+
+	pcm->underrun = 1;
+}
+
+ static int pulse_pcm_poll_descriptors_count(snd_pcm_ioplug_t *io)
+ {
+ 	snd_pcm_pulse_t *pcm = io->private_data;
+@@ -461,6 +481,7 @@
+ 
+     if (io->stream == SND_PCM_STREAM_PLAYBACK) {
+         pa_stream_set_write_callback(pcm->stream, stream_request_cb, pcm);
+	pa_stream_set_underflow_callback(pcm->stream, stream_underrun_cb, pcm);
+         pa_stream_connect_playback(pcm->stream, pcm->device, &pcm->buffer_attr,
+         	PA_STREAM_AUTO_TIMING_UPDATE | PA_STREAM_INTERPOLATE_TIMING, NULL, NULL);
+     } else {
+@@ -480,6 +501,7 @@
+     pcm->last_size = 0;
+     pcm->ptr = 0;
+     pcm->offset = 0;
+    pcm->underrun = 0;
+ 
+ finish:
+     pa_threaded_mainloop_unlock(pcm->p->mainloop);
--- a/alsa-git.patch
+++ b/alsa-git.patch
--- a/alsa-plugins-1.0.15-pulseclose.patch
+++ b/alsa-plugins-1.0.15-pulseclose.patch
@ -0,0 +1,23 @@
+If stream connection failes, don't assume that stream is connected upon closing.
+Lubomir Kundrak <lkundrak@redhat.com>
+
+diff -urp alsa-plugins-1.0.16.orig/pulse/pcm_pulse.c alsa-plugins-1.0.16/pulse/pcm_pulse.c
+--- alsa-plugins-1.0.16.orig/pulse/pcm_pulse.c	2008-02-05 10:25:00.000000000 +0100
+++ alsa-plugins-1.0.16/pulse/pcm_pulse.c	2008-03-08 14:33:43.000000000 +0100
+@@ -112,12 +112,14 @@ static int pulse_stop(snd_pcm_ioplug_t *
+ 
+     pa_threaded_mainloop_lock(pcm->p->mainloop);
+ 
+-    assert(pcm->stream);
+-
+     err = pulse_check_connection(pcm->p);
+     if (err < 0)
+         goto finish;
+ 
+    /* If stream connection fails, this gets called anyway */
+    if (pcm->stream == NULL)
+        goto finish;
+
+     o = pa_stream_flush(pcm->stream, pulse_stream_success_cb, pcm->p);
+     assert(o);
+ 
--- a/alsa-plugins.spec
+++ b/alsa-plugins.spec
@ -1,26 +1,24 @@
-%if 0%{?rhel}
-%bcond_with avtp
-%bcond_with jack
-%bcond_with ffmpeg
-%else
-%bcond_without avtp
-%bcond_without jack
-%bcond_without ffmpeg
-%endif
-
 Name:           alsa-plugins
-Version:        1.2.12
-Release:        6%{?dist}
+Version:        1.0.15
+Release:        3%{?dist}.1
 Summary:        The Advanced Linux Sound Architecture (ALSA) Plugins
-# All packages are LGPL-2.1-or-later with the exception of samplerate
-# which is GPL-2.0-or-later, pph plugin is BSD-3-Clause licensed
-License:        GPL-2.0-or-later and LGPL-2.1-or-later and BSD-3-Clause
+# All packages are LGPLv2+ with the exception of samplerate which is GPLv2+
+License:        GPLv2+ and LGPLv2+
+Group:          System Environment/Libraries
 URL:            http://www.alsa-project.org/
 Source0:        ftp://ftp.alsa-project.org/pub/plugins/%{name}-%{version}.tar.bz2
-Patch0:         alsa-git.patch
+Source1:        jack.conf
+Source2:        pcm-oss.conf
+Source4:        samplerate.conf
+Source5:        upmix.conf
+Source6:        vdownmix.conf
+Source7:        pulse-default.conf
+Patch0:         1.0.14-buffer-attr.patch
+Patch1:         1.0.14-state-xrun.patch
+Patch2:         1.0.14-pulse-SND_PCM_STATE_PREPARED.patch
+Patch3:         alsa-plugins-1.0.15-pulseclose.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

-BuildRequires:  autoconf automake libtool
-BuildRequires:  make
 BuildRequires:  alsa-lib-devel

 %description
@ -29,24 +27,27 @@ functionality to the Linux operating system.

 This package includes plugins for ALSA.

-%if %{with jack}
 %package jack
-Recommends:     jack-audio-connection-kit
+Requires:       jack-audio-connection-kit
 BuildRequires:  jack-audio-connection-kit-devel
 Summary:        Jack PCM output plugin for ALSA
-License:        LGPL-2.1-or-later
-
+Group:          System Environment/Libraries
+License:        LGPLv2+
 %description jack
 This plugin converts the ALSA API over JACK (Jack Audio Connection
 Kit, http://jackit.sf.net) API.  ALSA native applications can work
 transparently together with jackd for both playback and capture.
+
+    ALSA apps (playback) -> ALSA-lib -> JACK plugin -> JACK daemon
+    ALSA apps (capture) <- ALSA-lib <- JACK plugin <- JACK daemon
+
 This plugin provides the PCM type "jack"
-%endif

 %package oss
+BuildRequires:  alsa-lib-devel
 Summary:        Oss PCM output plugin for ALSA
-License:        LGPL-2.1-or-later
-
+Group:          System Environment/Libraries
+License:        LGPLv2+ 
 %description oss
 This plugin converts the ALSA API over OSS API.  With this plugin,
 ALSA native apps can run on OSS drivers.
@ -54,11 +55,11 @@ ALSA native apps can run on OSS drivers.
 This plugin provides the PCM type "oss".

 %package pulseaudio
-Recommends:     pulseaudio-daemon
-BuildRequires:  pulseaudio-libs-devel
+BuildRequires:  pulseaudio-lib-devel
+Requires:       pulseaudio
 Summary:        Alsa to PulseAudio backend
-License:        LGPL-2.1-or-later
-
+Group:          System Environment/Libraries
+License:        LGPLv2+
 %description pulseaudio
 This plugin allows any program that uses the ALSA API to access a PulseAudio
 sound daemon. In other words, native ALSA applications can play and record
@ -68,8 +69,8 @@ one for mixer control.
 %package samplerate
 BuildRequires:  libsamplerate-devel
 Summary:        External rate converter plugin for ALSA
-License:        GPL-2.0-or-later
-
+Group:          System Environment/Libraries
+License:        GPLv2+
 %description samplerate
 This plugin is an external rate converter using libsamplerate by Erik de
 Castro Lopo.
@ -77,8 +78,8 @@ Castro Lopo.
 %package upmix
 BuildRequires:  libsamplerate-devel
 Summary:        Upmixer channel expander plugin for ALSA
-License:        LGPL-2.1-or-later
-
+Group:          System Environment/Libraries
+License:        LGPLv2+
 %description upmix
 The upmix plugin is an easy-to-use plugin for upmixing to 4 or
 6-channel stream.  The number of channels to be expanded is determined
@ -87,151 +88,74 @@ by the slave PCM or explicitly via channel option.
 %package vdownmix
 BuildRequires:  libsamplerate-devel
 Summary:        Downmixer to stereo plugin for ALSA
-License:        LGPL-2.1-or-later
-
+Group:          System Environment/Libraries
+License:        LGPLv2+
 %description vdownmix
 The vdownmix plugin is a downmixer from 4-6 channels to 2-channel
 stereo headphone output.  This plugin processes the input signals with
 a simple spacialization, so the output sounds like a kind of "virtual
 surround".

-%package usbstream
-Summary:        USB stream plugin for ALSA
-License:        LGPL-2.1-or-later
-
-%description usbstream
-The usbstream plugin is for snd-usb-us122l driver. It converts PCM
-stream to USB specific stream.
-
-%package arcamav
-Summary:        Arcam AV amplifier plugin for ALSA
-License:        LGPL-2.1-or-later
-
-%description arcamav
-This plugin exposes the controls for an Arcam AV amplifier
-(see: http://www.arcam.co.uk/) as an ALSA mixer device.
-
-%package speex
-Requires:       speex speexdsp
-BuildRequires:  speex-devel speexdsp-devel
-Summary:        Rate Converter Plugin Using Speex Resampler
-License:        LGPL-2.1-or-later
-
-%description speex
-The rate plugin is an external rate converter using the Speex resampler
-(aka Public Parrot Hack) by Jean-Marc Valin. The pcm plugin provides
-pre-processing of a mono stream like denoise using libspeex DSP API.
-
-%package maemo
-BuildRequires:  dbus-devel
-Summary:        Maemo plugin for ALSA
-License:        LGPL-2.1-or-later
-
-%description maemo
-This plugin converts the ALSA API over PCM task nodes protocol. In this way,
-ALSA native applications can run over DSP Gateway and use DSP PCM task nodes.
-
-%if %{with avtp}
-%package avtp
-BuildRequires:  libavtp-devel
-Summary:        Audio Video Transport Protocol (AVTP) plugin for ALSA
-License:        LGPL-2.1-or-later
-
-%description avtp
-This plugin supports Audio Video Transport Protocol (AVTP) as specified in
-IEEE 1722-2016 spec. AVTP is part of the Audio/Video Broadcast using TSN.
-%endif
-
-%if %{with ffmpeg}
-%package a52
-BuildRequires:  ffmpeg-free-devel
-Obsoletes:      alsa-plugins-freeworld-a52 <= %{version}-%{release}
-Summary:        A52 output plugin for ALSA using libavcodec
-License:        LGPL-2.1-or-later
-
-%description a52
-This plugin converts S16 linear format to A52 compressed stream and
-send to an SPDIF output.  It requires libavcodec for encoding the
-audio stream.
-
-%package lavrate
-BuildRequires:  ffmpeg-free-devel
-Obsoletes:      alsa-plugins-freeworld-lavrate <= %{version}-%{release}
-Summary:        Rate converter plugin for ALSA using libavcodec
-License:        LGPL-2.1-or-later
-
-%description lavrate
-The plugin uses ffmpeg audio resample library to convert audio rates.
-%endif
-
 %prep
-%autosetup -n %{name}-%{version}%{?prever} -p1
+%setup -q -n %{name}-%{version}
+%patch0 -p1 -b .buffer_attr
+%patch1 -p1 -b .state_xrun
+%patch2 -p1 -b .pulse-SND_PCM_STATE_PREPARED
+%patch3 -p1 -b .pulseclose

 %build
-autoreconf -vif
 %configure --disable-static \
-           --with-speex=lib \
-           --enable-maemo-plugin \
-           --enable-maemo-resource-manager
-%make_build
+           --without-speex
+make %{?_smp_mflags}

 %install
-%make_install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT

-mv %{buildroot}%{_sysconfdir}/alsa/conf.d/99-pulseaudio-default.conf.example \
-        %{buildroot}%{_sysconfdir}/alsa/conf.d/99-pulseaudio-default.conf
+install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa/pcm
+install -m 644 %SOURCE1 %SOURCE2 \
+               %SOURCE4 %SOURCE5 %SOURCE6 \
+                   ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa/pcm
+install -m 644 %SOURCE7 \
+                   ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa

-find %{buildroot} -name "*.la" -delete
+find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \;

+# Removing the maemo plugins
+find $RPM_BUILD_ROOT \( -name libasound_module_ctl_dsp_ctl.so -o \
+                        -name libasound_module_pcm_alsa_dsp.so \) -exec rm {} \;
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig

-%if %{with jack}
 %files jack
-%license COPYING COPYING.GPL
-%doc doc/README-jack
-%dir %{_sysconfdir}/alsa
-%dir %{_sysconfdir}/alsa/conf.d
-%config(noreplace) %{_sysconfdir}/alsa/conf.d/50-jack.conf
-%dir %{_datadir}/alsa/alsa.conf.d
-%{_datadir}/alsa/alsa.conf.d/50-jack.conf
-%dir %{_libdir}/alsa-lib
+%defattr(-,root,root,-)
+%doc COPYING COPYING.GPL doc/README-jack
+%config(noreplace) %{_sysconfdir}/alsa/pcm/jack.conf
 %{_libdir}/alsa-lib/libasound_module_pcm_jack.so
-%endif

 %files oss
-%license COPYING COPYING.GPL
-%doc doc/README-pcm-oss
-%dir %{_sysconfdir}/alsa
-%dir %{_sysconfdir}/alsa/conf.d
-%config(noreplace) %{_sysconfdir}/alsa/conf.d/50-oss.conf
-%dir %{_datadir}/alsa/alsa.conf.d
-%{_datadir}/alsa/alsa.conf.d/50-oss.conf
-%dir %{_libdir}/alsa-lib
+%defattr(-,root,root,-)
+%doc COPYING COPYING.GPL doc/README-pcm-oss
+%config(noreplace) %{_sysconfdir}/alsa/pcm/pcm-oss.conf
 %{_libdir}/alsa-lib/libasound_module_ctl_oss.so
 %{_libdir}/alsa-lib/libasound_module_pcm_oss.so

 %files pulseaudio
-%license COPYING COPYING.GPL
-%doc doc/README-pulse
-%dir %{_libdir}/alsa-lib
+%defattr(-,root,root,-)
+%doc COPYING COPYING.GPL doc/README-pulse
+%config(noreplace) %{_sysconfdir}/alsa/pulse-default.conf
 %{_libdir}/alsa-lib/libasound_module_pcm_pulse.so
 %{_libdir}/alsa-lib/libasound_module_ctl_pulse.so
-%{_libdir}/alsa-lib/libasound_module_conf_pulse.so
-%dir %{_sysconfdir}/alsa
-%dir %{_sysconfdir}/alsa/conf.d
-%config(noreplace) %{_sysconfdir}/alsa/conf.d/50-pulseaudio.conf
-%config(noreplace) %{_sysconfdir}/alsa/conf.d/99-pulseaudio-default.conf
-%dir %{_datadir}/alsa/alsa.conf.d
-%{_datadir}/alsa/alsa.conf.d/50-pulseaudio.conf

 %files samplerate
-%license COPYING COPYING.GPL
-%doc doc/samplerate.txt
-%dir %{_sysconfdir}/alsa
-%dir %{_sysconfdir}/alsa/conf.d
-%config(noreplace) %{_sysconfdir}/alsa/conf.d/10-samplerate.conf
-%dir %{_datadir}/alsa/alsa.conf.d
-%{_datadir}/alsa/alsa.conf.d/10-samplerate.conf
-%dir %{_libdir}/alsa-lib
+%defattr(-,root,root,-)
+%doc COPYING COPYING.GPL doc/samplerate.txt
+%config(noreplace) %{_sysconfdir}/alsa/pcm/samplerate.conf
 %{_libdir}/alsa-lib/libasound_module_rate_samplerate.so
 %{_libdir}/alsa-lib/libasound_module_rate_samplerate_best.so
 %{_libdir}/alsa-lib/libasound_module_rate_samplerate_linear.so
@ -239,381 +163,23 @@ find %{buildroot} -name "*.la" -delete
 %{_libdir}/alsa-lib/libasound_module_rate_samplerate_order.so

 %files upmix
-%license COPYING COPYING.GPL
-%doc doc/upmix.txt
-%dir %{_sysconfdir}/alsa
-%dir %{_sysconfdir}/alsa/conf.d
-%config(noreplace) %{_sysconfdir}/alsa/conf.d/60-upmix.conf
-%dir %{_datadir}/alsa/alsa.conf.d
-%{_datadir}/alsa/alsa.conf.d/60-upmix.conf
-%dir %{_libdir}/alsa-lib
+%defattr(-,root,root,-)
+%doc COPYING COPYING.GPL doc/upmix.txt
+%config(noreplace) %{_sysconfdir}/alsa/pcm/upmix.conf
 %{_libdir}/alsa-lib/libasound_module_pcm_upmix.so

 %files vdownmix
-%license COPYING COPYING.GPL
-%doc doc/vdownmix.txt
-%dir %{_sysconfdir}/alsa
-%dir %{_sysconfdir}/alsa/conf.d
-%config(noreplace) %{_sysconfdir}/alsa/conf.d/60-vdownmix.conf
-%dir %{_datadir}/alsa/alsa.conf.d
-%{_datadir}/alsa/alsa.conf.d/60-vdownmix.conf
-%dir %{_libdir}/alsa-lib
+%defattr(-,root,root,-)
+%doc COPYING COPYING.GPL doc/vdownmix.txt
+%config(noreplace) %{_sysconfdir}/alsa/pcm/vdownmix.conf
 %{_libdir}/alsa-lib/libasound_module_pcm_vdownmix.so

-%files usbstream
-%license COPYING COPYING.GPL
-%dir %{_sysconfdir}/alsa
-%dir %{_sysconfdir}/alsa/conf.d
-%config(noreplace) %{_sysconfdir}/alsa/conf.d/98-usb-stream.conf
-%dir %{_datadir}/alsa/alsa.conf.d
-%{_datadir}/alsa/alsa.conf.d/98-usb-stream.conf
-%dir %{_libdir}/alsa-lib
-%{_libdir}/alsa-lib/libasound_module_pcm_usb_stream.so
-
-%files arcamav
-%license COPYING COPYING.GPL
-%doc doc/README-arcam-av
-%dir %{_sysconfdir}/alsa
-%dir %{_sysconfdir}/alsa/conf.d
-%config(noreplace) %{_sysconfdir}/alsa/conf.d/50-arcam-av-ctl.conf
-%dir %{_datadir}/alsa/alsa.conf.d
-%{_datadir}/alsa/alsa.conf.d/50-arcam-av-ctl.conf
-%dir %{_libdir}/alsa-lib
-%{_libdir}/alsa-lib/libasound_module_ctl_arcam_av.so
-
-%files speex
-%license COPYING COPYING.GPL
-%doc doc/speexdsp.txt doc/speexrate.txt
-%dir %{_sysconfdir}/alsa
-%dir %{_sysconfdir}/alsa/conf.d
-%config(noreplace) %{_sysconfdir}/alsa/conf.d/10-speexrate.conf
-%config(noreplace) %{_sysconfdir}/alsa/conf.d/60-speex.conf
-%dir %{_datadir}/alsa/alsa.conf.d
-%{_datadir}/alsa/alsa.conf.d/10-speexrate.conf
-%{_datadir}/alsa/alsa.conf.d/60-speex.conf
-%dir %{_libdir}/alsa-lib
-%{_libdir}/alsa-lib/libasound_module_pcm_speex.so
-%{_libdir}/alsa-lib/libasound_module_rate_speexrate.so
-%{_libdir}/alsa-lib/libasound_module_rate_speexrate_best.so
-%{_libdir}/alsa-lib/libasound_module_rate_speexrate_medium.so
-
-%files maemo
-%license COPYING COPYING.GPL
-%doc doc/README-maemo
-%dir %{_sysconfdir}/alsa
-%dir %{_sysconfdir}/alsa/conf.d
-%config(noreplace) %{_sysconfdir}/alsa/conf.d/98-maemo.conf
-%dir %{_datadir}/alsa/alsa.conf.d
-%{_datadir}/alsa/alsa.conf.d/98-maemo.conf
-%dir %{_libdir}/alsa-lib
-%{_libdir}/alsa-lib/libasound_module_ctl_dsp_ctl.so
-%{_libdir}/alsa-lib/libasound_module_pcm_alsa_dsp.so
-
-%if %{with avtp}
-%files avtp
-%license COPYING COPYING.GPL
-%{_libdir}/alsa-lib/libasound_module_pcm_aaf.so
-%endif
-
-%if %{with ffmpeg}
-%files a52
-%license COPYING COPYING.GPL
-%doc doc/a52.txt
-%dir %{_sysconfdir}/alsa
-%dir %{_sysconfdir}/alsa/conf.d
-%config(noreplace) %{_sysconfdir}/alsa/conf.d/60-a52-encoder.conf
-%dir %{_datadir}/alsa/alsa.conf.d
-%{_datadir}/alsa/alsa.conf.d/60-a52-encoder.conf
-%dir %{_libdir}/alsa-lib
-%{_libdir}/alsa-lib/libasound_module_pcm_a52.so
-
-%files lavrate
-%license COPYING COPYING.GPL
-%doc doc/lavrate.txt
-%dir %{_sysconfdir}/alsa
-%dir %{_sysconfdir}/alsa/conf.d
-%config(noreplace) %{_sysconfdir}/alsa/conf.d/10-rate-lav.conf
-%dir %{_datadir}/alsa/alsa.conf.d
-%{_datadir}/alsa/alsa.conf.d/10-rate-lav.conf
-%dir %{_libdir}/alsa-lib
-%{_libdir}/alsa-lib/libasound_module_rate_lavrate.so
-%{_libdir}/alsa-lib/libasound_module_rate_lavrate_fast.so
-%{_libdir}/alsa-lib/libasound_module_rate_lavrate_faster.so
-%{_libdir}/alsa-lib/libasound_module_rate_lavrate_high.so
-%{_libdir}/alsa-lib/libasound_module_rate_lavrate_higher.so
-%endif
-
 %changelog
-* Wed Oct 01 2025 Dominik Mierzejewski <dominik@greysector.net> - 1.2.12-6
- Rebuilt for FFmpeg 8
+* Wed Mar 26 2008 Lubomir Kundrak <lkundrak@redhat.com> - 1.0.15-3.1
+- Merge the pulseaudio assert fix from devel

-* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.12-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.12-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Mon Sep 23 2024 Fabio Valentini <decathorpe@gmail.com> - 1.2.12-3
- Rebuild for ffmpeg 7
-
-* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.12-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Tue Jun 11 2024 Jaroslav Kysela <perex@perex.cz> - 1.2.12-1
- Updated to 1.2.12
-
-* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.7.1-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.7.1-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Aug 25 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 1.2.7.1-8
- Disable avtp plugin in RHEL builds
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.7.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Tue Jun  6 2023 Jaroslav Kysela <perex@perex.cz> - 1.2.7.1-6
- change to SPDX licenses
-
-* Sun Mar 12 2023 Neal Gompa <ngompa@fedoraproject.org> - 1.2.7.1-5
- Rebuild for ffmpeg 6.0
-
-* Mon Mar  6 2023 Jaroslav Kysela <perex@perex.cz> - 1.2.7.1-4
- Enable avtp plugin - Peter Robinson <pbrobinson@fedoraproject.org>
- Enable a52 and lavrate plugins - Yaakov Selkowitz <yselkowi@redhat.com>
- Remove or soften excess dependendencies - Yaakov Selkowitz <yselkowi@redhat.com>
- CI test & RHEL cleanups
-
-* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.7.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.7.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Fri Jun 17 2022 Jaroslav Kysela <perex@perex.cz> - 1.2.7.1-1
- Updated to 1.2.7.1
-
-* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Mon Dec  6 2021 Jaroslav Kysela <perex@perex.cz> - 1.2.6-1
- Updated to 1.2.6
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Sun May 30 2021 Jaroslav Kysela <perex@perex.cz> - 1.2.5-1
- Updated to 1.2.5
- Modernize the spec file (Neal Gompa)
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Mon Jan 04 2021 Rex Dieter <rdieter@fedoraproject.org> - 1.2.2-4
- -pulseaudio: Requires: pulseaudio-daemon
-
-* Fri Jul 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-3
- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Feb 19 2020 Jaroslav Kysela <perex@perex.cz> - 1.2.2-1
- Updated to 1.2.2
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Nov 13 2019 Jaroslav Kysela <perex@perex.cz> - 1.2.1-1
- Updated to 1.2.1
-
-* Tue Aug 20 2019 Gwyn Ciesla <gwync@protonmail.com> - 1.1.9-3
- macroize %%{_sysconfdir}.
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri May 10 2019 Jaroslav Kysela <perex@perex.cz> - 1.1.9-1
- Updated to 1.1.9
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Mon Jan  7 2019 Jaroslav Kysela <perex@perex.cz> - 1.1.8-1
- Updated to 1.1.8
-
-* Wed Oct 24 2018 Jaroslav Kysela <perex@perex.cz> - 1.1.7-2
- Updated to 1.1.7
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.6-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Mon Apr 16 2018 Jaroslav Kysela <perex@perex.cz> - 1.1.6-3
- /etc/alsa/conf.d contains symlinks to /usr/share/alsa/alsa.conf.d templates
-
-* Wed Apr 04 2018 Jaroslav Kysela <perex@perex.cz> - 1.1.6-2
- Changed the add-on config directory to /etc/alsa/conf.d
- Changed the config files
-
-* Tue Apr 03 2018 Jaroslav Kysela <perex@perex.cz> - 1.1.6-1
- Updated to 1.1.6
-
-* Sun Feb 25 2018 Ralf Corsépius <corsepiu@fedoraproject.org> - 1.1.5-3
- Let plugin packages own %%{_libdir}/alsa-lib (RHBZ#1548865)
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Tue Nov 14 2017 Jaroslav Kysela <perex@perex.cz> - 1.1.5-1
- Updated to 1.1.5
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Tue May 16 2017 Jaroslav Kysela <perex@perex.cz> - 1.1.4-1
- Updated to 1.1.4
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Thu Mar 31 2016 Jaroslav Kysela <perex@perex.cz> - 1.1.1-1
- Updated to 1.1.1
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Tue Oct 27 2015 Jaroslav Kysela <perex@perex.cz> - 1.1.0-1
- Updated to 1.1.0
-
-* Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.29-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Thu Feb 26 2015 Jaroslav Kysela <perex@perex.cz> - 1.0.29-1
- Updated to 1.0.29
-
-* Thu Jan 29 2015 Peter Robinson <pbrobinson@fedoraproject.org> 1.0.28-4
- Add speexdsp-devel as a dep to fix FTBFS
-
-* Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.28-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Thu Jul 24 2014 Peter Robinson <pbrobinson@fedoraproject.org> 1.0.28-2
- Fix Source1 conditional for src.rpm generation (RHBZ 856543)
-
-* Thu Jul 24 2014 Peter Robinson <pbrobinson@fedoraproject.org> 1.0.28-1
- Update to 1.0.28
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.27-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.27-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Fri Apr 12 2013 Jaroslav Kysela <jkysela@redhat.com> - 1.0.27-1
- Updated to 1.0.27
-
-* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.26-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Thu Sep  6 2012 Jaroslav Kysela <jkysela@redhat.com> - 1.0.26-2
- Changed dependency on pulseaudio-lib-devel to pulseaudio-libs-devel
-
-* Thu Sep  6 2012 Jaroslav Kysela <jkysela@redhat.com> - 1.0.26-1
- Updated to 1.0.26
-
-* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.25-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Mon Apr 23 2012 Paul Howarth <paul@city-fan.org> - 1.0.25-3
- Bump and rebuild to maintain upgrade path (#806218)
-
-* Wed Feb  1 2012 Jaroslav Kysela <jkysela@redhat.com> - 1.0.25-1
- Updated to 1.0.25
- Moved plugin specific configuration from /etc/alsa/pcm to /usr/share/alsa/alsa.conf.d
-
-* Thu Jan 19 2012 Nikola Pajkovsky <npajkovs@redhat.com> - 1.0.24-4
- 761244 - please disable JACK for RHEL
-
-* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.24-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.24-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Fri Jan 28 2011 Jaroslav Kysela <jkysela@redhat.com> - 1.0.24-1
- Updated to 1.0.24
-
-* Thu Jan 14 2010 Jaroslav Kysela <jkysela@redhat.com> - 1.0.22-1
- Updated to 1.0.22
-
-* Mon Sep 7 2009 Eric Moret <eric.moret@gmail.com> - 1.0.21-2
- Added missing dbus-devel dependency to maemo subpackage
-
-* Mon Sep 7 2009 Eric Moret <eric.moret@gmail.com> - 1.0.21-1
- Updated to 1.0.21
- Patch clean up
- Added maemo subpackage
-
-* Tue Aug 4 2009 Lennart Poettering <lpoetter@redhat.com> - 1.0.20-5
- Add a couple of more clean up patches for the pulse plugin
-
-* Fri Jul 31 2009 Lennart Poettering <lpoetter@redhat.com> - 1.0.20-4
- Add a couple of clean up patches for the pulse plugin
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.20-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Jun 24 2009 Eric Moret <eric.moret@gmail.com> - 1.0.20-2
- Added speex subpackage
- Removed ascii-art from jack's plugin description
-
-* Fri May 8 2009 Eric Moret <eric.moret@gmail.com> - 1.0.20-1
- Updated to 1.0.20
- Added arcam-av subpackage
-
-* Fri Apr 24 2009 Eric Moret <eric.moret@gmail.com> - 1.0.19-1
- Updated to 1.0.19
- Added Requires: alsa-utils to address #483322
- Added dir {_sysconfdir}/alsa/pcm to address #483322
-
-* Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.18-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Sun Dec 28 2008 Eric Moret <eric.moret@gmail.com> - 1.0.18-2
- Updated to 1.0.18 final
-
-* Thu Sep 11 2008 Jaroslav Kysela <jkysela@redhat.com> - 1.0.18-1.rc3
- Updated to 1.0.18rc3
- Added usbstream subpackage
-
-* Mon Jul 21 2008 Jaroslav Kysela <jkysela@redhat.com> - 1.0.17-1
- Updated to 1.0.17
-
-* Tue Mar 25 2008 Lubomir Kundrak <lkundrak@redhat.com> - 1.0.16-4
- Kind of fix the plugins not to complain about the hints
-
-* Wed Mar 19 2008 Eric Moret <eric.moret@gmail.com> - 1.0.16-3
- Fixing jack.conf (#435343)
-
-* Sun Mar 09 2008 Lubomir Kundrak <lkundrak@redhat.com> - 1.0.16-2
- Add descriptions to various PCM plugins, so they're visible in aplay -L
-
-* Sat Mar 08 2008 Lubomir Kundrak <lkundrak@redhat.com> - 1.0.16-1
- New upstream, dropping upstreamed patches
- Do not assert fail when pulseaudio is unavailable (#435148)
-
-* Tue Mar 04 2008 Lubomir Kundrak <lkundrak@redhat.com> - 1.0.15-4
- Be more heplful when there's PulseAudio trouble.
- This may save us some bogus bug reports
-
-* Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.0.15-3
- Autorebuild for GCC 4.3
+* Wed Mar 19 2008 Eric Moret <eric.moret@gmail.com> - 1.0.15-3
+- Fix jack.conf (#435343)

 * Fri Jan 18 2008 Eric Moret <eric.moret@epita.fr> - 1.0.15-2
 - Update to upstream 1.0.15 (#429249)
--- a/jack.conf
+++ b/jack.conf
@ -0,0 +1,13 @@
+# The jack plugin configuration
+
+pcm.jack {
+	type jack
+	playback_ports {
+		0 alsa_pcm:playback_1
+		1 alsa_pcm:playback_2
+	}
+	capture_ports {
+		0 alsa_pcm:capture_1
+		1 alsa_pcm:capture_2
+	}
+}
--- a/pcm-oss.conf
+++ b/pcm-oss.conf
@ -0,0 +1,6 @@
+# pcm-oss plugin configuration
+
+pcm.oss {
+	type oss
+	device /dev/dsp
+}
--- a/plugin-config.patch
+++ b/plugin-config.patch
--- a/pulse-default.conf
+++ b/pulse-default.conf
@ -0,0 +1,22 @@
+# PulseAudio plugin configuration
+
+# Let's create a virtual device "pulse" for mixer and PCM
+
+pcm.pulse {
+    type pulse
+}
+
+ctl.pulse {
+    type pulse
+}
+
+# Let's make it the default!
+
+pcm.!default {
+    type pulse
+}
+
+ctl.!default {
+    type pulse
+}
+
--- a/samplerate.conf
+++ b/samplerate.conf
@ -0,0 +1,7 @@
+# samplerate plugin configuration
+
+pcm.my_rate {
+	type rate
+	slave.pcm "hw"
+	converter "samplerate"
+}
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (alsa-plugins-1.2.12.tar.bz2) = b2064eb32662662f422f6e7c71f503d82c68d7a7059c8197bdd61ee08735b3ee104c6a5f9e3451e81124634514b91fc89d05d33041d9c2bb0f55b3c2ac3271b1
+908c2dd7ec33bc8e1fcd5e92c7e5e125  alsa-plugins-1.0.15.tar.bz2
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@ -1,15 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-# install speaker-test
-dnf install -y alsa-utils
-
-# create patest user
-adduser patest
-
-# run pulseaudio daemon
-su - patest -c "pulseaudio --start --log-target=stderr"
-
-# run pulseaudio test (null sink)
-su - patest -c "speaker-test -D pulse -l 1"
--- a/tests/tests.yml
+++ b/tests/tests.yml
@ -1,11 +0,0 @@
- hosts: localhost
-  roles:
-    - role: standard-test-basic
-      tags:
-        - classic
-      required_packages:
-        - pulseaudio
-      tests:
-        - simple:
-            dir: .
-            run: ./run_tests.sh
--- a/upmix.conf
+++ b/upmix.conf
@ -0,0 +1,6 @@
+# upmix plugin configuration
+
+pcm.upmix51 {
+	type upmix
+	slave.pcm "surround51"
+}
--- a/vdownmix.conf
+++ b/vdownmix.conf
@ -0,0 +1,11 @@
+# vdownmix plugin configuration
+
+pcm.!surround51 {
+	type vdownmix
+	slave.pcm "default"
+}
+
+pcm.!surround40 {
+	type vdownmix
+	slave.pcm "default"
+}
Author	SHA1	Message	Date
Fedora Release Engineering	df14212f33	dist-git conversion	2010-07-28 09:45:16 +00:00
Bill Nottingham	88874f9c54	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-26 01:26:53 +00:00
Lubomir Rintel	b39f3d5428	- Merge the pulseaudio assert fix from devel	2008-03-26 09:38:39 +00:00
Eric Moret	4fe5f4f687	Fix jack.conf	2008-03-19 19:57:19 +00:00
Eric Moret	9e2204b9fd	Release update	2008-01-19 08:41:14 +00:00
Eric Moret	cc2ded432b	- Update to upstream 1.0.15 (#429249 ) - Add "Requires: pulseaudio" to alsa-plugins-pulseaudio (#368891) - Fix pulse_hw_params() when state is SND_PCM_STATE_PREPARED (#428030) - run /sbin/ldconfig on post and postun macros	2008-01-19 08:03:49 +00:00
Jesse Keating	eb4a7cb47f	Initialize branch F-8 for alsa-plugins	2007-10-20 03:57:22 +00:00