alsa-1.0.25

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@6650 ec354946-7b23-47d6-9f5a-488ba84defc7

a/alsa-firmware/alsa-firmware-vl.spec

@@ -5,8 +5,8 @@
 Summary:        Firmware for several ALSA-supported sound cards
 Summary(ja):    ALSA がサポートするサウンドカード用のファームウェア
 Name:           alsa-firmware
-Version:        1.0.23
-Release:        2%{?_dist_release}
+Version:        1.0.25
+Release:        1%{?_dist_release}
 # See later in the spec for a breakdown of licensing
 License:        GPL+ and BSD and GPLv2+ and GPLv2 and LGPLv2+
 Group:          Applications/Multimedia
@@ -16,7 +16,7 @@ URL:            http://www.alsa-project.org/
 # To generate the "pruned" tarball, extract the original source, remove
 # the emi_26_62 directory and create a new tarball with a "-pruned" suffix.
 # Original source: ftp://ftp.alsa-project.org/pub/firmware/%{name}-%{version}.tar.bz2
-Source0:        %{name}-%{version}-pruned.tar.bz2
+Source0:        %{name}-%{version}.tar.bz2
 Source1:        alsa-firmware.README
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       alsa-tools-firmware >= %{version}
@@ -192,6 +192,9 @@ rm -rf $RPM_BUILD_ROOT
 # License: GPL (undefined version)
 /lib/firmware/pcxhr
 
+# License: GPL (undefined version)
+/lib/firmware/rpm_firmware.bin
+
 # License: GPLv2+
 /lib/firmware/sb16
 
@@ -210,6 +213,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Jul 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 1.0.25-1
+- new upstream release
+
 * Sun May 08 2011 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 1.0.23-2
 - rebuild
 - define the _binaries_in_noarch_packages_terminate_build macro to 0,

a/alsa-lib/alsa-lib-vl.spec

@@ -2,13 +2,12 @@
 Summary: Advanced Linux Sound Architecture (ALSA) Library
 Summary(ja): Advanced Linux Sound Architecture (ALSA) ライブラリ
 Name: alsa-lib
-Version: 1.0.23
-Release: 2%{?_dist_release}
+Version: 1.0.25
+Release: 1%{?_dist_release}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: ftp://ftp.alsa-project.org/pub/lib/alsa-lib-%{version}.tar.bz2
 Patch2:  alsa-lib-1.0.14-glibc-open.patch
-Patch3:  alsa-lib-pulse-default.patch
 Patch4:  alsa-lib-1.0.16-no-dox-date.patch
 Patch10: alsa-lib-1.0.15-dmix-not-use-audio-group.patch
 
@@ -178,7 +177,6 @@ alsa-lib-develパッケージは静的ライブラリとヘッダファイルを
 %prep
 %setup -q
 %patch2 -p1 -b .glibc-open
-%patch3 -p1 -b .pulse-default
 %patch4 -p1 -b .no-dox-date
 #%patch5 -p1 -b .softvolmute
 #%patch6 -p1 -b .clamprrfw
@@ -243,6 +241,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Jul 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.0.25-1
+- new upstream release
+- remove Patch3 (alsa-lib-pulse-default.patch)
+
 * Sun Sep 26 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.0.23-2
 - rebuild with rpm-4.8.1 for pkg-config file
 

a/alsa-oss/alsa-oss-vl.spec

@@ -1,6 +1,6 @@
 Summary:	Advanced Linux Sound Architecture (ALSA) wrapper for OSS
 Name:		alsa-oss
-Version:	1.0.17
+Version:	1.0.25
 Release:	1%{?_dist_release}
 License:	GPLv2+
 Group:		Applications/Multimedia
@@ -36,7 +36,6 @@ Header files for alsa-oss.
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
 
 %build
@@ -80,6 +79,9 @@ autoreconf -f -i
 
 
 %changelog
+* Sun Jul 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 1.0.25-1
+- new upstream release
+
 * Thu Feb 19 2009 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 1.0.17-1
 - initial build for Vine Linux
 

a/alsa-plugins/alsa-plugins-vl.spec

@@ -1,5 +1,5 @@
 Name:           alsa-plugins
-Version:        1.0.23
+Version:        1.0.25
 Release:        1%{?_dist_release}
 Summary:        The Advanced Linux Sound Architecture (ALSA) Plugins
 # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+
@@ -7,23 +7,19 @@ 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
-Source1:        jack.conf
-Source2:        pcm-oss.conf
-Source3:        speex.conf
-Source4:        samplerate.conf
-Source5:        upmix.conf
-Source6:        vdownmix.conf
-Source7:        pulse-default.conf
-Source8:        arcamav.conf
-Source9:        maemo.conf
-Patch3:         alsa-plugins-1.0.18-pulsehint.patch
-Patch4:		alsa-plugins-1.0.17-pulsenoassert.patch
-Patch5:		alsa-plugins-1.0.17-pulsetrigger.patch
+Source1:        50-jack.conf
+Source2:        50-pcm-oss.conf
+Source3:        10-speex.conf
+Source4:        10-samplerate.conf
+Source5:        50-upmix.conf
+Source6:        97-vdownmix.conf
+Source7:        99-pulseaudio-default.conf
+Source8:        50-arcamav.conf
+Source9:        98-maemo.conf
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:  alsa-lib-devel >= %{version}
 
-
 %description
 The Advanced Linux Sound Architecture (ALSA) provides audio and MIDI
 functionality to the Linux operating system.
@@ -32,11 +28,12 @@ This package includes plugins for ALSA.
 
 
 %package jack
-Requires:       jack-audio-connection-kit
-BuildRequires:  jack-audio-connection-kit-devel
 Summary:        Jack PCM output plugin for ALSA
 Group:          System Environment/Libraries
 License:        LGPLv2+
+Requires:       alsa-lib
+Requires:       jack-audio-connection-kit
+BuildRequires:  jack-audio-connection-kit-devel
 %description jack
 This plugin converts the ALSA API over JACK (Jack Audio Connection
 Kit, http://jackit.sf.net) API.  ALSA native applications can work
@@ -52,6 +49,7 @@ This plugin provides the PCM type "jack"
 Summary:        Oss PCM output plugin for ALSA
 Group:          System Environment/Libraries
 License:        LGPLv2+ 
+Requires:       alsa-lib
 %description oss
 This plugin converts the ALSA API over OSS API.  With this plugin,
 ALSA native apps can run on OSS drivers.
@@ -60,11 +58,12 @@ This plugin provides the PCM type "oss".
 
 
 %package pulseaudio
-BuildRequires:  pulseaudio-lib-devel
-Requires:       pulseaudio
 Summary:        Alsa to PulseAudio backend
 Group:          System Environment/Libraries
 License:        LGPLv2+
+BuildRequires:  pulseaudio-lib-devel
+Requires:       alsa-lib
+Requires:       pulseaudio
 %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
@@ -73,20 +72,22 @@ one for mixer control.
 
 
 %package samplerate
-BuildRequires:  libsamplerate-devel
 Summary:        External rate converter plugin for ALSA
 Group:          System Environment/Libraries
 License:        GPLv2+
+Requires:       alsa-lib
+BuildRequires:  libsamplerate-devel
 %description samplerate
 This plugin is an external rate converter using libsamplerate by Erik de
 Castro Lopo.
 
 
 %package upmix
-BuildRequires:  libsamplerate-devel
 Summary:        Upmixer channel expander plugin for ALSA
 Group:          System Environment/Libraries
 License:        LGPLv2+
+Requires:       alsa-lib
+BuildRequires:  libsamplerate-devel
 %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
@@ -94,10 +95,11 @@ by the slave PCM or explicitly via channel option.
 
 
 %package vdownmix
-BuildRequires:  libsamplerate-devel
 Summary:        Downmixer to stereo plugin for ALSA
 Group:          System Environment/Libraries
 License:        LGPLv2+
+Requires:       alsa-lib
+BuildRequires:  libsamplerate-devel
 %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
@@ -109,6 +111,7 @@ surround".
 Summary:        USB stream plugin for ALSA
 Group:          System Environment/Libraries
 License:        LGPLv2+
+Requires:       alsa-lib
 %description usbstream
 The usbstream plugin is for snd-usb-us122l driver. It converts PCM
 stream to USB specific stream.
@@ -118,26 +121,29 @@ stream to USB specific stream.
 Summary:        Arcam AV amplifier plugin for ALSA
 Group:          System Environment/Libraries
 License:        LGPLv2+
+Requires:       alsa-lib
 %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
-BuildRequires:  speex-devel
 Summary:        Rate Converter Plugin Using Speex Resampler
 Group:          System Environment/Libraries
 License:        LGPLv2+
+Requires:       alsa-lib
+Requires:       speex
+BuildRequires:  speex-devel
 %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
 Group:          System Environment/Libraries
 License:        LGPLv2+
+Requires:       alsa-lib
+BuildRequires:  dbus-devel
 %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.
@@ -145,9 +151,6 @@ ALSA native applications can run over DSP Gateway and use DSP PCM task nodes.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch3 -p1 -b .pulsehint
-#%patch4 -p1 -b .pulsenoassert
-#%patch5 -p1 -b .pulsetrigger
 
 
 %build
@@ -164,13 +167,10 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa/pcm
-install -m 644 %SOURCE1 %SOURCE2 \
-               %SOURCE3 %SOURCE4 %SOURCE5 \
-               %SOURCE6 %SOURCE8 %SOURCE9 \
-                   ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa/pcm
-# pulseaudio configuration file
-install -m 644 %SOURCE7 \
-                   ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa
+install -m 644 %SOURCE1 %SOURCE2 %SOURCE3 \
+               %SOURCE4 %SOURCE5 %SOURCE6 \
+               %SOURCE7 %SOURCE8 %SOURCE9 \
+                   ${RPM_BUILD_ROOT}%{_datadir}/alsa/alsa.conf.d
 
 find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \;
 
@@ -188,14 +188,14 @@ rm -rf $RPM_BUILD_ROOT
 %files jack
 %defattr(-,root,root,-)
 %doc COPYING COPYING.GPL doc/README-jack
-%config(noreplace) %{_sysconfdir}/alsa/pcm/jack.conf
+%config(noreplace) %{_datadir}/alsa/alsa.conf.d/50-jack.conf
 %{_libdir}/alsa-lib/libasound_module_pcm_jack.so
 
 
 %files oss
 %defattr(-,root,root,-)
 %doc COPYING COPYING.GPL doc/README-pcm-oss
-%config(noreplace) %{_sysconfdir}/alsa/pcm/pcm-oss.conf
+%config(noreplace) %{_datadir}/alsa/alsa.conf.d/50-pcm-oss.conf
 %{_libdir}/alsa-lib/libasound_module_ctl_oss.so
 %{_libdir}/alsa-lib/libasound_module_pcm_oss.so
 
@@ -203,16 +203,18 @@ rm -rf $RPM_BUILD_ROOT
 %files pulseaudio
 %defattr(-,root,root,-)
 %doc COPYING COPYING.GPL doc/README-pulse
-%config(noreplace) %{_sysconfdir}/alsa/pulse-default.conf
+%config(noreplace) %{_datadir}/alsa/alsa.conf.d/50-pulseaudio.conf
+%config(noreplace) %{_datadir}/alsa/alsa.conf.d/99-pulseaudio-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
+%{_datadir}/alsa/alsa.conf.d/99-pulseaudio-default.conf.example
 
 
 %files samplerate
 %defattr(-,root,root,-)
 %doc COPYING COPYING.GPL doc/samplerate.txt
-%config(noreplace) %{_sysconfdir}/alsa/pcm/samplerate.conf
+%config(noreplace) %{_datadir}/alsa/alsa.conf.d/10-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
@@ -223,14 +225,14 @@ rm -rf $RPM_BUILD_ROOT
 %files upmix
 %defattr(-,root,root,-)
 %doc COPYING COPYING.GPL doc/upmix.txt
-%config(noreplace) %{_sysconfdir}/alsa/pcm/upmix.conf
+%config(noreplace) %{_datadir}/alsa/alsa.conf.d/50-upmix.conf
 %{_libdir}/alsa-lib/libasound_module_pcm_upmix.so
 
 
 %files vdownmix
 %defattr(-,root,root,-)
 %doc COPYING COPYING.GPL doc/vdownmix.txt
-%config(noreplace) %{_sysconfdir}/alsa/pcm/vdownmix.conf
+%config(noreplace) %{_datadir}/alsa/alsa.conf.d/97-vdownmix.conf
 %{_libdir}/alsa-lib/libasound_module_pcm_vdownmix.so
 
 
@@ -243,13 +245,13 @@ rm -rf $RPM_BUILD_ROOT
 %files arcamav
 %defattr(-,root,root,-)
 %doc COPYING COPYING.GPL doc/README-arcam-av
-%config(noreplace) %{_sysconfdir}/alsa/pcm/arcamav.conf
+%config(noreplace) %{_datadir}/alsa/alsa.conf.d/50-arcamav.conf
 %{_libdir}/alsa-lib/libasound_module_ctl_arcam_av.so
 
 %files speex
 %defattr(-,root,root,-)
 %doc COPYING COPYING.GPL doc/speexdsp.txt doc/speexrate.txt
-%config(noreplace) %{_sysconfdir}/alsa/pcm/speex.conf
+%config(noreplace) %{_datadir}/alsa/alsa.conf.d/10-speex.conf
 %{_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
@@ -258,12 +260,18 @@ rm -rf $RPM_BUILD_ROOT
 %files maemo
 %defattr(-,root,root,-)
 %doc COPYING COPYING.GPL doc/README-maemo
-%config(noreplace) %{_sysconfdir}/alsa/pcm/maemo.conf
+%config(noreplace) %{_datadir}/alsa/alsa.conf.d/98-maemo.conf
 %{_libdir}/alsa-lib/libasound_module_ctl_dsp_ctl.so
 %{_libdir}/alsa-lib/libasound_module_pcm_alsa_dsp.so
 
 
 %changelog
+* Sun Jul 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 1.0.25-1
+- new upstream release
+- replace SOURCE1,2,3,4,5,6,8,9 from fedora
+- replace SOURCE7 (99-pulseaudio-default.conf)
+- remove old patches
+
 * Fri May 28 2010 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 1.0.23-1
 - new upstream release
 

a/alsa-tools/alsa-tools-vl.spec

@@ -22,15 +22,15 @@
 
 Summary:        Specialist tools for ALSA
 Name:           alsa-tools
-Version:        1.0.23
-Release:        3%{?_dist_release}
+Version:        1.0.25
+Release:        1%{?_dist_release}
 
 # Checked at least one source file from all the sub-projects contained in
 # the source tarball and they are consistent GPLv2+ - TJ 2007-11-15
 License:        GPLv2+
 Group:          Applications/Multimedia
 URL:            http://www.alsa-project.org/
-Source0:        %{name}-%{version}-pruned.tar.bz2
+Source0:        %{name}-%{version}.tar.bz2
 
 # The icons below were created by Tim Jackson from screenshots of the
 # apps in question. They suck, a lot. Better alternatives welcome!
@@ -217,6 +217,9 @@ install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d
 %endif
 
 %changelog
+* Sun Jul 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 1.0.25-1
+- new upstream release
+
 * Mon Jun 25 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 1.0.23-3
 - rebuild with fltk-1.3
 

a/alsa-utils/alsa-utils-vl.spec

@@ -1,10 +1,10 @@
-%define alsa_version 1.0.20
+%define alsa_version 1.0.25
 
 Summary: Advanced Linux Sound Architecture (ALSA) Utils
 Summary(ja): Advanced Linux Sound Architecture (ALSA) ユーティリティ集
 Name: alsa-utils
-Version: 1.0.23
-Release: 2%{?_dist_release}
+Version: 1.0.25
+Release: 1%{?_dist_release}
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.alsa-project.org
@@ -21,7 +21,7 @@ BuildRequires: alsa-lib-devel >= %{alsa_version}
 BuildRequires: ncurses-devel
 BuildRequires: gettext
 BuildRequires: xmlto
-Requires: alsa-driver >= %{alsa_version}, alsa-lib >= %{alsa_version}
+Requires: alsa-lib >= %{alsa_version}
 Requires(pre): coreutils, bash
 Requires(post): coreutils, bash
 Provides: alsaconf
@@ -106,6 +106,7 @@ exit 0
 %config /etc/alsa/*
 /sbin/*
 /lib/alsa/init/*
+/lib/udev/rules.d/90-alsa-restore.rules
 %{_bindir}/*
 %{_sbindir}/*
 %{_datadir}/sounds/
@@ -116,6 +117,9 @@ exit 0
 %ghost /etc/asound.state
 
 %changelog
+* Sun Jul 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 1.0.25-1
+- new upstream release
+
 * Sun May 08 2011 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 1.0.23-2
 - rebuild