From 77a574b655abac5c165471b9bb946182cae2c0d6 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 1 Mar 2023 01:45:44 +0000 Subject: [PATCH] Remove or soften excess dependencies The alsa-utils dependencies were added to resolve directory ownership, but the plugins do not require the utils. Instead, just have the plugins co-own /etc/alsa. The hard requires on JACK and PulseAudio daemons (nowadays both provided by PipeWire) are not strictly necessary, e.g. in flatpak builds where the host instance is used over a socket connection. Fixes: https://src.fedoraproject.org/rpms/alsa-plugins/pull-request/6 --- alsa-plugins.spec | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 4c49e53..3be9afa 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -26,8 +26,7 @@ This package includes plugins for ALSA. %if %{with jack} %package jack -Requires: alsa-utils -Requires: jack-audio-connection-kit +Recommends: jack-audio-connection-kit BuildRequires: jack-audio-connection-kit-devel Summary: Jack PCM output plugin for ALSA License: LGPLv2+ @@ -40,7 +39,6 @@ This plugin provides the PCM type "jack" %endif %package oss -Requires: alsa-utils BuildRequires: alsa-lib-devel Summary: Oss PCM output plugin for ALSA License: LGPLv2+ @@ -52,8 +50,7 @@ ALSA native apps can run on OSS drivers. This plugin provides the PCM type "oss". %package pulseaudio -Requires: alsa-utils -Requires: pulseaudio-daemon +Recommends: pulseaudio-daemon BuildRequires: pulseaudio-libs-devel Summary: Alsa to PulseAudio backend License: LGPLv2+ @@ -65,7 +62,6 @@ sound across a network. There are two plugins in the suite, one for PCM and one for mixer control. %package samplerate -Requires: alsa-utils BuildRequires: libsamplerate-devel Summary: External rate converter plugin for ALSA License: GPLv2+ @@ -75,7 +71,6 @@ This plugin is an external rate converter using libsamplerate by Erik de Castro Lopo. %package upmix -Requires: alsa-utils BuildRequires: libsamplerate-devel Summary: Upmixer channel expander plugin for ALSA License: LGPLv2+ @@ -86,7 +81,6 @@ The upmix plugin is an easy-to-use plugin for upmixing to 4 or by the slave PCM or explicitly via channel option. %package vdownmix -Requires: alsa-utils BuildRequires: libsamplerate-devel Summary: Downmixer to stereo plugin for ALSA License: LGPLv2+ @@ -158,6 +152,7 @@ find %{buildroot} -name "*.la" -exec rm {} \; %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 @@ -169,6 +164,7 @@ find %{buildroot} -name "*.la" -exec rm {} \; %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 @@ -184,6 +180,7 @@ find %{buildroot} -name "*.la" -exec rm {} \; %{_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 @@ -193,6 +190,7 @@ find %{buildroot} -name "*.la" -exec rm {} \; %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 @@ -207,6 +205,7 @@ find %{buildroot} -name "*.la" -exec rm {} \; %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 @@ -217,6 +216,7 @@ find %{buildroot} -name "*.la" -exec rm {} \; %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 @@ -226,6 +226,7 @@ find %{buildroot} -name "*.la" -exec rm {} \; %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 @@ -236,6 +237,7 @@ find %{buildroot} -name "*.la" -exec rm {} \; %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 @@ -246,6 +248,7 @@ find %{buildroot} -name "*.la" -exec rm {} \; %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 @@ -261,6 +264,7 @@ find %{buildroot} -name "*.la" -exec rm {} \; %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