diff --git a/audio/alsa-lib/Makefile b/audio/alsa-lib/Makefile index f92cdb551931..4eb25c86dbb2 100644 --- a/audio/alsa-lib/Makefile +++ b/audio/alsa-lib/Makefile @@ -1,43 +1,44 @@ PORTNAME= alsa-lib PORTVERSION= 1.2.10 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= https://www.alsa-project.org/files/pub/lib/ MAINTAINER= rodrigo@FreeBSD.org COMMENT= ALSA compatibility library WWW= https://www.alsa-project.org/ LICENSE= LGPL21+ USES= cpe libtool:keepla tar:bzip2 CPE_VENDOR= alsa-project CPE_PRODUCT= alsa USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-pkgconfdir="\$${prefix}/libdata/pkgconfig" CONFIGURE_ENV= ac_cv_header_endian_h=no INSTALL_TARGET= install-strip TEST_ENV= ${MAKE_ENV} \ ALSA_CONFIG_PATH="${FILESDIR}/asound.conf.sample" TEST_TARGET= check CPPFLAGS+= -I${FILESDIR} # Some symbols in the linker version script Versions.in are only defined when # --enable-alisp is used at configure time. Suppress errors with lld >= 17 due # to these undefined symbols. LDFLAGS+= -Wl,--undefined-version OPTIONS_DEFINE= PYTHON OPTIONS_SUB= yes PYTHON_USES= gettext-runtime python PYTHON_CONFIGURE_ENABLE= mixer-pymods python PYTHON_BINARY_ALIAS= python3-config=${PYTHON_CMD:T}-config post-patch: @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/src/conf/alsa.conf post-install: ${INSTALL_DATA} ${FILESDIR}/asound.conf.sample ${STAGEDIR}${PREFIX}/etc .include diff --git a/audio/alsa-lib/files/asound.conf.sample b/audio/alsa-lib/files/asound.conf.sample index 4fef58bdb9d7..e97133e770cc 100644 --- a/audio/alsa-lib/files/asound.conf.sample +++ b/audio/alsa-lib/files/asound.conf.sample @@ -1,36 +1,27 @@ # # FreeBSD/OSS # -pcm.oss { - type oss - hint.description "Open Sound System" -} - -ctl.oss { - type oss -} - pcm.!sysdefault pcm.plug:oss ctl.!sysdefault ctl.oss pcm.!default pcm.sysdefault ctl.!default ctl.sysdefault # # Pulseaudio # # pcm.!default pcm.pulse # ctl.!default ctl.pulse # # Remap all possible surround stuffs. # pcm.!front pcm.default pcm.!rear pcm.default pcm.!center_lfe pcm.default pcm.!side pcm.default pcm.!surround21 pcm.default pcm.!surround40 pcm.default pcm.!surround41 pcm.default pcm.!surround50 pcm.default pcm.!surround51 pcm.default pcm.!surround71 pcm.default diff --git a/audio/alsa-plugins/Makefile b/audio/alsa-plugins/Makefile index 3c0692c7ea99..127343819c20 100644 --- a/audio/alsa-plugins/Makefile +++ b/audio/alsa-plugins/Makefile @@ -1,47 +1,47 @@ PORTNAME= alsa-plugins PORTVERSION= 1.2.7.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= https://www.alsa-project.org/files/pub/plugins/ MAINTAINER= ports@FreeBSD.org COMMENT= ALSA compatibility library plugins WWW= https://www.alsa-project.org/ LICENSE= LGPL21+ LIB_DEPENDS= libasound.so:audio/alsa-lib USES= alias libtool:keepla localbase pkgconfig tar:bzip2 USE_LDCONFIG= ${PREFIX}/lib/alsa-lib GNU_CONFIGURE= yes MAKE_ARGS+= RM="${RM}" INSTALL_TARGET= install-strip CPPFLAGS+= -I${.CURDIR}/../alsa-lib/files OPTIONS_DEFINE= FFMPEG JACK PULSEAUDIO SAMPLERATE SPEEX OPTIONS_DEFAULT= PULSEAUDIO OPTIONS_SUB= yes FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg FFMPEG_CONFIGURE_ENABLE= libav JACK_LIB_DEPENDS= libjack.so:audio/jack JACK_CONFIGURE_ENABLE= jack PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CONFIGURE_ENABLE= pulseaudio SAMPLERATE_LIB_DEPENDS= libsamplerate.so:audio/libsamplerate SAMPLERATE_CONFIGURE_ENABLE= samplerate SPEEX_LIB_DEPENDS= libspeexdsp.so:audio/speexdsp SPEEX_CONFIGURE_ON= --with-speex=lib SPEEX_CONFIGURE_OFF= --without-speex post-install: # sanitize links cd ${STAGEDIR}${PREFIX}/etc/alsa/conf.d && for i in [0-9][0-9]-*.conf ; do \ ${LN} -sf ../../../share/alsa/alsa.conf.d/$$i . ; done .include diff --git a/audio/alsa-plugins/pkg-plist b/audio/alsa-plugins/pkg-plist index 8fddd4d644cd..afe367876651 100644 --- a/audio/alsa-plugins/pkg-plist +++ b/audio/alsa-plugins/pkg-plist @@ -1,65 +1,65 @@ %%FFMPEG%%etc/alsa/conf.d/10-rate-lav.conf %%SAMPLERATE%%etc/alsa/conf.d/10-samplerate.conf %%SPEEX%%etc/alsa/conf.d/10-speexrate.conf %%JACK%%etc/alsa/conf.d/50-jack.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 +etc/alsa/conf.d/50-oss.conf %%PULSEAUDIO%%etc/alsa/conf.d/50-pulseaudio.conf %%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 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 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 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 %%SPEEX%%share/alsa/alsa.conf.d/10-speexrate.conf @comment share/alsa/alsa.conf.d/50-arcam-av-ctl.conf %%JACK%%share/alsa/alsa.conf.d/50-jack.conf -@comment share/alsa/alsa.conf.d/50-oss.conf +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 @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