Date: Wed, 12 May 2021 14:41:01 GMT From: Charlie Li <vishwin@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 933747467c06 - main - audio/alsa-plugins: fix non-default OPTIONS Message-ID: <202105121441.14CEf1G9037455@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=933747467c06ec9735b35fe31879bb6f914d33ae commit 933747467c06ec9735b35fe31879bb6f914d33ae Author: Charlie Li <vishwin@FreeBSD.org> AuthorDate: 2021-05-12 03:39:59 +0000 Commit: Charlie Li <vishwin@FreeBSD.org> CommitDate: 2021-05-12 14:40:12 +0000 audio/alsa-plugins: fix non-default OPTIONS - Update configure option and plist for FFMPEG - Add two missing files with SAMPLERATE PR: 245321 Approved by: arrowd (mentor) Differential Revision: https://reviews.freebsd.org/D30223 --- audio/alsa-plugins/Makefile | 6 +++--- audio/alsa-plugins/pkg-plist | 18 ++++++++++++------ 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/audio/alsa-plugins/Makefile b/audio/alsa-plugins/Makefile index 1e970778b641..678c82f07ae9 100644 --- a/audio/alsa-plugins/Makefile +++ b/audio/alsa-plugins/Makefile @@ -37,13 +37,13 @@ BLKCNT_P2_CFLAGS= -DFREEBSD_OSS_BLKCNT_P2 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 index 4847ffc641be..176a27a18e85 100644 --- 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.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_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 @@ lib/alsa-lib/libasound_module_pcm_vdownmix.so %%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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105121441.14CEf1G9037455>