From 4e23b4863ee0411734cfcd77c9d45688d9f1fa4b Mon Sep 17 00:00:00 2001 From: Florian Smeets Date: Thu, 3 Oct 2013 16:34:28 +0000 Subject: - update to 1.0.27.2 [1] -- add PYTHON option to alsa-lib -- drop unresponsive mirrors and those that rarely catch up -- drop --disable-aload from alsa-lib, builds fine without -- drop USE_LDCONFIG from alsa-plugins, useless for dlopen'd plugins -- convert to new LIB_DEPENDS syntax and Makefile header -- convert PLIST_SUB to OPTIONS_SUB -- don't link alsa-utils against librt for clock_gettime(2) -- pass paths to configure relative to --prefix value -- install udev config(s) under PREFIX (for reference) -- cleanup /var/lib as it's not in default MTREE_FILE -- remove OSVERSION check for EOL releases - allow staging PR: ports/182245 [1] Submitted by: Jan Beich [1] Approved by: maintainer timeout --- audio/alsa-plugins/Makefile | 29 +++++++++-------------------- audio/alsa-plugins/distinfo | 4 ++-- audio/alsa-plugins/pkg-plist | 32 ++++++++++++++++---------------- 3 files changed, 27 insertions(+), 38 deletions(-) (limited to 'audio/alsa-plugins') diff --git a/audio/alsa-plugins/Makefile b/audio/alsa-plugins/Makefile index 8679d2a6c94a..e982af5952ea 100644 --- a/audio/alsa-plugins/Makefile +++ b/audio/alsa-plugins/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= alsa-plugins -PORTVERSION= 1.0.26 +PORTVERSION= 1.0.27 CATEGORIES= audio MASTER_SITES= ALSA/plugins \ GENTOO/distfiles @@ -10,21 +10,20 @@ MASTER_SITES= ALSA/plugins \ MAINTAINER= aragon@phat.za.net COMMENT= ALSA compatibility library plugins -LIB_DEPENDS= asound:${PORTSDIR}/audio/alsa-lib +LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib USE_BZIP2= yes GNU_CONFIGURE= yes -NO_STAGE= yes USES= pkgconfig LDFLAGS+= -L${LOCALBASE}/lib -USE_LDCONFIG= ${PREFIX}/lib/alsa-lib OPTIONS_DEFINE= ARIFF_OSS JACK FFMPEG PULSEAUDIO SAMPLERATE SPEEX +OPTIONS_SUB= ${OPTIONS_DEFINE} ARIFF_OSS_DESC= FreeBSD-specific OSS plugin .include -.if ${PORT_OPTIONS:MARIFF_OSS} || ${OSVERSION} < 800097 +.if ${PORT_OPTIONS:MARIFF_OSS} EXTRA_PATCHES+= ${FILESDIR}/alsa-plugins.patch .endif @@ -32,46 +31,36 @@ EXTRA_PATCHES+= ${FILESDIR}/alsa-plugins.patch .if empty(PORT_OPTIONS:MSAMPLERATE) IGNORE= JACK audio support requires SAMPLERATE .endif -LIB_DEPENDS+= jack:${PORTSDIR}/audio/jack -PLIST_SUB+= JACK="" +LIB_DEPENDS+= libjack.so:${PORTSDIR}/audio/jack .else -PLIST_SUB+= JACK="@comment " CONFIGURE_ARGS+= --disable-jack .endif .if ${PORT_OPTIONS:MFFMPEG} CONFIGURE_ARGS+= --enable-avcodec CFLAGS+= -I${LOCALBASE}/include -LIB_DEPENDS+= avcodec:${PORTSDIR}/multimedia/ffmpeg -PLIST_SUB+= LAVC="" +LIB_DEPENDS+= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg .else CONFIGURE_ARGS+= --disable-avcodec -PLIST_SUB+= LAVC="@comment " .endif .if ${PORT_OPTIONS:MPULSEAUDIO} -LIB_DEPENDS+= pulse:${PORTSDIR}/audio/pulseaudio -PLIST_SUB+= PULSE="" +LIB_DEPENDS+= libpulse.so:${PORTSDIR}/audio/pulseaudio .else -PLIST_SUB+= PULSE="@comment " CONFIGURE_ARGS+= --disable-pulseaudio .endif .if ${PORT_OPTIONS:MSAMPLERATE} -LIB_DEPENDS+= samplerate:${PORTSDIR}/audio/libsamplerate -PLIST_SUB+= SAMPLERATE="" +LIB_DEPENDS+= libsamplerate.so:${PORTSDIR}/audio/libsamplerate .else -PLIST_SUB+= SAMPLERATE="@comment " CONFIGURE_ARGS+= --disable-samplerate .endif .if ${PORT_OPTIONS:MSPEEX} CONFIGURE_ARGS+= --with-speex=lib -LIB_DEPENDS+= speex:${PORTSDIR}/audio/speex -PLIST_SUB+= SPEEX="" +LIB_DEPENDS+= libspeex.so:${PORTSDIR}/audio/speex .else CONFIGURE_ARGS+= --without-speex -PLIST_SUB+= SPEEX="@comment " .endif post-patch: .SILENT diff --git a/audio/alsa-plugins/distinfo b/audio/alsa-plugins/distinfo index 3305e90cedfe..ca8889a1cd48 100644 --- a/audio/alsa-plugins/distinfo +++ b/audio/alsa-plugins/distinfo @@ -1,2 +1,2 @@ -SHA256 (alsa-plugins-1.0.26.tar.bz2) = 03515134d2009db4dfb2769e0ab0e1fb517c8140ffdfd64a984be968e81c9f1f -SIZE (alsa-plugins-1.0.26.tar.bz2) = 361017 +SHA256 (alsa-plugins-1.0.27.tar.bz2) = 0bbd0c37c2dd7baf16363afb2e58169ffb0f9c0a70031b3b6235594630f3ab35 +SIZE (alsa-plugins-1.0.27.tar.bz2) = 363593 diff --git a/audio/alsa-plugins/pkg-plist b/audio/alsa-plugins/pkg-plist index 0512573dc6e5..a7a8b1d3dbdb 100644 --- a/audio/alsa-plugins/pkg-plist +++ b/audio/alsa-plugins/pkg-plist @@ -1,19 +1,19 @@ -%%PULSE%%lib/alsa-lib/libasound_module_conf_pulse.la -%%PULSE%%lib/alsa-lib/libasound_module_conf_pulse.so +%%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 -%%PULSE%%lib/alsa-lib/libasound_module_ctl_pulse.la -%%PULSE%%lib/alsa-lib/libasound_module_ctl_pulse.so -%%LAVC%%lib/alsa-lib/libasound_module_pcm_a52.la -%%LAVC%%lib/alsa-lib/libasound_module_pcm_a52.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 -%%PULSE%%lib/alsa-lib/libasound_module_pcm_pulse.la -%%PULSE%%lib/alsa-lib/libasound_module_pcm_pulse.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 @@ -22,12 +22,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 -%%LAVC%%lib/alsa-lib/libasound_module_rate_lavcrate.la -%%LAVC%%lib/alsa-lib/libasound_module_rate_lavcrate.so -%%LAVC%%lib/alsa-lib/libasound_module_rate_lavcrate_fast.so -%%LAVC%%lib/alsa-lib/libasound_module_rate_lavcrate_faster.so -%%LAVC%%lib/alsa-lib/libasound_module_rate_lavcrate_high.so -%%LAVC%%lib/alsa-lib/libasound_module_rate_lavcrate_higher.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 @@ -38,5 +38,5 @@ 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 -%%PULSE%%share/alsa/alsa.conf.d/50-pulseaudio.conf -%%PULSE%%share/alsa/alsa.conf.d/99-pulseaudio-default.conf.example +%%PULSEAUDIO%%share/alsa/alsa.conf.d/50-pulseaudio.conf +%%PULSEAUDIO%%share/alsa/alsa.conf.d/99-pulseaudio-default.conf.example -- cgit v1.2.3