Page MenuHomeFreeBSD
Files F152495719

D30223.id89074.diff
No OneTemporary
Actions

D30223.id89074.diff
View Options

diff --git a/audio/alsa-plugins/Makefile b/audio/alsa-plugins/Makefile
--- a/audio/alsa-plugins/Makefile
+++ b/audio/alsa-plugins/Makefile
@@ -37,13 +37,13 @@
BUFSZ_P2_CFLAGS= -DFREEBSD_OSS_BUFSZ_P2
VERBOSE_CFLAGS= -DFREEBSD_OSS_DEBUG_VERBOSE
+FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg
+FFMPEG_CONFIGURE_ENABLE= libav
+
JACK_LIB_DEPENDS= libjack.so:audio/jack
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
diff --git a/audio/alsa-plugins/pkg-plist b/audio/alsa-plugins/pkg-plist
--- a/audio/alsa-plugins/pkg-plist
+++ b/audio/alsa-plugins/pkg-plist
@@ -1,3 +1,6 @@
+%%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
@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
@@ -29,12 +32,12 @@
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
+%%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
@@ -45,9 +48,12 @@
%%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
@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
@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
Thu, Apr 16, 8:08 AM (7 h, 16 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31588952
Default Alt Text
D30223.id89074.diff (2 KB)

Event Timeline