Page MenuHomeFreeBSD
Files F165108588

D43667.id133608.diff
No OneTemporary
Actions

D43667.id133608.diff
View Options

Index: audio/alsa-plugins/Makefile
===================================================================
--- audio/alsa-plugins/Makefile
+++ audio/alsa-plugins/Makefile
@@ -1,5 +1,6 @@
PORTNAME= alsa-plugins
PORTVERSION= 1.2.7.1
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= https://www.alsa-project.org/files/pub/plugins/
@@ -19,23 +20,29 @@
CPPFLAGS+= -I${.CURDIR}/../alsa-lib/files
OPTIONS_DEFINE= FFMPEG JACK PULSEAUDIO SAMPLERATE SPEEX
-OPTIONS_DEFAULT= PULSEAUDIO
+OPTIONS_DEFAULT= FFMPEG JACK PULSEAUDIO SAMPLERATE SPEEX
OPTIONS_SUB= yes
-FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg
+FFMPEG_SUBPACKAGES= ffmpeg
+LIB_DEPENDS.ffmpeg= libavcodec.so:multimedia/ffmpeg
FFMPEG_CONFIGURE_ENABLE= libav
+JACK_SUBPACKAGES= jack
JACK_IMPLIES= SAMPLERATE
-JACK_LIB_DEPENDS= libjack.so:audio/jack
+SELF_DEPENDS.jack= samplerate
+LIB_DEPENDS.jack= libjack.so:audio/jack
JACK_CONFIGURE_ENABLE= jack
-PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
+PULSEAUDIO_SUBPACKAGES= pulseaudio
+LIB_DEPENDS.pulseaudio= libpulse.so:audio/pulseaudio
PULSEAUDIO_CONFIGURE_ENABLE= pulseaudio
-SAMPLERATE_LIB_DEPENDS= libsamplerate.so:audio/libsamplerate
+SAMPLERATE_SUBPACKAGES= samplerate
+LIB_DEPENDS.samplerate= libsamplerate.so:audio/libsamplerate
SAMPLERATE_CONFIGURE_ENABLE= samplerate
-SPEEX_LIB_DEPENDS= libspeex.so:audio/speex \
+SPEEX_SUBPACKAGES= speex
+LIB_DEPENDS.speex= libspeex.so:audio/speex \
libspeexdsp.so:audio/speexdsp
SPEEX_CONFIGURE_ON= --with-speex=lib
SPEEX_CONFIGURE_OFF= --without-speex
Index: audio/alsa-plugins/pkg-plist
===================================================================
--- audio/alsa-plugins/pkg-plist
+++ audio/alsa-plugins/pkg-plist
@@ -1,61 +1,61 @@
-%%FFMPEG%%etc/alsa/conf.d/10-rate-lav.conf
-%%SAMPLERATE%%etc/alsa/conf.d/10-samplerate.conf
-%%FFMPEG%%etc/alsa/conf.d/60-a52-encoder.conf
+%%FFMPEG%%@@ffmpeg@@etc/alsa/conf.d/10-rate-lav.conf
+%%SAMPLERATE%%@@samplerate@@etc/alsa/conf.d/10-samplerate.conf
+%%FFMPEG%%@@ffmpeg@@etc/alsa/conf.d/60-a52-encoder.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
-%%SPEEX%%etc/alsa/conf.d/60-speex.conf
+%%SPEEX%%@@speex@@etc/alsa/conf.d/60-speex.conf
@comment etc/alsa/conf.d/60-upmix.conf
@comment etc/alsa/conf.d/60-vdownmix.conf
@comment etc/alsa/conf.d/98-usb-stream.conf
@comment etc/alsa/conf.d/99-pulseaudio-default.conf.example
-%%PULSEAUDIO%%lib/alsa-lib/libasound_module_conf_pulse.la
-%%PULSEAUDIO%%lib/alsa-lib/libasound_module_conf_pulse.so
+%%PULSEAUDIO%%@@pulseaudio@@lib/alsa-lib/libasound_module_conf_pulse.la
+%%PULSEAUDIO%%@@pulseaudio@@lib/alsa-lib/libasound_module_conf_pulse.so
lib/alsa-lib/libasound_module_ctl_arcam_av.la
lib/alsa-lib/libasound_module_ctl_arcam_av.so
lib/alsa-lib/libasound_module_ctl_oss.la
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
+%%PULSEAUDIO%%@@pulseaudio@@lib/alsa-lib/libasound_module_ctl_pulse.la
+%%PULSEAUDIO%%@@pulseaudio@@lib/alsa-lib/libasound_module_ctl_pulse.so
+%%FFMPEG%%@@ffmpeg@@lib/alsa-lib/libasound_module_pcm_a52.la
+%%FFMPEG%%@@ffmpeg@@lib/alsa-lib/libasound_module_pcm_a52.so
+%%JACK%%@@jack@@lib/alsa-lib/libasound_module_pcm_jack.la
+%%JACK%%@@jack@@lib/alsa-lib/libasound_module_pcm_jack.so
lib/alsa-lib/libasound_module_pcm_oss.la
lib/alsa-lib/libasound_module_pcm_oss.so
-%%PULSEAUDIO%%lib/alsa-lib/libasound_module_pcm_pulse.la
-%%PULSEAUDIO%%lib/alsa-lib/libasound_module_pcm_pulse.so
-%%SPEEX%%lib/alsa-lib/libasound_module_pcm_speex.la
-%%SPEEX%%lib/alsa-lib/libasound_module_pcm_speex.so
+%%PULSEAUDIO%%@@pulseaudio@@lib/alsa-lib/libasound_module_pcm_pulse.la
+%%PULSEAUDIO%%@@pulseaudio@@lib/alsa-lib/libasound_module_pcm_pulse.so
+%%SPEEX%%@@speex@@lib/alsa-lib/libasound_module_pcm_speex.la
+%%SPEEX%%@@speex@@lib/alsa-lib/libasound_module_pcm_speex.so
lib/alsa-lib/libasound_module_pcm_upmix.la
lib/alsa-lib/libasound_module_pcm_upmix.so
lib/alsa-lib/libasound_module_pcm_usb_stream.la
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_lavrate.la
-%%FFMPEG%%lib/alsa-lib/libasound_module_rate_lavrate.so
-%%FFMPEG%%lib/alsa-lib/libasound_module_rate_lavrate_fast.so
-%%FFMPEG%%lib/alsa-lib/libasound_module_rate_lavrate_faster.so
-%%FFMPEG%%lib/alsa-lib/libasound_module_rate_lavrate_high.so
-%%FFMPEG%%lib/alsa-lib/libasound_module_rate_lavrate_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
-%%SAMPLERATE%%lib/alsa-lib/libasound_module_rate_samplerate_linear.so
-%%SAMPLERATE%%lib/alsa-lib/libasound_module_rate_samplerate_medium.so
-%%SAMPLERATE%%lib/alsa-lib/libasound_module_rate_samplerate_order.so
-%%SPEEX%%lib/alsa-lib/libasound_module_rate_speexrate.la
-%%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
-%%FFMPEG%%share/alsa/alsa.conf.d/10-rate-lav.conf
-%%SAMPLERATE%%share/alsa/alsa.conf.d/10-samplerate.conf
+%%FFMPEG%%@@ffmpeg@@lib/alsa-lib/libasound_module_rate_lavrate.la
+%%FFMPEG%%@@ffmpeg@@lib/alsa-lib/libasound_module_rate_lavrate.so
+%%FFMPEG%%@@ffmpeg@@lib/alsa-lib/libasound_module_rate_lavrate_fast.so
+%%FFMPEG%%@@ffmpeg@@lib/alsa-lib/libasound_module_rate_lavrate_faster.so
+%%FFMPEG%%@@ffmpeg@@lib/alsa-lib/libasound_module_rate_lavrate_high.so
+%%FFMPEG%%@@ffmpeg@@lib/alsa-lib/libasound_module_rate_lavrate_higher.so
+%%SAMPLERATE%%@@samplerate@@lib/alsa-lib/libasound_module_rate_samplerate.la
+%%SAMPLERATE%%@@samplerate@@lib/alsa-lib/libasound_module_rate_samplerate.so
+%%SAMPLERATE%%@@samplerate@@lib/alsa-lib/libasound_module_rate_samplerate_best.so
+%%SAMPLERATE%%@@samplerate@@lib/alsa-lib/libasound_module_rate_samplerate_linear.so
+%%SAMPLERATE%%@@samplerate@@lib/alsa-lib/libasound_module_rate_samplerate_medium.so
+%%SAMPLERATE%%@@samplerate@@lib/alsa-lib/libasound_module_rate_samplerate_order.so
+%%SPEEX%%@@speex@@lib/alsa-lib/libasound_module_rate_speexrate.la
+%%SPEEX%%@@speex@@lib/alsa-lib/libasound_module_rate_speexrate.so
+%%SPEEX%%@@speex@@lib/alsa-lib/libasound_module_rate_speexrate_best.so
+%%SPEEX%%@@speex@@lib/alsa-lib/libasound_module_rate_speexrate_medium.so
+%%FFMPEG%%@@ffmpeg@@share/alsa/alsa.conf.d/10-rate-lav.conf
+%%SAMPLERATE%%@@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
-%%FFMPEG%%share/alsa/alsa.conf.d/60-a52-encoder.conf
-%%SPEEX%%share/alsa/alsa.conf.d/60-speex.conf
+%%PULSEAUDIO%%@@pulseaudio@@share/alsa/alsa.conf.d/50-pulseaudio.conf
+%%FFMPEG%%@@ffmpeg@@share/alsa/alsa.conf.d/60-a52-encoder.conf
+%%SPEEX%%@@speex@@share/alsa/alsa.conf.d/60-speex.conf
@comment share/alsa/alsa.conf.d/60-upmix.conf
@comment share/alsa/alsa.conf.d/60-vdownmix.conf
@comment share/alsa/alsa.conf.d/98-usb-stream.conf

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 7, 3:03 AM (9 h, 29 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
36144246
Default Alt Text
D43667.id133608.diff (7 KB)

Event Timeline