Index: audio/alsa-plugins/Makefile =================================================================== --- audio/alsa-plugins/Makefile +++ audio/alsa-plugins/Makefile @@ -21,7 +21,7 @@ CPPFLAGS+= -I${.CURDIR}/../alsa-lib/files OPTIONS_DEFAULT= BUFSZ_P2 IO_PTR PULSEAUDIO -OPTIONS_DEFINE= BUFSZ_P2 FFMPEG JACK PULSEAUDIO SAMPLERATE SPEEX +OPTIONS_DEFINE= BUFSZ_P2 JACK PULSEAUDIO SAMPLERATE SPEEX OPTIONS_SUB= yes OPTIONS_GROUP= OSS @@ -41,9 +41,6 @@ JACK_CONFIGURE_ENABLE= jack JACK_IMPLIES= SAMPLERATE -FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg -FFMPEG_CONFIGURE_ENABLE= avcodec - PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CONFIGURE_ENABLE= pulseaudio Index: audio/alsa-plugins/pkg-plist =================================================================== --- audio/alsa-plugins/pkg-plist +++ audio/alsa-plugins/pkg-plist @@ -1,3 +1,4 @@ +%%SAMPLERATE%%etc/alsa/conf.d/10-samplerate.conf @comment etc/alsa/conf.d/50-arcam-av-ctl.conf @comment etc/alsa/conf.d/50-oss.conf @comment etc/alsa/conf.d/50-pulseaudio.conf @@ -13,8 +14,6 @@ lib/alsa-lib/libasound_module_ctl_oss.so %%PULSEAUDIO%%lib/alsa-lib/libasound_module_ctl_pulse.la %%PULSEAUDIO%%lib/alsa-lib/libasound_module_ctl_pulse.so -%%FFMPEG%%lib/alsa-lib/libasound_module_pcm_a52.la -%%FFMPEG%%lib/alsa-lib/libasound_module_pcm_a52.so %%JACK%%lib/alsa-lib/libasound_module_pcm_jack.la %%JACK%%lib/alsa-lib/libasound_module_pcm_jack.so lib/alsa-lib/libasound_module_pcm_oss.la @@ -29,12 +28,6 @@ lib/alsa-lib/libasound_module_pcm_usb_stream.so lib/alsa-lib/libasound_module_pcm_vdownmix.la lib/alsa-lib/libasound_module_pcm_vdownmix.so -%%FFMPEG%%lib/alsa-lib/libasound_module_rate_lavcrate.la -%%FFMPEG%%lib/alsa-lib/libasound_module_rate_lavcrate.so -%%FFMPEG%%lib/alsa-lib/libasound_module_rate_lavcrate_fast.so -%%FFMPEG%%lib/alsa-lib/libasound_module_rate_lavcrate_faster.so -%%FFMPEG%%lib/alsa-lib/libasound_module_rate_lavcrate_high.so -%%FFMPEG%%lib/alsa-lib/libasound_module_rate_lavcrate_higher.so %%SAMPLERATE%%lib/alsa-lib/libasound_module_rate_samplerate.la %%SAMPLERATE%%lib/alsa-lib/libasound_module_rate_samplerate.so %%SAMPLERATE%%lib/alsa-lib/libasound_module_rate_samplerate_best.so @@ -45,6 +38,7 @@ %%SPEEX%%lib/alsa-lib/libasound_module_rate_speexrate.so %%SPEEX%%lib/alsa-lib/libasound_module_rate_speexrate_best.so %%SPEEX%%lib/alsa-lib/libasound_module_rate_speexrate_medium.so +%%SAMPLERATE%%share/alsa/alsa.conf.d/10-samplerate.conf @comment share/alsa/alsa.conf.d/50-arcam-av-ctl.conf @comment share/alsa/alsa.conf.d/50-oss.conf %%PULSEAUDIO%%share/alsa/alsa.conf.d/50-pulseaudio.conf