From ee74a2ebbd203abc6ea74e2b14d9b838974271d8 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Feb 04 2015 11:35:13 +0000 Subject: Add UCM sub package, Use %%license --- diff --git a/alsa-lib.spec b/alsa-lib.spec index 5a9229d..b04e762 100644 --- a/alsa-lib.spec +++ b/alsa-lib.spec @@ -5,7 +5,7 @@ Summary: The Advanced Linux Sound Architecture (ALSA) library Name: alsa-lib Version: 1.0.28 -Release: 2%{?prever_dot}%{?dist} +Release: 3%{?prever_dot}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.alsa-project.org/ @@ -15,8 +15,8 @@ Source10: asound.conf Source11: modprobe-dist-alsa.conf Source12: modprobe-dist-oss.conf Patch0: alsa-lib-1.0.24-config.patch -Patch2: alsa-lib-1.0.14-glibc-open.patch -Patch4: alsa-lib-1.0.16-no-dox-date.patch +Patch1: alsa-lib-1.0.14-glibc-open.patch +Patch2: alsa-lib-1.0.16-no-dox-date.patch BuildRequires: doxygen Requires(post): /sbin/ldconfig, coreutils @@ -42,11 +42,20 @@ functionality to the Linux operating system. This package includes the ALSA development libraries for developing against the ALSA libraries and interfaces. +%package -n alsa-ucm +Summary: ALSA Universal Configuration Manager +Group: System Environment/Libraries +Requires: %{name} = %{version}-%{release} + +%description -n alsa-ucm +The Advanced Linux Sound Architecture (ALSA) Universal Configuration +Manager allows configuration of Audio input/output names and routing + %prep %setup -q -n %{name}-%{version}%{?prever}%{?postver} %patch0 -p1 -b .config -%patch2 -p1 -b .glibc-open -%patch4 -p1 -b .no-dox-date +%patch1 -p1 -b .glibc-open +%patch2 -p1 -b .no-dox-date %build %configure --disable-aload --with-plugindir=%{_libdir}/alsa-lib --disable-alisp @@ -78,8 +87,6 @@ install -p -m 644 %{SOURCE12} . # Create UCM directory mkdir -p %{buildroot}/%{_datadir}/alsa/ucm -# Remove all UCM files (should be selected by architecture) -rm -rf %{buildroot}/%{_datadir}/alsa/ucm/* #Remove libtool archives. find %{buildroot} -name '*.la' -delete @@ -89,25 +96,33 @@ find %{buildroot} -name '*.la' -delete %postun -p /sbin/ldconfig %files -%doc COPYING TODO doc/asoundrc.txt modprobe-dist-oss.conf -# file is as old as 0.2.0 / Red Hat bugzilla #510212 -#doc Changelog +%{!?_licensedir:%global license %%doc} +%license COPYING +%doc doc/asoundrc.txt modprobe-dist-oss.conf %config %{_sysconfdir}/asound.conf /%{_lib}/libasound.so.* %{_bindir}/aserver %{_libdir}/alsa-lib/ %{_datadir}/alsa/ +%exclude %{_datadir}/alsa/ucm /lib/modprobe.d/dist-* %files devel -%doc doc/doxygen/ +%doc TODO doc/doxygen/ %{_includedir}/alsa/ %{_includedir}/sys/asoundlib.h %{_libdir}/libasound.so %{_libdir}/pkgconfig/alsa.pc %{_datadir}/aclocal/alsa.m4 +%files -n alsa-ucm +%{_datadir}/alsa/ucm + %changelog +* Tue Feb 3 2015 Peter Robinson 1.0.28-3 +- Add UCM sub package +- Use %%license + * Fri Aug 15 2014 Fedora Release Engineering - 1.0.28-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/rewind.patch b/rewind.patch deleted file mode 100644 index 623a533..0000000 --- a/rewind.patch +++ /dev/null @@ -1,137 +0,0 @@ -From 3d7433a3c87754ff8b51cf06de53a3e6c38c20b0 Mon Sep 17 00:00:00 2001 -From: Jordi Mallach -Date: Fri, 17 May 2013 18:25:51 +0200 -Subject: [PATCH 1/5] =?UTF-8?q?pcm:=20Fix=20typo=20in=20documentation:=20P?= - =?UTF-8?q?REPARE=20=E2=86=92=20PREPARED.?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Jordi Mallach -Signed-off-by: Takashi Iwai ---- - src/pcm/pcm.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c -index 438fb3f..7ec1f0e 100644 ---- a/src/pcm/pcm.c -+++ b/src/pcm/pcm.c -@@ -437,7 +437,7 @@ to #SND_PCM_STATE_SETUP - if successfully finishes, otherwise the state #SND_PCM_STATE_OPEN - is entered. - When it is brought to SETUP state, this function automatically --calls #snd_pcm_prepare() function to bring to the PREPARE state -+calls #snd_pcm_prepare() function to bring to the PREPARED state - as below. - - \par snd_pcm_prepare --- -1.8.1.4 - - -From 14d653d7c374f9ba6319a7c5a8ee6f0bc3071304 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Juho=20H=C3=A4m=C3=A4l=C3=A4inen?= - -Date: Fri, 24 May 2013 14:01:25 +0300 -Subject: [PATCH 2/5] ucm: Fix segfault when device argument is missing from - _sw{dev, mod} -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Juho Hämäläinen -Signed-off-by: Takashi Iwai ---- - src/ucm/main.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/ucm/main.c b/src/ucm/main.c -index d38b7fa..0494728 100644 ---- a/src/ucm/main.c -+++ b/src/ucm/main.c -@@ -1647,7 +1647,8 @@ int snd_use_case_set(snd_use_case_mgr_t *uc_mgr, - goto __end; - } - } else { -- str = NULL; -+ err = -EINVAL; -+ goto __end; - } - if (check_identifier(identifier, "_swdev")) - err = switch_device(uc_mgr, str, value); --- -1.8.1.4 - - -From 7f877543a36efd8fd5d38fae21352fc0567ece21 Mon Sep 17 00:00:00 2001 -From: David Henningsson -Date: Thu, 30 May 2013 12:26:33 +0200 -Subject: [PATCH 4/5] pcm_hw: Remove unused fields in struct - -These fields are not used, and their name similarity to other -fields are quite confusing when trying to debug alsa-lib. - -Signed-off-by: David Henningsson -Signed-off-by: Jaroslav Kysela ---- - src/pcm/pcm_hw.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/src/pcm/pcm_hw.c b/src/pcm/pcm_hw.c -index 0f3226d..196393d 100644 ---- a/src/pcm/pcm_hw.c -+++ b/src/pcm/pcm_hw.c -@@ -95,8 +95,6 @@ typedef struct { - volatile struct snd_pcm_mmap_status * mmap_status; - struct snd_pcm_mmap_control *mmap_control; - struct snd_pcm_sync_ptr *sync_ptr; -- snd_pcm_uframes_t hw_ptr; -- snd_pcm_uframes_t appl_ptr; - int period_event; - snd_timer_t *period_timer; - struct pollfd period_timer_pfd; --- -1.8.1.4 - - -From f2d39afe6139ab16aa2aeea0f51f32db79ab1262 Mon Sep 17 00:00:00 2001 -From: David Henningsson -Date: Thu, 30 May 2013 12:26:34 +0200 -Subject: [PATCH 5/5] pcm_plugin: Fix return value of snd_pcm_rewind - -In case the rewind did not rewind as much as expected, e g due to -time delay between the latest avail update and the rewind, we must -properly account for that in the plugin layer. - -Otherwise, the plugin's appl ptr and the hw's appl ptr become -unsynchronised, which is very bad, especially in mmap_shadow plugins, -e g, this could cause the overlapping memcpy in the softvol plugin -as seen here: -https://bugs.freedesktop.org/show_bug.cgi?id=64299 - -Signed-off-by: David Henningsson -Signed-off-by: Jaroslav Kysela ---- - src/pcm/pcm_plugin.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/pcm/pcm_plugin.c b/src/pcm/pcm_plugin.c -index 96218a8..17157e8 100644 ---- a/src/pcm/pcm_plugin.c -+++ b/src/pcm/pcm_plugin.c -@@ -219,9 +219,9 @@ static snd_pcm_sframes_t snd_pcm_plugin_rewind(snd_pcm_t *pcm, snd_pcm_uframes_t - snd_atomic_write_end(&plugin->watom); - return sframes; - } -- snd_pcm_mmap_appl_backward(pcm, (snd_pcm_uframes_t) frames); -+ snd_pcm_mmap_appl_backward(pcm, (snd_pcm_uframes_t) sframes); - snd_atomic_write_end(&plugin->watom); -- return (snd_pcm_sframes_t) frames; -+ return (snd_pcm_sframes_t) sframes; - } - - static snd_pcm_sframes_t snd_pcm_plugin_forwardable(snd_pcm_t *pcm) --- -1.8.1.4 -